add some validation for foreign_id_time param

tbarbugli · tbarbugli · commit 8b6cf17f6c22 · 2018-07-05T17:48:01.000+02:00
diff --git a/stream/client.py b/stream/client.py
@@ -5,13 +5,11 @@
 
 import jwt
 import requests
-from requests.adapters import HTTPAdapter
 from stream.serializer import _datetime_encoder
 
 from stream import exceptions, serializer
-from stream.httpsig.requests_auth import HTTPSignatureAuth
 from stream.signing import sign
-from stream.utils import validate_feed_slug, validate_user_id
+from stream.utils import validate_feed_slug, validate_user_id, validate_foreign_id_time
 from stream.httpsig.requests_auth import HTTPSignatureAuth
 from requests import Request
 
@@ -336,6 +334,7 @@ def get_activities(self, ids=None, foreign_id_time=None):
             query_params['ids'] = ','.join(ids)
 
         if foreign_id_time is not None:
+            validate_foreign_id_time(foreign_id_time)
             foreign_ids, timestamps = zip(*foreign_id_time)
             timestamps = map(_datetime_encoder, timestamps)
             query_params['foreign_ids'] = ','.join(foreign_ids)
diff --git a/stream/utils.py b/stream/utils.py
@@ -43,3 +43,14 @@ def validate_user_id(user_id):
         raise ValueError(msg % user_id)
     return user_id
     
+
+def validate_foreign_id_time(foreign_id_time):
+    if not isinstance(foreign_id_time, (list, tuple)):
+        raise ValueError('foreign_id_time should be a list of tuples')
+
+    for v in foreign_id_time:
+        if not isinstance(v, (list, tuple)):
+            raise ValueError('foreign_id_time elements should be lists or tuples')
+
+        if len(v) != 2:
+            raise ValueError('foreign_id_time elements should have two elements')
