Merge remote-tracking branch 'origin/master' into feature/support-invites-after-channel-creation

Author: pterk

.travis.yml

@@ -5,6 +5,7 @@ matrix:
     - python: 3.5
     - python: 3.6
     - python: 3.7
+    - python: 3.8
       sudo: true
 cache: pip
 install:

CHANGELOG

@@ -1,3 +1,9 @@
+## Mar 3, 2020 - 1.1.
+- Add support for client.get_message
+
+## Nov 7, 2019 - 1.0.2
+- Bump crypto requirements
+
 ## Oct 21th, 2019 - 1.0.1
 - Fixed app update method parameter passing
 

setup.py

@@ -6,7 +6,7 @@
 requests = "requests>=2.22.0,<3"
 
 install_requires = [
-    "pycryptodomex==3.8.1",
+    "pycryptodomex>=3.8.1,<4",
     requests,
     "pyjwt==1.7.1",
     "six>=1.12.0",

stream_chat/__pkg__.py

@@ -1,6 +1,6 @@
 __author__ = "Tommaso Barbugli"
 __copyright__ = "Copyright 2019, Stream.io, Inc"
-__version__ = "1.0.1"
+__version__ = "1.1.1"
 __maintainer__ = "Tommaso Barbugli"
 __email__ = "[email protected]"
 __status__ = "Production"

stream_chat/channel.py

@@ -221,11 +221,19 @@ def unban_user(self, target_id, **options):
             target_id, type=self.channel_type, id=self.id, **options
         )
 
-    def accept_invite(self, user_id):
-        raise NotImplementedError
+    def accept_invite(self, user_id, **data):
+        payload = add_user_id(data, user_id)
+        payload['accept_invite'] = True
+        response = self.client.post(self.url, data=payload)
+        self.custom_data = response['channel']
+        return response
 
-    def reject_invite(self, user_id):
-        raise NotImplementedError
+    def reject_invite(self, user_id, **data):
+        payload = add_user_id(data, user_id)
+        payload['reject_invite'] = True
+        response = self.client.post(self.url, data=payload)
+        self.custom_data = response['channel']
+        return response
 
     def send_file(self, url, name, user, content_type=None):
         return self.client.send_file("{}/file".format(self.url), url, name, user, content_type=content_type)

stream_chat/client.py

@@ -92,7 +92,7 @@ def create_token(self, user_id, exp=None):
         payload = {"user_id": user_id}
         if exp is not None:
             payload["exp"] = exp
-        return jwt.encode(payload, self.api_secret, algorithm="HS256")
+        return jwt.encode(payload, self.api_secret, algorithm="HS256").decode()
 
     def update_app_settings(self, **settings):
         return self.patch("app", data=settings)
@@ -188,6 +188,9 @@ def update_message(self, message):
     def delete_message(self, message_id, **options):
         return self.delete("messages/{}".format(message_id), options)
 
+    def get_message(self, message_id):
+        return self.get("messages/{}".format(message_id))
+
     def query_users(self, filter_conditions, sort=None, **options):
         sort_fields = []
         if sort is not None:

stream_chat/tests/conftest.py

@@ -18,6 +18,10 @@ def pytest_runtest_setup(item):
         if previousfailed is not None:
             pytest.xfail("previous test failed (%s)" % previousfailed.name)
 
+def pytest_configure(config):
+    config.addinivalue_line(
+        "markers", "incremental: mark test incremental"
+    )
 
 @pytest.fixture(scope="module")
 def client():

stream_chat/tests/test_channel.py

@@ -1,5 +1,9 @@
+import uuid
+
 import pytest
 
+from stream_chat.exceptions import StreamAPIException
+
 
 @pytest.mark.incremental
 class TestChannel(object):
@@ -130,15 +134,15 @@ def test_get_reactions(self, channel, random_user):
         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']
+        url = "https://homepages.cae.wisc.edu/~ece533/images/lena.png"
+        resp = channel.send_file(url, "lena.png", random_user)
+        assert "lena.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']
+        url = "https://homepages.cae.wisc.edu/~ece533/images/lena.png"
+        resp = channel.send_image(url, "lena.png", random_user, content_type="image/png")
+        assert "lena.png" in resp['file']
         # resp = channel.delete_image(resp['file'])
 
     def test_channel_hide_show(self, client, channel, random_users):
