improve tag handling

Author: stevenschobert

src/instafeed.js

@@ -229,17 +229,17 @@
     return transformedFiltered;
   };
 
-  Instafeed.prototype._getTags = function getTags(data) {
-    // This expression comes from https://github.com/johnlinp/instagram-validator
-    // A non-official instagram validator
-    var exp = /^#[^~`!@#$%^&*\(\)\-\+={}\[\]:;"'<>\?,\./|\\\s]+$/gi;
+  Instafeed.prototype._extractTags = function extractTags(str) {
+    var exp = /#([^\s]+)/gi;
+    var badChars = /[~`!@#$%^&*\(\)\-\+={}\[\]:;"'<>\?,\./|\\\s]+/i; // non-allowed characters
     var tags = [];
-    var tagData = data.caption.match(exp) || [];
 
-    //Pull the hash character off the front of each tag.
-    //Can this be done in one hit with the regex?
-    for (var i = 0; i < tagData.length; i++) {
-      tags.push(tagData[i].substring(1));
+    if (typeof str === 'string') {
+      while ((match = exp.exec(str)) !== null) {
+        if (badChars.test(match[1]) === false) {
+          tags.push(match[1]);
+        }
+      }
     }
 
     return tags;
@@ -266,7 +266,7 @@
 
     return {
       caption: data.caption,
-      tags: this._getTags(data),
+      tags: this._extractTags(data.caption),
       id: data.id,
       image: image,
       link: data.permalink,