Merge lp:~robru/friends/tweet-reply into lp:~super-friends/friends/raring

[Robert Bruce Park]

Make Twitter.send_thread prepend the necessary @mention if it is missing from the tweet. (LP: #1156829)

[Ken VanDine (ken-vandine)]

Thanks!

review: Approve

=== modified file 'friends/protocols/twitter.py'
--- friends/protocols/twitter.py	2013-03-13 18:05:13 +0000
+++ friends/protocols/twitter.py	2013-03-19 03:16:24 +0000
@@ -31,7 +31,6 @@
 from friends.utils.avatar import Avatar
 from friends.utils.base import Base, feature
 from friends.utils.cache import JsonCache
-from friends.utils.model import Model
 from friends.utils.http import BaseRateLimiter, Downloader
 from friends.utils.time import parsetime, iso8601utc
 from friends.errors import FriendsError
@@ -254,6 +253,12 @@
         order for Twitter to actually accept this as a reply.  Otherwise it
         will just be an ordinary tweet.
         """
+        try:
+            sender = '@{}'.format(self._fetch_cell(message_id, 'sender_nick'))
+            if message.find(sender) < 0:
+                message = sender + ' ' + message
+        except FriendsError:
+            pass
         url = self._api_base.format(endpoint='statuses/update')
         tweet = self._get_url(url, dict(in_reply_to_status_id=message_id,
                                         status=message))

=== modified file 'friends/tests/test_twitter.py'
--- friends/tests/test_twitter.py	2013-03-14 19:14:03 +0000
+++ friends/tests/test_twitter.py	2013-03-19 03:16:24 +0000
@@ -389,6 +389,44 @@
                         'tweet @pumpichank!',
                  in_reply_to_status_id='1234'))
 
+    @mock.patch('friends.utils.base.Model', TestModel)
+    @mock.patch('friends.utils.http.Soup.Message',
+                FakeSoupMessage('friends.tests.data', 'twitter-home.dat'))
+    @mock.patch('friends.protocols.twitter.Twitter._login',
+                return_value=True)
+    @mock.patch('friends.utils.base._seen_ids', {})
+    def test_send_thread_prepend_nick(self, *mocks):
+        self.account.access_token = 'access'
+        self.account.secret_token = 'secret'
+        self.account.auth.parameters = dict(
+            ConsumerKey='key',
+            ConsumerSecret='secret')
+        self.assertEqual(0, TestModel.get_n_rows())
+        self.assertEqual(self.protocol.home(), 3)
+        self.assertEqual(3, TestModel.get_n_rows())
+
+        # If you forgot to @mention in your reply, we add it for you.
+        get = self.protocol._get_url = mock.Mock()
+        self.protocol._publish_tweet = mock.Mock()
+        self.protocol.send_thread(
+            '240556426106372096',
+            'Exciting and original response!')
+        get.assert_called_once_with(
+            'https://api.twitter.com/1.1/statuses/update.json',
+            dict(status='@raffi Exciting and original response!',
+                 in_reply_to_status_id='240556426106372096'))
+
+        # If you remembered the @mention, we won't duplicate it.
+        get.reset_mock()
+        self.protocol.send_thread(
+            '240556426106372096',
+            'You are the greatest, @raffi!')
+        get.assert_called_once_with(
+            'https://api.twitter.com/1.1/statuses/update.json',
+            dict(status='You are the greatest, @raffi!',
+                 in_reply_to_status_id='240556426106372096'))
+
+
     def test_delete(self):
         get_url = self.protocol._get_url = mock.Mock(return_value='tweet')
         publish = self.protocol._unpublish = mock.Mock()

=== modified file 'friends/utils/base.py'
--- friends/utils/base.py	2013-03-14 13:29:53 +0000
+++ friends/utils/base.py	2013-03-19 03:16:24 +0000
@@ -478,6 +478,16 @@
             message = None
         raise FriendsError(message or str(error))
 
+    def _fetch_cell(self, message_id, column_name):
+        """Find a column value associated with a specific message_id."""
+        row_id = _seen_ids.get(message_id)
+        col_idx = COLUMN_INDICES.get(column_name)
+        if None not in (row_id, col_idx):
+            row = Model.get_row(row_id)
+            return row[col_idx]
+        else:
+            raise FriendsError('Value could not be found.')
+
     def _new_book_client(self, source):
         client = EBook.BookClient.new(source)
         client.open_sync(False, None)