Merge lp:~markjtully/gwibber/multiplenicks into lp:gwibber

[Mark Tully]

Fixes an issue where multiple occurances of the same twitter name in the same tweet are not properly formatted, leading to a blank tweet in the stream.

[lp:~markjtully/gwibber/multiplenicks]

1324. By Mark Tully on 2012-03-28

Replace all instances of a hashtag's occurance in a tweet at once rather than one at a time. (Prevents replacement of a second instance of a hashtag being put in the wrong place leading to malformed html)

[Ken VanDine (ken-vandine)]

There is a missing ">" in the mentions replace, I am fixing it in my merge.

Thanks!

review: Approve

=== modified file 'gwibber/microblog/plugins/twitter/__init__.py'
--- gwibber/microblog/plugins/twitter/__init__.py	2012-03-06 17:26:55 +0000
+++ gwibber/microblog/plugins/twitter/__init__.py	2012-03-28 00:37:21 +0000
@@ -89,29 +89,25 @@
 
         #Get mention entries
         if data["entities"].has_key("user_mentions"):
+          names = []
           for mention in data["entities"]["user_mentions"]:
-            try:
-              screen_name  = mention["screen_name"].lower()
-              startindex = m["content"].lower().index("@" + screen_name) + 1
-              endindex   = startindex + len(screen_name)
-              start      = m["content"][0:startindex]
-              end        = m["content"][endindex:]
-              m["content"] = start + "<a href='gwibber:/user?acct=" + m["account"] + "&name=@" + mention["screen_name"] + "'>" + mention["screen_name"] + "</a>" + end
-            except:
-              pass
-              
+            if not mention["screen_name"] in names:
+              try:
+                m["content"] = m["content"].replace("@" + mention["screen_name"], "@<a href='gwibber:/user?acct=" + m["account"] + "&name=@" + mention["screen_name"] + "'>" + mention["screen_name"] + "</a")
+              except:
+                pass
+            names.append(mention["screen_name"])  
+
         #Get hashtag entities
         if data["entities"].has_key("hashtags"):
-          for tags in data["entities"]["hashtags"]:
-            try:
-              text       = tags["text"]
-              startindex = m["content"].index("#" + text) + 1
-              endindex   = startindex + len(text)
-              start      = m["content"][0:startindex]
-              end        = m["content"][endindex:]
-              m["content"] = start + "<a href='gwibber:/tag?acct=" + m["account"] + "&query=" + text + "'>" + text + "</a>" + end
-            except:
-              pass
+          hashtags = []
+          for tag in data["entities"]["hashtags"]:
+            if not tag["text"] in hashtags:
+              try:
+                m["content"] = m["content"].replace("#" + tag["text"], "#<a href='gwibber:/tag?acct=" + m["account"] + "&query=#" + tag["text"] + "'>" + tag["text"] + "</a>")
+              except:
+                pass
+            hashtags.append(tag["text"])
         
         # Get url entities - These usually go in the link stream, but if they're picturesor videos, they should go in the proper stream
         if data["entities"].has_key("urls"):