Fixed asStaff for delete_message in Community

DarkyAmagai · Jun 22, 2023 · 561a3ac · 561a3ac
1 parent 9b60d1d
commit 561a3ac
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 22 deletions.
diff --git a/pymino/__init__.py b/pymino/__init__.py
@@ -2,7 +2,7 @@
 __author__ = 'cynical'
 __license__ = 'MIT'
 __copyright__ = 'Copyright 2023 Cynical'
-__version__ = '1.2.1.5'
+__version__ = '1.2.1.6'
 __description__ = 'A Python wrapper for the aminoapps.com API'
 
 from .bot import Bot as Bot

diff --git a/pymino/ext/async_community.py b/pymino/ext/async_community.py
@@ -4477,20 +4477,23 @@ async def delete_message(self, chatId: str, messageId: str, asStaff: bool = Fals
         ... else:
         ...     print("Failed to delete message.")
         """
-        return ApiResponse(
-            await self.session.handler(
-                method="POST",
-                url=f"/x{self.community_id if comId is None else comId}/s/chat/thread/{chatId}/message/{messageId}/admin",
-                data={
+        if asStaff:
+            request_method = "POST"
+            url = f"/x{self.community_id if comId is None else comId}/s/chat/thread/{chatId}/message/{messageId}/admin"
+            data = {
                 "adminOpName": 102,
                 "adminOpNote": {"content": reason},
                 "timestamp": int(time() * 1000)
-                }
-            )) if asStaff else ApiResponse(
-            await self.session.handler(
-                method="DELETE",
-                url=f"/x{self.community_id if comId is None else comId}/s/chat/thread/{chatId}/message/{messageId}"
-            ))
+            } if reason is not None else {
+                "adminOpName": 102,
+                "timestamp": int(time() * 1000)
+            }
+        else:
+            request_method = "DELETE"
+            url = f"/x{self.community_id if comId is None else comId}/s/chat/thread/{chatId}/message/{messageId}"
+            data = None
+
+        return ApiResponse(await self.session.handler(method=request_method, url=url, data=data))
 
 
     @community

diff --git a/pymino/ext/community.py b/pymino/ext/community.py
@@ -4407,19 +4407,23 @@ def delete_message(self, chatId: str, messageId: str, asStaff: bool = False, rea
         ... else:
         ...     print("Failed to delete message.")
         """
-        return ApiResponse(
-            self.session.handler(
-            method = "POST",
-            url = f"/x{self.community_id if comId is None else comId}/s/chat/thread/{chatId}/message/{messageId}/admin",
+        if asStaff:
+            request_method = "POST"
+            url = f"/x{self.community_id if comId is None else comId}/s/chat/thread/{chatId}/message/{messageId}/admin"
             data = {
-            "adminOpName": 102,
-            "adminOpNote": {"content": reason},
-            "timestamp": int(time() * 1000)
+                "adminOpName": 102,
+                "adminOpNote": {"content": reason},
+                "timestamp": int(time() * 1000)
+            } if reason is not None else {
+                "adminOpName": 102,
+                "timestamp": int(time() * 1000)
             }
-            )) if asStaff else ApiResponse(self.session.handler(
-            method = "DELETE",
+        else:
+            request_method = "DELETE"
             url = f"/x{self.community_id if comId is None else comId}/s/chat/thread/{chatId}/message/{messageId}"
-            ))
+            data = None
+
+        return ApiResponse(self.session.handler(method=request_method, url=url, data=data))
 
 
     @community