Merge lp:~robru/friends/notify-no-html into lp:friends

[Robert Bruce Park]

Don't add HTML links to the notification, only to the DeeModel

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:183
http://jenkins.qa.ubuntu.com/job/friends-ci/26/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-raring-amd64-ci/26

Click here to trigger a rebuild:
http://s-jenkins:8080/job/friends-ci/26/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Fixed the bug and works great, looks like you unintentionally removed some leading white space from a comment on line 350 of base.py.

review: Approve

[Robert Bruce Park (robru)]

Weird about the leading space, you're right that that's a mistake... oh well, harmless.

=== modified file 'friends/tests/test_notify.py'
--- friends/tests/test_notify.py	2013-03-14 19:14:03 +0000
+++ friends/tests/test_notify.py	2013-04-08 19:36:19 +0000
@@ -36,6 +36,19 @@
     @mock.patch('friends.utils.base.Model', TestModel)
     @mock.patch('friends.utils.base._seen_ids', {})
     @mock.patch('friends.utils.base.notify')
+    def test_publish_no_html(self, notify):
+        Base._do_notify = lambda protocol, stream: True
+        base = Base(FakeAccount())
+        base._publish(
+            message='http://example.com!',
+            message_id='1234',
+            sender='Benjamin',
+            )
+        notify.assert_called_once_with('Benjamin', 'http://example.com!', '')
+
+    @mock.patch('friends.utils.base.Model', TestModel)
+    @mock.patch('friends.utils.base._seen_ids', {})
+    @mock.patch('friends.utils.base.notify')
     def test_publish_all(self, notify):
         Base._do_notify = lambda protocol, stream: True
         base = Base(FakeAccount())

=== modified file 'friends/utils/base.py'
--- friends/utils/base.py	2013-04-05 18:36:09 +0000
+++ friends/utils/base.py	2013-04-08 19:36:19 +0000
@@ -347,8 +347,9 @@
                 account_id=self._account.id
                 )
             )
-        # linkify the message
-        kwargs['message'] = linkify_string(kwargs.get('message', ''))
+# linkify the message
+        orig_message = kwargs.get('message', '')
+        kwargs['message'] = linkify_string(orig_message)
         args = []
         # Now iterate through all the column names listed in the
         # SCHEMA, and pop matching column values from the kwargs, in
@@ -370,7 +371,7 @@
                 if not args[FROM_ME_IDX] and self._do_notify(args[STREAM_IDX]):
                     notify(
                         args[SENDER_IDX],
-                        args[MESSAGE_IDX],
+                        orig_message,
                         args[AVATAR_IDX],
                         )
             return message_id in _seen_ids