Merge lp:~stefanor/ibid/microblogging-374029 into lp:~ibid-core/ibid/old-trunk-pack-0.92

[Stefano Rivera]

[Stefano Rivera (stefanor)]

We had to include the fail whale

[Michael Gorven (mgorven)]

Looks fine. I think we want to change the service configuration to include the
name of a status update (identi.ca updates are apparently called "dents")
though.
 review approve

review: Approve

[Stefano Rivera (stefanor)]

> Looks fine. I think we want to change the service configuration to include the
> name of a status update (identi.ca updates are apparently called "dents")
> though.

Aha. Sensible idea. r636

[lp:~stefanor/ibid/microblogging-374029]

636. By Stefano Rivera on 2009-05-10

Redo the microblogging services dictionary

[Jonathan Hitchcock (vhata)]

I'd prefer to call the "users" (nobody actually *says* 'microblogger').

But yeah.

review: Approve

=== modified file 'ibid/plugins/lookup.py'
--- ibid/plugins/lookup.py	2009-05-08 11:46:31 +0000
+++ ibid/plugins/lookup.py	2009-05-10 09:03:08 +0000
@@ -228,19 +228,33 @@
 
     @handler
     def update(self, event, service, id):
-        event.addresponse(u'%(screen_name)s: "%(text)s"', self.remote_update(service.lower(), int(id)))
+        try:
+            event.addresponse(u'%(screen_name)s: "%(text)s"', self.remote_update(service.lower(), int(id)))
+        except HTTPError, e:
+            if e.code == 403:
+                event.addresponse(u'That %s is private', service.lower() == 'twitter' and 'tweet' or service.lower())
+            elif e.code == 404:
+                event.addresponse(u'No such %s', service.lower() == 'twitter' and 'tweet' or service.lower())
+            else:
+                event.addresponse(u'I can only see the Fail Whale')
 
     @handler
     def latest(self, event, service, user):
-        event.addresponse(u'"%(text)s" %(ago)s ago, %(url)s', self.remote_latest(service.lower(), user))
+        try:
+            event.addresponse(u'"%(text)s" %(ago)s ago, %(url)s', self.remote_latest(service.lower(), user))
+        except HTTPError, e:
+            if e.code == 404:
+                event.addresponse(u'No such microblogger')
+            else:
+                event.addresponse(u'I can only see the Fail Whale')
 
     @match(r'^https?://(?:www\.)?twitter\.com/[^/ ]+/statuse?s?/(\d+)$')
     def twitter(self, event, id):
-        event.addresponse(u'%(screen_name)s: "%(text)s"', self.remote_update('twitter', int(id)))
+        self.update(event, u'twitter', id)
 
     @match(r'^https?://(?:www\.)?identi.ca/notice/(\d+)$')
     def identica(self, event, id):
-        event.addresponse(u'%(screen_name)s: "%(text)s"', self.remote_update('identi.ca', int(id)))
+        self.update(event, u'identica', id)
 
 help['currency'] = u'Converts amounts between currencies.'
 class Currency(Processor):