v1.0.4

Author: kvsxxx

README.md

@@ -110,7 +110,7 @@ Example:
 ```py
 @client.listen('on_button_press')
 async def on_button(btn: PressedButton, msg: ResponseMsg):
-    btn.respond("You pressed " + btn.content)
+    await btn.respond("You pressed " + btn.content)
 ```
 
 - - - -
@@ -133,7 +133,7 @@ async def on_message(message: discord.Message):
 
 @client.listen('on_button_press')
 async def on_button(btn: PressedButton, msg: ResponseMessage):
-    msg.respond("You pressed on " + btn.content + " with the customID " + btn.custom_id)
+    await msg.respond("You pressed on " + btn.content + " with the customID " + btn.custom_id)
 
 client.run("Your secret token")
 ```
@@ -158,9 +158,9 @@ async def on_message(message: discord.Message):
         btn, msg = await client.wait_for("button_press", check=lambda btn, msg: btn.member.id == message.author.id and msg.id == question.id)
 
         if btn.custom_id == "cats":
-            msg.respond("yay, cats!")
+            await msg.respond("yay, cats!")
         elif btn.custom_id == "dogs":
-            msg.respond("yay, dogs")
+            await msg.respond("yay, dogs")
 ```
 
 - - - -
@@ -498,6 +498,10 @@ Extends the `Message` object
 
 - pressedButton: `Button`
     > The button which was pressed
+
+- acknowledged: `bool`
+    > Whether the message was acknowledged
+
 </details>
 
 <details>
@@ -518,15 +522,17 @@ Extends the `Message` object
 
 -   <details>
     <summary>respond: <code>function</code></summary>
-    Responds to the interaction
+    Responds to the interaction and sends a message
 
     ```py
-    def respond(self, content=None, *, tts=False,
+    async def respond(self, content=None, *, tts=False,
             embed = None, embeds=None, file=None, files=None, nonce=None,
-            allowed_mentions=None, reference=None, mention_author=None, buttons=None,
-        ninjaMode = False):
+            allowed_mentions=None, mention_author=None, buttons=None,
+        ninjaMode = False) -> Message or None:
     ```
 
+    _| coroutine |_
+
     #### **Parameters**
 
     - content: `str`
@@ -553,9 +559,6 @@ Extends the `Message` object
     - allowed_mentions: `discord.Allowed_mentions`
         > Mentions allowed in this message
 
-    - reference: `discord.MessageReference or discord.Message`
-        > The message to which the message replies
-
     - mention_author: `bool`
         > Whether the author should be mentioned
 
@@ -567,6 +570,10 @@ Extends the `Message` object
         >
         > (User will see nothing)
 
+    #### **Returns**
+    - `Message or None`
+        > The sent message if ninjaMode is false
+
     </details>
 </details>
 
@@ -579,6 +586,7 @@ Extends the `Message` object
 
 - - - -
 
+
 ## Events
 
 Added events for `client.wait_for` and `client.listen`
@@ -609,8 +617,27 @@ Added events for `client.wait_for` and `client.listen`
 # Changelog
 
 -   <details>
-    <summary>1.0.3</summary>
+    <summary>1.0.4</summary>
 
-    - Added `hash` attribute to buttons
+    ### **Added**
+    - `ResponseMessage.acknowledged`
+        > If the message was acknowledged with the `ResponseMessage.acknowledge()` function, the variable will be set to true
+
+    ### **Changed**
+
+    - `ResponseMessage.respond()` => `await ResponseMessage.respond()`
+        > respond() function is now async and needs to be awaited
+
+    - `ResponseMessage.respond() -> None` => `ResponseMessage.respond() -> Message or None`
+        > respond() now returns the sent message or None if ninjaMode is true 
+
+    </details>
 
+-   <details>
+    <summary>1.0.3</summary>
+
+    ### **Added**
+    - `Button.hash`
+        > Buttons have now a custom hash property, generated by the discord api 
+    
     </details>

discord_py_buttons/apiRequests.py

