Fixed Problems when Putting the Callback in an Variable to edit it later

Author: mccoderpy

discord/abc.py

@@ -27,6 +27,7 @@
 """
 
 import abc
+import json
 import sys
 import copy
 import asyncio
@@ -1072,7 +1073,7 @@ async def send(self, content=None, *, tts=False, embed=None, embeds=None, compon
         if hidden is not None:
             embedlist = []
             if embed:
-                embedlist.append(embed.to_dict())
+                embedlist.append(embed)
             if embeds:
                 embedlist.extend([e.to_dict() for e in embeds])
             embeds = embedlist
@@ -1095,7 +1096,7 @@ async def send(self, content=None, *, tts=False, embed=None, embeds=None, compon
                                                                       content=content, tts=tts, embeds=embeds,
                                                                       components=components,
                                                                       nonce=nonce, message_reference=reference,
-                                                                      flags=64 if hidden else None,
+                                                                      flags=64 if hidden is True else None,
                                                                       followup=followup)
                 else:
                     data = await state.http.send_files(channel.id, files=[file], allowed_mentions=allowed_mentions,
@@ -1121,8 +1122,8 @@ async def send(self, content=None, *, tts=False, embed=None, embeds=None, compon
                                                                       content=content, tts=tts, embeds=embeds,
                                                                       components=components,
                                                                       nonce=nonce, message_reference=reference,
-                                                                      flags=64 if hidden else None,
-                                                                      followup=followup)
+                                                                      flags=64 if hidden is True else None,
+                                                                      followup=followup or deferred)
                 else:
                     data = await state.http.send_files(channel.id, files=files, content=content, tts=tts,
                                                        embeds=embeds, components=components, nonce=nonce,
@@ -1140,19 +1141,20 @@ async def send(self, content=None, *, tts=False, embed=None, embeds=None, compon
                                                                   content=content, tts=tts, embeds=embeds,
                                                                   components=components,
                                                                   nonce=nonce, message_reference=reference,
-                                                                  flags=64 if hidden else None,
+                                                                  flags=64 if hidden is True else None,
                                                                   followup=followup)
             else:
                 data = await state.http.send_message(channel.id, content, tts=tts, embed=embed, components=components,
                                                                           nonce=nonce, allowed_mentions=allowed_mentions,
                                                                           message_reference=reference)
-
-        if not hidden is True and isinstance(data, dict):
+        if not hidden is True:
+            if not isinstance(data, dict) and not hidden is None:
+                """Thanks Discord that they dont return the message when we send the interaction callback"""
+                data = await state.http.get_original_interaction_response(application_id=application_id, interaction_token=interaction_token)
             ret = state.create_message(channel=channel, data=data)
-            if delete_after is not None and hidden is None:
+            if (delete_after is not None) and (not hidden is True):
                 await ret.delete(delay=delete_after)
             return ret
-        return None
 
     async def trigger_typing(self):
         """|coro|

discord/components.py

@@ -38,12 +38,14 @@
 
 
 class ButtonStyle:
+    
     """
     :class:`Button`
     Represents the Style for an :class:`discord.Button`
 
     .. note ::
         For more information about the Button-Styles visit the `Discord-API Documentation <https://discord.com/developers/docs/interactions/message-components#buttons-button-styles>`_.
+    
     """
 
     def __repr__(self):
@@ -59,11 +61,13 @@ def __repr__(self):
 
 
 class ButtonColor:
+
     """
     :class:`ButtonColor`
 
     .. note ::
         This is just an Aliase to :class:`ButtonStyle`
+
     """
     blurple = ButtonStyle.Primary
     grey = ButtonStyle.Secondary

discord/http.py

@@ -452,7 +452,7 @@ def edit_interaction_response(self, use_webhook, interaction_id, token, applicat
         if not deferred:
             fields = {'data': fields}
             fields['type'] = 7
-            r = Route("POST", f'/webhooks/{application_id}/{token}/callback' if use_webhook is True else f"/interactions/{interaction_id}/{token}/callback")
+            r = Route('POST', f'/webhooks/{application_id}/{token}/callback' if use_webhook is True else f"/interactions/{interaction_id}/{token}/callback")
         else:
             r = Route('PATCH', f'/webhooks/{application_id}/{token}/messages/@original')
         return self.request(r, json=fields)
@@ -485,13 +485,12 @@ def send_interaction_response(self, use_webhook, interaction_id, token, applicat
             payload['message_reference'] = message_reference
         if flags:
             payload['flags'] = flags
-        if not deferred is True:
+        if not deferred and not followup:
             payload = {'data': payload}
             payload['type'] = 4
-            r = Route("POST", f'/webhooks/{application_id}/{token}/callback' if use_webhook is True else f"/interactions/{interaction_id}/{token}/callback")
-        elif followup is True:
+            r = Route('POST', f'/webhooks/{application_id}/{token}/callback' if use_webhook is True else f"/interactions/{interaction_id}/{token}/callback")
+        else:
             r = Route('POST', f'/webhooks/{application_id}/{token}')
-
         if files is not None:
             form.append({'name': 'payload_json', 'value': utils.to_json(payload)})
             if len(files) == 1:
@@ -515,6 +514,10 @@ def send_interaction_response(self, use_webhook, interaction_id, token, applicat
         else:
             return self.request(r, json=payload)
 
+    def get_original_interaction_response(self, interaction_token, application_id):
+        r = Route('GET', f'/webhooks/{application_id}/{interaction_token}/messages/@original')
+        return self.request(r)
+        
     def add_reaction(self, channel_id, message_id, emoji):
         r = Route('PUT', '/channels/{channel_id}/messages/{message_id}/reactions/{emoji}/@me',
                   channel_id=channel_id, message_id=message_id, emoji=emoji)

discord/interactions.py

@@ -104,16 +104,16 @@ async def respond(self, content=None, *, tts=False, embed=None, embeds=None, com
         msg = await self.channel.send(content, tts=tts, embed=embed, embeds=embeds, components=components, file=file,
                                        files=files, delete_after=delete_after, nonce=nonce,allowed_mentions=allowed_mentions,
                                        reference=reference, mention_author=mention_author, hidden=hidden,
-                                       __is_interaction_responce=True, __deferred=self._deferred or self._deferred_hidden, __use_webhook=False,
+                                       __is_interaction_responce=True, __deferred=self._deferred, __use_webhook=False,
                                        __interaction_id=self.__interaction_id, __interaction_token=self.__token,
-                                       __application_id=self.__application_id, followup=True if self._deferred or self._deferred_hidden else False)
+                                       __application_id=self.__application_id, followup=True if self.callback_message else False)
 
-        self._deffered = True
         if hidden is True:
             self._deferred_hidden = True
+        self._deffered = True
         if not self.callback_message:
             self.callback_message = msg if msg else EphemeralMessage()
-        return msg if msg else self.callback_message
+        return msg
 
     @property
     def author(self) -> typing.Union[Member, User]: