add a few methods (client.search, channel.send|delete_image|file)

Author: pterk

stream_chat/channel.py

@@ -218,17 +218,17 @@ def accept_invite(self, user_id):
     def reject_invite(self, user_id):
         raise NotImplementedError
 
-    def send_file(self):
-        raise NotImplementedError
+    def send_file(self, url, name, user, content_type=None):
+        return self.client.send_file(f"{self.url}/file", url, name, user, content_type=content_type)
 
-    def send_image(self):
-        raise NotImplementedError
+    def send_image(self, url, name, user, content_type=None):
+        return self.client.send_file(f"{self.url}/image", url, name, user, content_type=content_type)
 
-    def delete_file(self):
-        raise NotImplementedError
+    def delete_file(self, url):
+        return self.client.delete(f"{self.url}/file", {"url": url})
 
-    def delete_image(self):
-        raise NotImplementedError
+    def delete_image(self, url):
+        return self.client.delete(f"{self.url}/image", {"url": url})
 
 
 def add_user_id(payload, user_id):

stream_chat/client.py

@@ -1,14 +1,15 @@
+from urllib.parse import urlparse
+import hmac
+import hashlib
 import json
+import urllib
 
+import jwt
 import requests
 import six
 
 from stream_chat.__pkg__ import __version__
 from stream_chat.channel import Channel
-import jwt
-import hmac
-import hashlib
-
 from stream_chat.exceptions import StreamAPIException
 
 
@@ -178,8 +179,8 @@ def update_message(self, message):
             raise ValueError("message must have an id")
         return self.post("messages/{}".format(message['id']), data={"message": message})
 
-    def delete_message(self, message_id):
-        return self.delete("messages/{}".format(message_id))
+    def delete_message(self, message_id, **options):
+        return self.delete("messages/{}".format(message_id), options)
 
     def query_users(self, filter_conditions, sort=None, **options):
         sort_fields = []
@@ -189,7 +190,7 @@ def query_users(self, filter_conditions, sort=None, **options):
         params.update({"filter_conditions": filter_conditions, "sort": sort_fields})
         return self.get("users", params={"payload": json.dumps(params)})
 
-    def query_channels(self, filter_conditions, sort, **options):
+    def query_channels(self, filter_conditions, sort=None, **options):
         params = {"state": True, "watch": False, "presence": False}
         sort_fields = []
         if sort is not None:
@@ -281,4 +282,26 @@ def verify_webhook(self, request_body, x_signature):
         return signature == x_signature
 
     def search(self, filter_conditions, query, **options):
-        raise NotImplementedError
+        params = options.copy()
+        params.update({"filter_conditions": filter_conditions, "query": query})
+        return self.get("search", params={"payload": json.dumps(params)})
+
+    def send_file(self, uri, url, name, user, content_type=None):
+        headers = {}
+        headers["Authorization"] = self.auth_token
+        headers["stream-auth-type"] = "jwt"
+        headers["X-Stream-Client"]: get_user_agent()
+        parts = urlparse(url)
+        if parts[0] == '':
+            url = f"file://{url}"
+        if content_type:
+            file_tuple = (name, urllib.request.urlopen(url), content_type)
+        else:
+            file_tuple = (name, urllib.request.urlopen(url), content_type)
+        response = requests.post(
+            "{}/{}".format(self.base_url, uri),
+            params=self.get_default_params(),
+            data={"user": json.dumps(user)},
+            files={"file": file_tuple},
+            headers=headers)
+        return self._parse_response(response)

stream_chat/tests/test_channel.py

@@ -120,3 +120,15 @@ def test_get_reactions(self, channel, random_user):
         assert len(response["reactions"]) == 1
 
         assert response["reactions"][0]["count"] == 42
+
+    def test_send_and_delete_file(self, channel, random_user):
+        url = "https://getstream.io/blog/wp-content/themes/stream-theme-wordpress_2018-05-24_10-41/assets/images/stream_logo.png";
+        resp = channel.send_file(url, "logo.png", random_user)
+        assert "logo.png" in resp['file']
+        resp = channel.delete_file(resp['file'])
+
+    def test_send_and_delete_image(self, channel, random_user):
+        url = "https://getstream.io/blog/wp-content/themes/stream-theme-wordpress_2018-05-24_10-41/assets/images/stream_logo.png";
+        resp = channel.send_image(url, "logo.png", random_user, content_type="image/png")
+        assert "logo.png" in resp['file']
+        # resp = channel.delete_image(resp['file'])

stream_chat/tests/test_client.py

@@ -63,6 +63,14 @@ def test_deactivate_user(self, client, random_user):
         assert "user" in response
         assert random_user["id"] == response["user"]["id"]
 
+    def test_reactivate_user(self, client, random_user):
+        response = client.deactivate_user(random_user["id"])
+        assert "user" in response
+        assert random_user["id"] == response["user"]["id"]
+        response = client.reactivate_user(random_user["id"])
+        assert "user" in response
+        assert random_user["id"] == response["user"]["id"]
+
     def test_export_user(self, client, fellowship_of_the_ring):
         response = client.export_user("gandalf")
         assert "user" in response
@@ -104,6 +112,9 @@ def test_delete_message(self, client, channel, random_user):
         msg_id = str(uuid.uuid4())
         channel.send_message({"id": msg_id, "text": "helloworld"}, random_user["id"])
         client.delete_message(msg_id)
+        msg_id = str(uuid.uuid4())
+        channel.send_message({"id": msg_id, "text": "helloworld"}, random_user["id"])
+        resp = client.delete_message(msg_id, hard=True)
 
     def test_flag_message(self, client, channel, random_user, server_user):
         msg_id = str(uuid.uuid4())
@@ -140,3 +151,22 @@ def test_devices(self, client, random_user):
         client.add_device(str(uuid.uuid4()), "apn", random_user["id"])
         response = client.get_devices(random_user["id"])
         assert len(response["devices"]) == 1
+
+    def test_search(self, client, channel, random_user):
+        query = "supercalifragilisticexpialidocious"
+        channel.send_message({"text": f"How many syllables are there in {query}?"}, random_user['id'])
+        channel.send_message({"text": "Does 'cious' count as one or two?"}, random_user['id'])
+        response = client.search(
+            {"type": "messaging"},
+            query,
+            **{"limit": 2, "offset": 0}
+        )
+        # searches all channels so make sure at least one is found
+        assert len(response['results']) >= 1
+        assert query in response['results'][0]['message']['text']
+        response = client.search(
+            {"type": "messaging"},
+            "cious",
+            **{"limit": 12, "offset": 0})
+        for message in response['results']:
+            assert query not in message['message']['text']