add support for to field

tbarbugli · tbarbugli · commit 2929f58af580 · 2014-08-15T11:20:04.000+02:00
diff --git a/stream/feed.py b/stream/feed.py
@@ -19,6 +19,13 @@ def __init__(self, client, feed_id, token):
         self.token = token
         self.authorization = self.feed_together + ' ' + self.token
 
+    def add_to_signature(self, recipients):
+        data = []
+        for recipient in recipients:
+            feed = self.client.feed(recipient)
+            data.append("%s %s" % (recipient, feed.token))
+        return data
+
     def add_activity(self, activity_data):
         '''
         Adds an activity to the feed, this will also trigger an update
@@ -31,6 +38,9 @@ def add_activity(self, activity_data):
             activity_data = {'actor': 1, 'verb': 'tweet', 'object': 1}
             activity_id = feed.add_activity(activity_data)
         '''
+        if activity_data.get('to'):
+            activity_data['to'] = self.add_to_signature(activity_data['to'])
+
         result = self.client.post(
             self.feed_url, data=activity_data, authorization=self.authorization)
         return result
@@ -49,6 +59,10 @@ def add_activities(self, activity_list):
             ]
             result = feed.add_activities(activity_data)
         '''
+        for activity_data in activity_list:
+            if activity_data.get('to'):
+                activity_data['to'] = self.add_to_signature(activity_data['to'])
+
         data = dict(activities=activity_list)
         result = self.client.post(
             self.feed_url, data=data, authorization=self.authorization)
diff --git a/stream/tests.py b/stream/tests.py
@@ -61,6 +61,17 @@ def test_add_activity(self):
         activities = self.user1.get(limit=1)['results']
         self.assertEqual(activities[0]['id'], activity_id)
 
+    def test_add_activity_to(self):
+        activity_data = {
+            'actor': 1, 'verb': 'tweet', 'object': 1,
+            'to': ['user:pyto1']
+        }
+        response = self.user1.add_activity(activity_data)
+        feed = client.feed('user:pyto1')
+        activity_id = response['id']
+        activities = feed.get(limit=1)['results']
+        self.assertEqual(activities[0]['id'], activity_id)
+
     def test_remove_activity(self):
         activity_data = {'actor': 1, 'verb': 'tweet', 'object': 1}
         activity_id = self.user1.add_activity(activity_data)['id']
@@ -88,6 +99,28 @@ def test_add_activities(self):
         get_activity_ids = [a['id'] for a in activities]
         self.assertEqual(get_activity_ids, activity_ids[::-1])
 
+    def test_add_activities_to(self):
+        to = ['user:pyto2', 'user:pyto3']
+        activity_data = [
+            {'actor': 1, 'verb': 'tweet', 'object': 1, 'to': to},
+            {'actor': 2, 'verb': 'watch', 'object': 2, 'to': to},
+        ]
+        response = self.user1.add_activities(activity_data)
+        activity_ids = [a['id'] for a in response['activities']]
+        activities = self.user1.get(limit=2)['results']
+        get_activity_ids = [a['id'] for a in activities]
+        self.assertEqual(get_activity_ids, activity_ids[::-1])
+        # test first target
+        feed = client.feed('user:pyto2')
+        activities = feed.get(limit=2)['results']
+        get_activity_ids = [a['id'] for a in activities]
+        self.assertEqual(get_activity_ids, activity_ids[::-1])
+        # test second target
+        feed = client.feed('user:pyto3')
+        activities = feed.get(limit=2)['results']
+        get_activity_ids = [a['id'] for a in activities]
+        self.assertEqual(get_activity_ids, activity_ids[::-1])
+
     def test_follow(self):
         actor_id = random.randint(10, 100000)
         activity_data = {'actor': actor_id, 'verb': 'tweet', 'object': 1}
