BUG: Match tweet #hashtag word boundaries

fixes #181
christianvuerings · Dec 18, 2014 · 96941ce · 96941ce
1 parent e785efb
commit 96941ce
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 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;
           }
         );
       };

diff --git a/src/services/twitter.js b/src/services/twitter.js
@@ -40,13 +40,13 @@
       },
       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;
           }
         );
       };