Merge lp:~stefanor/ibid/twitter-rt-554906 into lp:~ibid-core/ibid/old-trunk-1.6

[Stefano Rivera]

Display latest tweets from retweeting-twits instead of thinking they don't exist

Pretty straightforward fix. They don't kneecap the Atom feed

Proposed for 0.1

[Jonathan Hitchcock (vhata)]

review: Approve

[Max Rabkin (max-rabkin)]

review: Approve

[Michael Gorven (mgorven)]

 review approve

review: Approve

=== modified file 'ibid/plugins/social.py'
--- ibid/plugins/social.py	2010-03-27 15:50:58 +0000
+++ ibid/plugins/social.py	2010-06-04 19:13:23 +0000
@@ -9,10 +9,11 @@
 
 import feedparser
 
-from ibid.compat import dt_strptime
+from ibid.compat import dt_strptime, ElementTree
 from ibid.config import DictOption
 from ibid.plugins import Processor, match, handler
-from ibid.utils import ago, decode_htmlentities, json_webservice
+from ibid.utils import ago, decode_htmlentities, generic_webservice, \
+                       json_webservice
 
 log = logging.getLogger('plugins.social')
 features = {}
@@ -71,23 +72,38 @@
         return {'screen_name': status['user']['screen_name'], 'text': decode_htmlentities(status['text'])}
 
     def remote_latest(self, service, user):
-        statuses = json_webservice(
-                '%sstatuses/user_timeline/%s.json' % (service['endpoint'], user.encode('utf-8')),
-                {'count': 1})
-
-        if not statuses:
-            raise self.NoSuchUserException(user)
-
-        latest = statuses[0]
-
         if service['api'] == 'twitter':
-            url = '%s%s/status/%i' % (service['endpoint'], latest['user']['screen_name'], latest['id'])
+            # Twitter ommits retweets in the JSON and XML results:
+            statuses = generic_webservice('%sstatuses/user_timeline/%s.atom'
+                    % (service['endpoint'], user.encode('utf-8')),
+                    {'count': 1})
+            tree = ElementTree.fromstring(statuses)
+            latest = tree.find('{http://www.w3.org/2005/Atom}entry')
+            return {
+                'text': latest.findtext('{http://www.w3.org/2005/Atom}content')
+                        .split(': ', 1)[1],
+                'ago': ago(datetime.utcnow() - dt_strptime(
+                    latest.findtext('{http://www.w3.org/2005/Atom}published'),
+                    '%Y-%m-%dT%H:%M:%S+00:00')),
+                'url': [x for x
+                     in latest.getiterator('{http://www.w3.org/2005/Atom}link')
+                     if x.get('type') == 'text/html'
+                  ][0].get('href'),
+            }
         elif service['api'] == 'laconica':
-            url = '%s/notice/%i' % (service['endpoint'].split('/api/', 1)[0], latest['id'])
+            statuses = json_webservice('%sstatuses/user_timeline/%s.json'
+                    % (service['endpoint'], user.encode('utf-8')),
+                    {'count': 1})
+            if not statuses:
+                raise self.NoSuchUserException(user)
+            latest = statuses[0]
+            url = '%s/notice/%i' % (service['endpoint'].split('/api/', 1)[0],
+                                    latest['id'])
 
         return {
             'text': decode_htmlentities(latest['text']),
-            'ago': ago(datetime.utcnow() - dt_strptime(latest['created_at'], '%a %b %d %H:%M:%S +0000 %Y')),
+            'ago': ago(datetime.utcnow() - dt_strptime(latest['created_at'],
+                   '%a %b %d %H:%M:%S +0000 %Y')),
             'url': url,
         }