Merge lp:~mhall119/loco-team-portal/hashtag-feed-duplicate-improvements into lp:loco-team-portal

[Michael Hall]

More intelligent duplicate detection

[Daniel Holbach (dholbach)]

Looks good to me.

review: Approve

=== modified file 'loco_directory/media/js/twidenash.js'
--- loco_directory/media/js/twidenash.js	2010-08-15 20:55:48 +0000
+++ loco_directory/media/js/twidenash.js	2010-08-17 00:16:42 +0000
@@ -48,7 +48,12 @@
         for (var i=0; i<data.results.length; i++) {
             var dupe = false;
             for (var j=0; j<twidenash.items.length; j++) {
-                if (data.results[i].text == twidenash.items[j].text) {
+                // Strip characters that may be specific to networks
+                var comp1 = data.results[i].text.replace(/[♺\!\#\@]/g, '');
+                var comp2 = twidenash.items[j].text.replace(/[♺\!\#\@]/g, '');
+                var compdate = Date.parse(data.results[i].created_at);
+                var datediff = Math.abs(Date.parse(data.results[i].created_at) - twidenash.items[j].dt)
+                if (comp1 == comp2 && datediff < 120000) {
                     dupe = true;
                     break;
                 }
@@ -74,7 +79,7 @@
                 nick.className = 'nick';
                 nick.appendChild(document.createTextNode(twidenash.items[i].user + 
                     ": "));
-                var exp = /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/i;
+                var exp = /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/gi;
                 span.innerHTML = twidenash.items[i].text.replace(exp,"<a href='$1' target='_blank'>$1</a>");
                 li.appendChild(img);
                 li.appendChild(nick);