Merge lp:~ssweeny/gwibber/gwibber-lp834773 into lp:gwibber

Proposed by Scott Sweeny
Status: Merged
Merged at revision: 1182
Proposed branch: lp:~ssweeny/gwibber/gwibber-lp834773
Merge into: lp:gwibber
Diff against target: 25 lines (+2/-2)
2 files modified
gwibber/microblog/plugins/identica/__init__.py (+1/-1)
gwibber/microblog/plugins/statusnet/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~ssweeny/gwibber/gwibber-lp834773
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+77855@code.launchpad.net

Description of the change

As described in the commit message, this change fixes the "shared by" display name ("retweeted_by" field) for StatusNet and identi.ca. The original code showed the author of the post itself rather than the contact who repeated/retweeted it.

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Great, thanks for the fix!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gwibber/microblog/plugins/identica/__init__.py'
2--- gwibber/microblog/plugins/identica/__init__.py 2011-08-22 16:11:15 +0000
3+++ gwibber/microblog/plugins/identica/__init__.py 2011-10-03 04:55:26 +0000
4@@ -122,7 +122,7 @@
5
6 n = {}
7 if data.has_key("retweeted_status"):
8- n["retweeted_by"] = self._user(data["retweeted_status"]["user"] if "user" in data["retweeted_status"] else data["sender"])
9+ n["retweeted_by"] = self._user(data["user"] if "user" in data else data["sender"])
10 if data.has_key("created_at"):
11 n["time"] = util.parsetime(data["created_at"])
12 data = data["retweeted_status"]
13
14=== modified file 'gwibber/microblog/plugins/statusnet/__init__.py'
15--- gwibber/microblog/plugins/statusnet/__init__.py 2011-08-22 16:11:15 +0000
16+++ gwibber/microblog/plugins/statusnet/__init__.py 2011-10-03 04:55:26 +0000
17@@ -125,7 +125,7 @@
18
19 n = {}
20 if data.has_key("retweeted_status"):
21- n["retweeted_by"] = self._user(data["retweeted_status"]["user"] if "user" in data["retweeted_status"] else data["sender"])
22+ n["retweeted_by"] = self._user(data["user"] if "user" in data else data["sender"])
23 if data.has_key("created_at"):
24 n["time"] = util.parsetime(data["created_at"])
25 data = data["retweeted_status"]