Only in gwibber-2.91.91.1.mod: build Only in gwibber-2.91.91.1.mod: debian diff -ru gwibber-2.91.91.1/gwibber/microblog/plugins/twitter/__init__.py gwibber-2.91.91.1.mod/gwibber/microblog/plugins/twitter/__init__.py --- gwibber-2.91.91.1/gwibber/microblog/plugins/twitter/__init__.py 2011-03-13 08:09:42.000000000 -0700 +++ gwibber-2.91.91.1.mod/gwibber/microblog/plugins/twitter/__init__.py 2011-04-01 09:31:47.000000000 -0700 @@ -74,18 +74,21 @@ def _common(self, data): m = {}; try: + tweetText = data["text"] + if "retweeted_status" in data: + tweetText = data["retweeted_status"]["text"] m["mid"] = str(data["id"]) m["service"] = "twitter" m["account"] = self.account["id"] m["time"] = util.parsetime(data["created_at"]) - m["text"] = unescape(data["text"]) - m["to_me"] = ("@%s" % self.account["username"]) in data["text"] + m["text"] = unescape(tweetText) + m["to_me"] = ("@%s" % self.account["username"]) in tweetText - m["html"] = util.linkify(data["text"], + m["html"] = util.linkify(tweetText, ((util.PARSE_HASH, '#\\1' % URL_PREFIX), (util.PARSE_NICK, '@\\1' % URL_PREFIX)), escape=False) - m["content"] = util.linkify(data["text"], + m["content"] = util.linkify(tweetText, ((util.PARSE_HASH, '#\\1' % m["account"]), (util.PARSE_NICK, '@\\1' % m["account"])), escape=False) @@ -124,7 +127,9 @@ m["reply"]["nick"] = data["in_reply_to_screen_name"] m["reply"]["url"] = "/".join((URL_PREFIX, m["reply"]["nick"], "statuses", str(m["reply"]["id"]))) - m["sender"] = self._user(data["user"] if "user" in data else data["sender"]) + if "retweeted_status" in data: + m["retweeter"] = self._user(data["user"] if "user" in data else data["sender"]) + m["sender"] = self._user(data["retweeted_status"]["user"] if "retweeted_status" in data else (data["user"] if "user" in data else data["sender"])) m["url"] = "/".join((m["sender"]["url"], "statuses", str(m["mid"]))) return m diff -ru gwibber-2.91.91.1/ui/templates/base.mako gwibber-2.91.91.1.mod/ui/templates/base.mako --- gwibber-2.91.91.1/ui/templates/base.mako 2011-03-13 08:09:42.000000000 -0700 +++ gwibber-2.91.91.1.mod/ui/templates/base.mako 2011-04-01 09:32:36.000000000 -0700 @@ -198,6 +198,9 @@ % if data.get("reply", {}).get("nick", 0): ${_("in reply to")} ${data['reply']['nick']} % endif + % if data.get("retweeter", {}).get("nick", 0): + ${_("RT by")} ${data['retweeter']['nick']} + % endif <%def name="sender(data)" filter="trim">