@@ -165,7 +169,37 @@ def test_channel_hide_show(self, client, channel, random_users):
         response = client.query_channels({"id": channel.id}, user_id=random_users[0]['id'])
         assert len(response['channels']) == 0
         # send message
-        msg = channel.send_message({"text": "hi"}, random_users[1]["id"])
+        channel.send_message({"text": "hi"}, random_users[1]["id"])
         # channel should be listed now
         response = client.query_channels({"id": channel.id}, user_id=random_users[0]['id'])
         assert len(response['channels']) == 1
+
+    def test_invites(self, client, channel):
+        members = ["john", "paul", "george", "pete", "ringo", "eric"]
+        client.update_users([{"id": m} for m in members])
+        channel = client.channel(
+            "team", "beatles-" + str(uuid.uuid4()), {
+                "members": members,
+                "invites": ["ringo", "eric"]
+            })
+        channel.create("john")
+        # accept the invite when not a member
+        with pytest.raises(StreamAPIException):
+            channel.accept_invite("brian")
+        # accept the invite when a member
+        accept = channel.accept_invite("ringo")
+        for m in accept['members']:
+            if m['user_id'] == 'ringo':
+                assert m['invited'] is True
+                assert "invite_accepted_at" in m
+        # cannot accept again
+        with pytest.raises(StreamAPIException):
+            channel.accept_invite("ringo")
+        reject = channel.reject_invite("eric")
+        for m in reject['members']:
+            if m['user_id'] == 'eric':
+                assert m['invited'] is True
+                assert "invite_rejected_at" in m
+        # cannot reject again
+        with pytest.raises(StreamAPIException):
+            reject = channel.reject_invite("eric")

stream_chat/tests/test_client.py

@@ -14,6 +14,15 @@ def test_mute_user(self, client, random_users):
         assert response["mute"]["user"]["id"] == random_users[1]["id"]
         client.unmute_user(random_users[0]["id"], random_users[1]["id"])
 
+    def test_get_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"])
+        message = client.get_message(msg_id)
+        assert message["message"]["id"] == msg_id
+
     def test_auth_exception(self):
         client = StreamChat(api_key="bad", api_secret="guy")
         with pytest.raises(StreamAPIException):
@@ -34,6 +43,7 @@ def test_update_channel_type(self, client):
 
     def test_create_token(self, client):
         token = client.create_token("tommaso")
+        assert type(token) is str
         payload = jwt.decode(token, client.api_secret, algorithms=["HS256"])
         assert payload.get("user_id") == "tommaso"
 
@@ -56,13 +66,10 @@ def test_update_users(self, client):
     def test_update_user_partial(self, client):
         user_id = str(uuid.uuid4())
         client.update_user({"id": user_id, "field": "value"})
-        
-        response = client.update_user_partial({
-            "id": user_id,
-            "set": {
-                "field": "updated"
-            }
-        })
+
+        response = client.update_user_partial(
+            {"id": user_id, "set": {"field": "updated"}}
+        )
 
         assert "users" in response
         assert user_id in response["users"]
@@ -129,7 +136,7 @@ def test_delete_message(self, client, channel, random_user):
         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)
+        client.delete_message(msg_id, hard=True)
 
     def test_flag_message(self, client, channel, random_user, server_user):
         msg_id = str(uuid.uuid4())
@@ -163,26 +170,27 @@ def test_devices(self, client, random_user):
 
     def test_search(self, client, channel, random_user):
         query = "supercalifragilisticexpialidocious"
-        channel.send_message({"text": "How many syllables are there in {}?".format(query)}, random_user['id'])
-        channel.send_message({"text": "Does 'cious' count as one or two?"}, random_user['id'])
+        channel.send_message(
+            {"text": "How many syllables are there in {}?".format(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}
+            {"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']
+        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']
+            {"type": "messaging"}, "cious", **{"limit": 12, "offset": 0}
+        )
+        for message in response["results"]:
+            assert query not in message["message"]["text"]
 
     def test_query_channels_members_in(self, client, fellowship_of_the_ring):
         response = client.query_channels({"members": {"$in": ["gimli"]}}, {"id": 1})
         assert len(response["channels"]) == 1
         assert response["channels"][0]["channel"]["id"] == "fellowship-of-the-ring"
         assert len(response["channels"][0]["members"]) == 9
-