Merge lp:~roignac/gwibber/Bug548524 into lp:gwibber

[Vadim Rutkovsky]

Fixes LP:548524 - when sending message using twitter, group tags are also replaced with hashtags. Also, moved PARSE_GROUP variable to util module.

[Robert Bruce Park (robru)]

Thanks for taking the time to submit this patch, unfortunately Gwibber has gone through extensive changes recently and your patch no longer applies to the latest codebase.

Fortunately, the bug you were attempting to fix is no longer present in the current codebase. The new Twitter plugin does not do any parsing/munging of group or hashtags, so currently if you were to send a group tag to Twitter using Gwibber, Twitter would receive the message as you wrote it.

Please try out the latest Gwibber, I think you'll be quite pleased with what we've accomplished.

review: Disapprove

Unmerged revisions

832. By Vadim Rutkovsky on 2010-08-28

group tags are replaced with hashtags when message is sent from Twitter

=== modified file 'gwibber/actions.py'
--- gwibber/actions.py	2010-08-26 19:06:44 +0000
+++ gwibber/actions.py	2010-08-28 11:41:05 +0000
@@ -43,7 +43,6 @@
 class retweet(MessageAction):
   icon = "mail-forward"
   label = _("R_etweet")
-  PARSE_GROUP = re.compile("\B!([A-Za-z0-9_\-]+|@[A-Za-z0-9_\-]$)")
 
   @classmethod
   def action(self, w, client, msg):
@@ -51,9 +50,9 @@
       text = RETWEET_FORMATS[client.model.settings["retweet_style"]]
       symbol = "RD" if msg["service"] == "identica" else "RT"
       text = text.format(text=msg["text"], nick=msg["sender"]["nick"], R=symbol)
-      #replace ! with # if identica service
+      #replace ! with # if service is identica
       if msg["service"] == "identica" and client.model.settings["global_retweet"]:
-          text = self.PARSE_GROUP.sub('#\\1', text)
+          text = gwibber.microblog.util.PARSE_GROUP.sub('#\\1', text)
 
       if not client.model.settings["global_retweet"]:
         client.message_target.set_target(msg, "repost")
 
=== modified file 'gwibber/microblog/twitter.py'
--- gwibber/microblog/twitter.py	2010-08-26 19:14:43 +0000
+++ gwibber/microblog/twitter.py	2010-08-28 11:41:05 +0000
@@ -240,6 +240,8 @@
     return self._get("favorites/create/%s.json" % message["mid"], None, post=True, do=1)
 
   def send(self, message):
+    # replace identica groups (!) with hashtags if message is sent to twitter
+    message = util.PARSE_GROUP.sub('#\\1', message)
     return self._get("statuses/update.json", post=True, single=True,
         status=message, source="gwibbernet")
   
 
=== modified file 'gwibber/microblog/util/__init__.py'
--- gwibber/microblog/util/__init__.py	2010-08-22 18:30:36 +0000
+++ gwibber/microblog/util/__init__.py	2010-08-28 11:41:05 +0000
@@ -30,6 +30,7 @@
 PARSE_NICK = re.compile("\B@([A-Za-z0-9_]+|@[A-Za-z0-9_]$)")
 PARSE_HASH = re.compile("\B#([A-Za-z0-9_\-]+|@[A-Za-z0-9_\-]$)")
 PARSE_URLS = re.compile(r"<[^<]*?/?>") 
+PARSE_GROUP = re.compile("\B!([A-Za-z0-9_\-]+|@[A-Za-z0-9_\-]$)")
 
 def strip_urls(text):
   return PARSE_URLS.sub("", text)