Merge lp:~ken-vandine/gwibber/lp_933694 into lp:gwibber

[Ken VanDine]

Fix duplicate detection by falling back to comparing _html, _link_description, _image_url and _video_url (LP: #933694)

[David Klasinc (bigwhale)]

review: Approve

=== modified file 'libgwibber/streams.vala'
--- libgwibber/streams.vala	2012-03-07 14:27:42 +0000
+++ libgwibber/streams.vala	2012-03-08 15:11:18 +0000
@@ -485,14 +485,8 @@
             if (obj.has_member("text"))
               _text = obj.get_string_member("text");
 
-            string _textid = "";
-            foreach (var x in _text.replace(".", "").split(" "))
-              if ((!x.has_prefix("http://")) && (!x.has_prefix("https://")) 
-                && (!x.has_prefix("gwibber:/")) && (!x.has_prefix("#"))
-                && (!x.has_prefix("!")))
-                  _textid += x + " ";
+            string _textid = gen_text_id (_text);
 
-            _textid = _textid.strip();
             // FIXME: the transient == 0 disables dupe checking for transients, we should fix that
             //string _icon = yield service.avatar_path(_sender_obj.get_string_member("image"));
             if (_sender_obj.has_member("image"))
@@ -686,6 +680,16 @@
             if (_link_description != null)
               _link_description = scrub (_link_description);
 
+            /* If textid is empty, lets fallback to check some other fields */
+            if (_textid.length < 1 && _html != null)
+              _textid = gen_text_id (_html);
+            if (_textid.length < 1 && _link_description != null)
+              _textid = gen_text_id (_link_description);
+            if (_textid.length < 1 && _image_url != null)
+              _textid = _image_url.strip ();
+            if (_textid.length < 1 && _image_url != null)
+              _textid = _video_url.strip ();
+
             string _t = utils.generate_time_string(_time);
 
             if (seen.has_key(_textid) && transient == "0")
@@ -778,6 +782,21 @@
           return res;
         }
 
+        private string gen_text_id (string t)
+        {
+          string id = "";
+          if (t.length > 0)
+          { 
+            foreach (var x in t.replace(".", "").split(" "))
+              if ((!x.has_prefix("http://")) && (!x.has_prefix("https://")) 
+                && (!x.has_prefix("gwibber:/")) && (!x.has_prefix("#"))
+                && (!x.has_prefix("!")))
+                  id += x + " ";
+            id = id.strip();
+          }
+          return id;
+        }
+
 
 
         /**