Merge pull request #183 from westurner/fix_tweet_regex

BUG: Match tweet #hashtag word boundaries
christianvuerings · Dec 18, 2014 · bd108f7 · bd108f7
2 parents e785efb + 0288b0a
commit bd108f7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/jquery.lifestream.js b/jquery.lifestream.js
@@ -2401,13 +2401,13 @@ $.fn.lifestream.feeds.tumblr = function( config, callback ) {
       },
       hash = function( t ) {
         return t.replace(
-          /(^|[^\w'"]+)\#([a-zA-Z0-9ÅåÄäÖöØøÆæÉéÈèÜüÊêÛûÎî_]+)/g,
-          function( m, m1, m2 ) {
+          /(^|\B)#([a-zA-Z0-9ÅåÄäÖöØøÆæÉéÈèÜüÊêÛûÎî_]+)\b( |\r?\n|\r|$)/g,
+          function( m, m1, m2, m3 ) {
             var elem = ($("<a></a>")
-                     .attr("href", "https://twitter.com/hashtag/" + m2
-                          + "?src=hash")
+                     .attr("href",
+                           "https://twitter.com/hashtag/" + m2 + "?src=hash")
                      .text("#" + m2))[0].outerHTML;
-            return m1 + elem;
+            return m1 + elem + m3;
           }
         );
       };
@@ -2436,10 +2436,10 @@ $.fn.lifestream.feeds.tumblr = function( config, callback ) {
           "config": config,
           "html": $.tmpl( template.posted, {
             "tweet": linkify($('<div/>').html(status.text).text()),
-            "complete_url": 'http://twitter.com/' + config.user +
+            "complete_url": 'https://twitter.com/' + config.user +
               "/status/" + status.id
           } ),
-          "url": 'http://twitter.com/' + config.user
+          "url": 'https://twitter.com/' + config.user
         });
       }
       callback(output);