rocketchat-API 3.5.0__tar.gz → 3.6.1__tar.gz

{rocketchat_api-3.5.0 → rocketchat_api-3.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rocketchat_API
-Version: 3.5.0
+Version: 3.6.1
 Summary: Python API wrapper for Rocket.Chat
 Author-email: "Jorge Alberto Díaz Orozco (Akiel)" <diazorozcoj@gmail.com>
 Maintainer-email: "Jorge Alberto Díaz Orozco (Akiel)" <diazorozcoj@gmail.com>

{rocketchat_api-3.5.0 → rocketchat_api-3.6.1}/rocketchat_API/APISections/dm.py

@@ -78,10 +78,10 @@ class RocketChatDM(RocketChatBase):
             return self.call_api_get("dm.files", username=user_name, kwargs=kwargs)
         raise RocketMissingParamException(ROOM_ID_OR_USERNAME_REQUIRED)
 
-    def dm_counters(self, room_id, user_name=None):
+    def dm_counters(self, room_id, user_id=None):
         """Gets counters of direct messages."""
-        if user_name:
-            return self.call_api_get("dm.counters", roomId=room_id, username=user_name)
+        if user_id:
+            return self.call_api_get("dm.counters", roomId=room_id, userId=user_id)
         return self.call_api_get("dm.counters", roomId=room_id)
 
     def dm_delete(self, room_id, **kwargs):

{rocketchat_api-3.5.0 → rocketchat_api-3.6.1}/rocketchat_API/APISections/rooms.py

@@ -69,11 +69,22 @@ class RocketChatRooms(RocketChatBase):
         """Upload media files to a room."""
         files = {
             "file": (
-                os.path.basename(file),
-                open(file, "rb"),
-                mimetypes.guess_type(file)[0],
+                file
+                if isinstance(file, (list, tuple))
+                else (
+                    os.path.basename(file),
+                    open(file, "rb"),
+                    mimetypes.guess_type(file)[0],
+                )
             ),
         }
         return self.call_api_post(
             "rooms.media/" + room_id, kwargs=kwargs, use_json=False, files=files
         )
+
+    def rooms_media_confirm(self, room_id, file_id, **kwargs):
+        """Confirm a previously uploaded media file in a room."""
+        return self.call_api_post(
+            "rooms.mediaConfirm/" + room_id + "/" + file_id,
+            kwargs=kwargs,
+        )

{rocketchat_api-3.5.0 → rocketchat_api-3.6.1}/rocketchat_API/APISections/teams.py

@@ -173,7 +173,7 @@ class RocketChatTeams(RocketChatBase):
 
     @paginated("rooms")
     def teams_list_rooms_of_user(
-        self, team_id=None, team_name=None, user_id=None, can_add=False, **kwargs
+        self, team_id=None, team_name=None, user_id=None, **kwargs
     ):
         """
         Lists only the team's rooms that a particular user has joined.
@@ -184,7 +184,6 @@ class RocketChatTeams(RocketChatBase):
                 "teams.listRoomsOfUser",
                 teamId=team_id,
                 userId=user_id,
-                canAdd=can_add,
                 kwargs=kwargs,
             )
         if team_name:
@@ -192,7 +191,6 @@ class RocketChatTeams(RocketChatBase):
                 "teams.listRoomsOfUser",
                 teamName=team_name,
                 userId=user_id,
-                canAdd=can_add,
                 kwargs=kwargs,
             )
         raise RocketMissingParamException(TEAM_ID_OR_TEAM_NAME_REQUIRED)

{rocketchat_api-3.5.0 → rocketchat_api-3.6.1}/rocketchat_API/APISections/users.py

@@ -129,7 +129,7 @@ class RocketChatUsers(RocketChatBase):
 
     def users_forgot_password(self, email, **kwargs):
         """Send email to reset your password."""
-        return self.call_api_post("users.forgotPassword", email=email, data=kwargs)
+        return self.call_api_post("users.forgotPassword", email=email, kwargs=kwargs)
 
     def users_get_preferences(self, **kwargs):
         """Gets all preferences of user."""

{rocketchat_api-3.5.0 → rocketchat_api-3.6.1}/rocketchat_API.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rocketchat_API
-Version: 3.5.0
+Version: 3.6.1
 Summary: Python API wrapper for Rocket.Chat
 Author-email: "Jorge Alberto Díaz Orozco (Akiel)" <diazorozcoj@gmail.com>
 Maintainer-email: "Jorge Alberto Díaz Orozco (Akiel)" <diazorozcoj@gmail.com>

{rocketchat_api-3.5.0 → rocketchat_api-3.6.1}/tests/test_dms.py

@@ -146,7 +146,7 @@ def test_dm_counters(logged_rocket, recipient_user):
 
     dm_counters = logged_rocket.dm_counters(
         room_id=dm_create.get("room").get("_id"),
-        user_name=logged_rocket.me().get("_id"),
+        user_id=logged_rocket.me().get("_id"),
     )
     assert all(
         key in dm_counters

{rocketchat_api-3.5.0 → rocketchat_api-3.6.1}/tests/test_rooms.py

@@ -15,6 +15,47 @@ def test_rooms_media(logged_rocket):
     assert str(rooms_media.get("file").get("url")).endswith("avatar.png")
 
 
+def test_rooms_media_array_file(logged_rocket):
+    with open("tests/assets/avatar.png", "rb") as avatar_file:
+        avatar_bytes = avatar_file.read()
+
+    rooms_media = logged_rocket.rooms_media(
+        "GENERAL",
+        file=("avatar.png", avatar_bytes, "image/png"),
+        description="hey there",
+    )
+    assert str(rooms_media.get("file").get("url")).endswith("avatar.png")
+
+
+def test_rooms_media_array_file_with_list(logged_rocket):
+    with open("tests/assets/avatar.png", "rb") as avatar_file:
+        avatar_bytes = avatar_file.read()
+
+    rooms_media = logged_rocket.rooms_media(
+        "GENERAL",
+        file=["avatar.png", avatar_bytes, "image/png"],  # list instead of tuple
+        description="hey there",
+    )
+
+    assert str(rooms_media.get("file").get("url")).endswith("avatar.png")
+
+
+def test_rooms_media_confirm(logged_rocket):
+    uploaded_media = logged_rocket.rooms_media(
+        "GENERAL", file="tests/assets/avatar.png"
+    )
+    file_id = str(uploaded_media.get("file").get("_id"))
+    assert file_id
+
+    confirmed_media = logged_rocket.rooms_media_confirm(
+        room_id="GENERAL",
+        file_id=file_id,
+        msg="confirmed upload",
+    )
+
+    assert confirmed_media.get("message").get("_id")
+
+
 def test_rooms_get(logged_rocket):
     rooms_get = logged_rocket.rooms_get()
     assert "update" in rooms_get