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

[Stefano Rivera]

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

675. By Stefano Rivera on 2009-06-24

Only return 'No such quote' when a quote was queried by id, error instead

[Michael Gorven (mgorven)]

 review approve

review: Approve

[Jonathan Hitchcock (vhata)]

review: Approve

=== modified file 'ibid/plugins/lookup.py'
--- ibid/plugins/lookup.py	2009-06-02 20:00:01 +0000
+++ ibid/plugins/lookup.py	2009-06-24 19:46:41 +0000
@@ -186,14 +186,7 @@
 
     @match(r'^fml$')
     def fml_default(self, event):
-        try:
-            event.addresponse(self.remote_get('random'))
-        except FMLException:
-            event.addresponse(choice(self.failure_messages) % event.sender)
-        except HTTPError:
-            event.addresponse(choice(self.failure_messages) % event.sender)
-        except BadStatusLine:
-            event.addresponse(choice(self.failure_messages) % event.sender)
+        self.fml(event, 'random')
 
     @match(r'^fml\s+categories$')
     def list_categories(self, event):
@@ -217,7 +210,7 @@
 
     def setup(self):
         self.update.im_func.pattern = re.compile(r'^(%s)\s+(\d+)$' % '|'.join(self.services.keys()), re.I)
-        self.latest.im_func.pattern = re.compile(r'^(?:latest|last)\s+(%s)\s+(?:update\s+)?(?:(?:by|from|for)\s+)?(\S+)$'
+        self.latest.im_func.pattern = re.compile(r'^(?:latest|last)\s+(%s)\s+(?:update\s+)?(?:(?:by|from|for)\s+)?@?(\S+)$'
                 % '|'.join(self.services.keys()), re.I)
 
     def remote_update(self, service, id):