Gwibber

Merge lp://staging/~colindean/gwibber/statusnet-identica-groups-lp364322 into lp://staging/gwibber

  1. statusnet-identica-groups-lp364322
  2. Merge into trunk
Proposed by Colin Dean
Status: Merged
Merge reported by: Ryan Paul
Merged at revision: not available
Proposed branch: lp://staging/~colindean/gwibber/statusnet-identica-groups-lp364322
Merge into: lp://staging/gwibber
Diff against target: 56 lines
3 files modified
gwibber/actions.py (+5/-0)
gwibber/microblog/identica.py (+7/-4)
gwibber/microblog/laconica.py (+4/-4)
To merge this branch: bzr merge lp://staging/~colindean/gwibber/statusnet-identica-groups-lp364322
Reviewer Review Type Date Requested Status
gwibber-committers Pending
Review via email: mp+13898@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Colin Dean (colindean) wrote :

I think I did the remerging correctly...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gwibber/actions.py'
2--- gwibber/actions.py 2009-09-24 15:06:26 +0000
3+++ gwibber/actions.py 2009-10-24 17:10:23 +0000
4@@ -133,6 +133,11 @@
5 @classmethod
6 def action(self, w, client, query):
7 print "Searching for tag", query
8+
9+class group(MessageAction):
10+ @classmethod
11+ def action(self, w, client, query):
12+ print "Searching for group", query
13
14 class tomboy(MessageAction):
15 icon = "tomboy"
16
17=== modified file 'gwibber/microblog/identica.py'
18--- gwibber/microblog/identica.py 2009-10-01 06:57:48 +0000
19+++ gwibber/microblog/identica.py 2009-10-24 17:10:23 +0000
20@@ -165,10 +165,13 @@
21 query}))))["entries"]
22
23 def get_group(self, query):
24- return feedparser.parse(urllib2.urlopen(
25- urllib2.Request("https://identi.ca/index.php",
26- urllib.urlencode({"action": "grouprss", "nickname":
27- query}))))["entries"]
28+ return simplejson.load(urllib2.urlopen(
29+ urllib2.Request("http://identi.ca/api/statusnet/groups/timeline.json",
30+ urllib.urlencode({"id": query}))))["results"]
31+ #return feedparser.parse(urllib2.urlopen(
32+ # urllib2.Request("https://identi.ca/index.php",
33+ # urllib.urlencode({"action": "grouprss", "nickname":
34+ # query}))))["entries"]
35
36 def get_public_timeline(self):
37 return simplejson.loads(self.connect(
38
39=== modified file 'gwibber/microblog/laconica.py'
40--- gwibber/microblog/laconica.py 2009-09-21 22:56:53 +0000
41+++ gwibber/microblog/laconica.py 2009-10-24 17:10:23 +0000
42@@ -165,10 +165,10 @@
43 urllib.urlencode({"action": "tagrss", "tag": query}))))["entries"]
44
45 def get_group(self, query):
46- return feedparser.parse(urllib2.urlopen(
47- urllib2.Request(self.url("/index.php"),
48- urllib.urlencode({"action": "grouprss", "nickname": query}))))["entries"]
49-
50+ return simplejson.load(urllib2.urlopen(
51+ urllib2.Request(self.url("/api/statusnet/groups/timeline.json"),
52+ urllib.urlencode({"id": query}))))["results"]
53+
54 def search(self, query):
55 for data in self.get_search(query):
56 yield SearchResult(self, data, query)

Subscribers

People subscribed via source and target branches