Merge pull request GetStream#36 from GetStream/feature-activity-copy-limit

tbarbugli · tbarbugli · commit f994a8c1f4d4 · 2016-03-12T11:36:42.000+01:00
Added activity_copy_limit to follow method
diff --git a/stream/client.py b/stream/client.py
@@ -235,15 +235,20 @@ def add_to_many(self, activity, feeds):
         data = {'activity': activity, 'feeds': feeds}
         self._make_signed_request('post', 'feed/add_to_many/', data=data)
 
-    def follow_many(self, follows):
+    def follow_many(self, follows, activity_copy_limit=None):
         '''
         Creates many follows
         :param follows: the list of follow relations
 
         eg. [{'source': source, 'target': target}]
 
         '''
-        self._make_signed_request('post', 'follow_many/', data=follows)
+        params = None
+
+        if activity_copy_limit != None:
+            params = dict(activity_copy_limit=activity_copy_limit)
+
+        self._make_signed_request('post', 'follow_many/', params=params, data=follows)
 
     def update_activities(self, activities):
         '''
diff --git a/stream/feed.py b/stream/feed.py
@@ -126,7 +126,7 @@ def get(self, **params):
             self.feed_url, params=params, signature=token)
         return response
 
-    def follow(self, target_feed_slug, target_user_id, **extra_data):
+    def follow(self, target_feed_slug, target_user_id, activity_copy_limit, **extra_data):
         '''
         Follows the given feed
 
@@ -141,6 +141,8 @@ def follow(self, target_feed_slug, target_user_id, **extra_data):
             'target': target_feed_id,
             'target_token': self.client.feed(target_feed_slug, target_user_id).token
         }
+        if activity_copy_limit != None:
+            data['activity_copy_limit'] = activity_copy_limit
         token = self.create_scope_token('follower', 'write')
         data.update(extra_data)
         response = self.client.post(
diff --git a/stream/tests.py b/stream/tests.py
@@ -19,8 +19,8 @@
 
 def connect_debug():
     return stream.connect(
-        'gav9ygr75by3',
-        '5ws2hnua79n9qga6e2dy572qdfapwgdc83853mjm3mjp66czyb2xkahbdhs98an8',
+        '2a7ug7h97y6v',
+        'rg24qz8qtqq2dqqejushqt7m8v7fzrnkad6xmu2b9e3ejrjb7wabktyvgenu3car',
         location='us-east',
         timeout=10
     )
@@ -309,6 +309,17 @@ def test_follow_and_source(self):
         activity_id_found = activity['id'] if activity is not None else None
         self.assertEqual(activity['origin'], feed.id)
         self.assertEqual(activity_id_found, activity_id)
+
+    def test_follow_activity_copy_limit(self):
+        feed = getfeed('user', 'test_follow_acl')
+        feed1 = getfeed('user', 'test_follow_acl1')
+        actor_id = random.randint(10, 100000)
+        feed1.add_activity({ 'actor': actor_id, 'verb': 'tweet', 'object': 1 })
+        feed.follow(feed1.slug, feed1.user_id, activity_copy_limit=0)
+        time.sleep(10)
+        activities = feed.get(limit=5)['results']
+
+        self.assertEqual(len(activities), 0)
         
     def test_follow_and_delete(self):
         user_feed = getfeed('user', 'test_follow')
@@ -690,6 +701,22 @@ def test_follow_many(self):
             self.assertEqual(follows[0]['feed_id'], source)
             self.assertIn(follows[0]['target_id'], targets)
 
+    def test_follow_many_acl(self):
+        sources = [getfeed('user', str(i)) for i in range(10)]
+        targets = [getfeed('flat', str(i)) for i in range(10)]
+        sources_id = [source.id for source in sources]
+        targets_id = [target.id for target in targets]
+        feeds = [{'source': s, 'target': t} for s,t in zip(sources_id, targets_id)]
+
+        for target in targets:
+            target.add_activity({ 'actor': 'barry', 'object': '09', 'verb': 'tweet' })
+
+        self.c.follow_many(feeds, activity_copy_limit=0)
+
+        for source in sources:
+            activities = source.get(limit=5)['results']
+            self.assertEqual(len(activities), 0)
+
     def test_add_to_many(self):
         activity = {'actor': 1, 'verb': 'tweet', 'object': 1, 'custom': 'data'}
         feeds = [getfeed('flat', str(i)).id for i in range(10, 20)]