@@ -58,7 +58,7 @@ def jsonifyMessage(content = None, *, tts=False,
         payload["embeds"] = [em.to_dict() for em in embeds]
 
     if reference is not None:
-        if type(reference) is not discord.MessageReference and type(reference) is not discord.Message:
+        if type(reference) not in [discord.MessageReference, discord.Message] and not issubclass(type(reference), discord.Message):
             raise TypeError("Reference must be of type 'discord.MessageReference' or 'discord.Message', not " + str(type(reference)))
         if type(reference) is discord.MessageReference:
             payload["message_reference"] = reference.to_dict()

discord_py_buttons/receive.py

@@ -220,9 +220,11 @@ class ResponseMessage(Message):
     pressedButton: `PressedButton`
         The button which was presed
     acknowledge: `function`
-        Function to acknowledge the buttonPress interaction
+        Function to acknowledge the button-press interaction
     respond: `function`
         Function to respond to the buttonPress interaction
+    acknowledged: `bool`
+        Whether the button was acknowledged with the acknowledge functionn
 
     Attributes
     ----------------
@@ -329,6 +331,7 @@ def __init__(self, *, state, channel, data, user, client):
         super().__init__(state=state, channel=channel, data=data["message"])
 
         self._discord = client
+        self.acknowledged = False
         for x in self.buttons:
             if hasattr(x, 'custom_id') and x.custom_id == data["data"]["custom_id"]:
                 self.pressedButton = PressedButton(data, user, x)
@@ -346,10 +349,14 @@ def acknowledge(self):
         if r.status_code == 403:
             raise discord.ClientException(r.json(), "forbidden")
 
-    def respond(self, content=None, *, tts=False, embed = None, embeds=None, file=None, files=None, nonce=None,
-        allowed_mentions=None, reference=None, mention_author=None, buttons=None,
-        ninjaMode = False):
+        self.acknowledged = True
+
+    async def respond(self, content=None, *, tts=False, embed = None, embeds=None, file=None, files=None, nonce=None,
+        allowed_mentions=None, mention_author=None, buttons=None,
+        ninjaMode = False) -> Message or None:
         """
+        | coro |
+
         Function to respond to the interaction
 
 
@@ -388,10 +395,6 @@ def respond(self, content=None, *, tts=False, embed = None, embeds=None, file=No
         ```
             Controls the mentions being processed in this message
         ```py
-        (discord.MessageReference or discord.Message) reference 
-        ```
-            The message to refer
-        ```py
         (bool) mention_author
         ```
             Whether the author should be mentioned
@@ -403,23 +406,29 @@ def respond(self, content=None, *, tts=False, embed = None, embeds=None, file=No
         ```py
         (bool) ninjaMode
         ```
-            If true, the client will respond to the button interaction with almost nothing
+            If true, the client will respond to the button interaction with almost nothing and returns nothing
+        
+        Returrns
+        -----------------------
+        ```py
+        (Message or None)
+        ```
+        The sent message if ninjaMode is false, otherwise `None` 
+
         """
-        if ninjaMode:
-            r = POST(self._discord.http.token, f'https://discord.com/api/v8/interactions/{self.pressedButton.interaction["id"]}/{self.pressedButton.interaction["token"]}/callback', {
-                "type": 6
-            })
-        else:
-            json = jsonifyMessage(content=content, tts=tts, embed=embed, embeds=embeds, file=file, files=files, nonce=nonce, allowed_mentions=allowed_mentions, reference=reference, mention_author=mention_author, buttons=buttons)
-            if "embed" in json:
-                json["embeds"] = [json["embed"]]
-                del json["embed"]
-
-            r = POST(self._discord.http.token, f'https://discord.com/api/v8/interactions/{self.pressedButton.interaction["id"]}/{self.pressedButton.interaction["token"]}/callback', {
-                "type": 4,
-                "data": json
-            })
+        msg = None
+        if not ninjaMode:
+            json = jsonifyMessage(content=content, tts=tts, embed=embed, embeds=embeds, file=file, files=files, nonce=nonce, allowed_mentions=allowed_mentions, reference=discord.MessageReference(message_id=self.id, channel_id=self.channel.id), mention_author=mention_author, buttons=buttons)
+            r = POST(token=self._discord.http.token, URL=(url + f"/channels/{self.channel.id}/messages"), data=json)
+            msg = await getResponseMessage(self._discord, r.json(), response=False)
+        
+        r = POST(self._discord.http.token, f'https://discord.com/api/v8/interactions/{self.pressedButton.interaction["id"]}/{self.pressedButton.interaction["token"]}/callback', {
+            "type": 6
+        })
+
         if r.status_code == 403:
             raise discord.ClientException(r.json(), "Forbidden")
         if r.status_code == 400:
-            raise discord.ClientException(r.json(), "Error while sending message")
+            raise discord.ClientException(r.json(), "Error while sending message")
+    
+        return msg