Add files via upload

Author: mccoderpy

discord/abc.py

@@ -961,6 +961,8 @@ async def send(self, content=None, *, tts=False, embed=None, components=None, fi
             Indicates if the message should be sent using text-to-speech.
         embed: :class:`~discord.Embed`
             The rich embed for the content.
+        components: List[:class:`discord.ActionRow`]
+            A list of :type:`discord.Actionrow`'s
         file: :class:`~discord.File`
             The file to upload.
         files: List[:class:`~discord.File`]
@@ -1032,7 +1034,6 @@ async def send(self, content=None, *, tts=False, embed=None, components=None, fi
             components = components_list
 
 
-
         if allowed_mentions is not None:
             if state.allowed_mentions is not None:
                 allowed_mentions = state.allowed_mentions.merge(allowed_mentions).to_dict()

discord/components.py

@@ -26,7 +26,6 @@
 DEALINGS IN THE SOFTWARE.
 """
 
-
 import re
 import typing
 from .emoji import Emoji
@@ -282,13 +281,17 @@ def __init__(self, *args, **kwargs):
                 self.components.append(obj)
             elif isinstance(obj, dict):
                 if not obj.get('type', None) in [2, 3]:
-                    raise InvalidData('if you use an Dict instead of Button, DropdownMenue you have to pass an type')
+                    raise InvalidData('if you use an Dict instead of Button, DropdownMenue you have to pass an type betwean 2 or 3')
                 self.components.append({1: Button.from_dict(obj), 2: DropdownMenue.from_dict(obj)}.get(obj.get('type')))
 
     def sendable(self) -> Union[dict, EmptyActionRow]:
-        base = {'type': 1, 'components': [obj.to_dict() for obj in self.components]}
-        if not len(base['components']) >= 1 and self.force is False:
+        base = []
+        base.extend([{'type': 1, 'components': [obj.to_dict() for obj in self.components[five:5:]]} for five in range(0, len(self.components), 5)])
+        objects = len([i['components'] for i in base])
+        if any(len(ar['components']) < 1 for ar in base) and self.force is False:
             raise EmptyActionRow()
+        elif len(base) > 5 or objects > 5*5 :
+            raise InvalidArgument(f"The maximum number of ActionRow's per message is 5 and they can only contain 5 buttons each; you have {len(base)} ActionRow's passed with {objects} objects")
         return base
 
     def edit_obj(self, index: int, **kwargs):
@@ -303,7 +306,7 @@ def disable_all_buttons(self):
 
     @property
     def raw(self) -> dict:
-        return {'type': 1, 'components': [obj.to_dict() for obj in self.components]}
+        yield (o for o in self.components)
 
     @classmethod
     def from_dict(cls, data):
@@ -365,6 +368,8 @@ def __init__(self, value):
                 self._other_elements.append(ActionRow.from_dict(obj))
             except InvalidData:
                 self._other_elements.append(obj)
+        if self._other_elements:
+            raise InvalidArgument(f"Invalid Type(s): {[o for o in self._other_elements]} are/is of type(s) {[type(o) for o in self._other_elements]} but has to bee an discord.ActionRow.")
 
     @property
     def action_rows(self):

discord/http.py

@@ -5,6 +5,8 @@
 
 Copyright (c) 2015-present Rapptz
 
+Implementing of the Discord-Message-components made by mccoderpy (Discord-User mccuber04#2960)
+
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
 to deal in the Software without restriction, including without limitation
@@ -96,6 +98,9 @@ class HTTPClient:
     SUCCESS_LOG = '{method} {url} has received {text}'
     REQUEST_LOG = '{method} {url} with {json} has returned {status}'
 
+    # we have to overwride that beacuse interactions are using v8
+    V8BASE = 'https://discord.com/api/v8'
+
     def __init__(self, connector=None, *, proxy=None, proxy_auth=None, loop=None, unsync_clock=True):
         self.loop = asyncio.get_event_loop() if loop is None else loop
         self.connector = connector
@@ -443,13 +448,16 @@ def edit_message(self, channel_id, message_id, **fields):
 
     def post_initial_response(self, use_webhook, _resp, interaction_id, token, application_id):
         r_url = f"/webhooks/{application_id}/{token}" if use_webhook is True else f"/interactions/{interaction_id}/{token}/callback"
-        r = Route("POST", r_url, base='https://discord.com/api/v8')
-        try:
-            request = self.request(r, json=_resp)
-        except NotFound:
-            raise HTTPException("You have already responded to this Interaction!")
+        r = Route("POST", r_url, self.V8BASE)
+        return self.request(r, json=_resp )
+
+    def edit_interaction_response(self, use_webhook, interaction_id, token, application_id, fields):
+        r_url = f"/webhooks/{application_id}/{token}" if use_webhook is True else f"/interactions/{interaction_id}/{token}/callback"
+        if fields.get('type', None) == 7:
+            r = Route("POST", r_url, self.V8BASE)
         else:
-            return request
+            r = Route('PATCH', f"/webhooks/{application_id}/{token}/messages/@original" if use_webhook is True else f"/interactions/{application_id}/{token}/messages/@original", self.V8BASE)
+        return self.request(r, json=fields)
 
     def add_reaction(self, channel_id, message_id, emoji):
         r = Route('PUT', '/channels/{channel_id}/messages/{message_id}/reactions/{emoji}/@me',

discord/message.py

@@ -40,9 +40,9 @@
 from .partial_emoji import PartialEmoji
 from .calls import CallMessage
 from .enums import MessageType, ChannelType, try_enum
-from .errors import InvalidArgument, ClientException, HTTPException
+from .errors import InvalidArgument, ClientException, HTTPException, NotFound
 from .embeds import Embed
-from .components import DecodeMessageComponents
+from .components import DecodeMessageComponents, Button, DropdownMenue, ActionRow
 from .member import Member
 from .flags import MessageFlags
 from .file import File
@@ -557,7 +557,7 @@ def __init__(self, *, state, channel, data):
         self.reactions = [Reaction(message=self, data=d) for d in data.get('reactions', [])]
         self.attachments = [Attachment(data=a, state=self._state) for a in data['attachments']]
         self.embeds = [Embed.from_dict(a) for a in data['embeds']]
-        self.components = data.get('components', None)
+        self.components = data.get('components', [])
         self.application = data.get('application')
         self.activity = data.get('activity')
         self.channel = channel
@@ -842,7 +842,7 @@ def clean_content(self):
         .. note::
 
             This *does not* affect markdown. If you want to escape
-            or remove markdown then use :func:`utils.escape_markdown` or :func:`utils.remove_markdown` 
+            or remove markdown then use :func:`utils.escape_markdown` or :func:`utils.remove_markdown`
             respectively, along with this function.
         """
 
@@ -1053,6 +1053,8 @@ async def edit(self, **fields):
         embed: Optional[:class:`Embed`]
             The new embed to replace the original with.
             Could be ``None`` to remove the embed.
+        components: List[:class:`discord.ActionRow`]
+            A list of :type:`discord.Actionrow`'s
         suppress: :class:`bool`
             Whether to suppress embeds for the message. This removes
             all the embeds if set to ``True``. If set to ``False``
@@ -1090,15 +1092,23 @@ async def edit(self, **fields):
                 fields['content'] = str(content)
 
         try:
-            embed = fields['embed']
+            embed = fields.pop('embed')
         except KeyError:
             pass
         else:
             if embed is not None:
-                fields['embed'] = embed.to_dict()
+                fields['embeds'] = [embed.to_dict()]
 
         try:
-            components = fields.get('components')
+            embeds = fields['embeds']
+        except KeyError:
+            pass
+        else:
+            if embeds is not None and not embed:
+                fields['embeds'] = [e.to_dict() for e in embeds]
+
+        try:
+            components = fields['components']
         except KeyError:
             pass
         else:
@@ -1111,7 +1121,7 @@ async def edit(self, **fields):
                     elif isinstance(component, DropdownMenue):
                         components_list.append(component.to_dict())
                     elif isinstance(component, ActionRow):
-                        components_list.append(component.sendable())
+                        components_list.extend(component.sendable())
                 fields['components'] = components_list
         try:
             suppress = fields.pop('suppress')
@@ -1136,10 +1146,31 @@ async def edit(self, **fields):
                     allowed_mentions = allowed_mentions.to_dict()
                 fields['allowed_mentions'] = allowed_mentions
 
-        if fields:
-            data = await self._state.http.edit_message(self.channel.id, self.id, **fields)
-            self._update(data)
+        is_interaction_responce = fields.pop('__is_interaction_responce', None)
+        if is_interaction_responce is True:
+            deffered = fields.pop('__deffered', False)
+            use_webhook = fields.pop('__use_webhook', False)
+            interaction_id = fields.pop('__interaction_id', None)
+            interaction_token = fields.pop('__interaction_token', None)
+            application_id = fields.pop('__application_id', None)
+            payload = {'data': fields}
+            if not deffered is True:
+                payload['type'] = 7
+            if payload:
+                try:
+                    data = await self._state.http.edit_interaction_response(use_webhook=use_webhook,
+                                                                            interaction_id=interaction_id,
+                                                                            token=interaction_token,
+                                                                            application_id=application_id,
+                                                                            fields=payload)
+                except NotFound:
+                    raise NotFound("You have already responded to this Interaction!")
+                else:
+                    self._update(dict(data))
 
+        elif is_interaction_responce is None:
+            payload = await self._state.http.edit_message(self.channel.id, self.id, **fields)
+            self._update(payload)
         if delete_after is not None:
             await self.delete(delay=delete_after)
 
@@ -1548,6 +1579,8 @@ async def edit(self, **fields):
         embed: Optional[:class:`Embed`]
             The new embed to replace the original with.
             Could be ``None`` to remove the embed.
+        components: List[:class:`discord.ActionRow`]
+            A list of :type:`discord.Actionrow`'s
         suppress: :class:`bool`
             Whether to suppress embeds for the message. This removes
             all the embeds if set to ``True``. If set to ``False``
@@ -1590,21 +1623,36 @@ async def edit(self, **fields):
                 fields['content'] = str(content)
 
         try:
-            embed = fields['embed']
+            embed = fields.pop('embed')
         except KeyError:
             pass
         else:
             if embed is not None:
-                fields['embed'] = embed.to_dict()
+                fields['embeds'] = [embed.to_dict()]
+
+        try:
+            embeds = fields['embeds']
+        except KeyError:
+            pass
+        else:
+            if embeds is not None and not embed:
+                fields['embeds'] = [e.to_dict() for e in embeds]
 
         try:
             components = fields['components']
         except KeyError:
             pass
         else:
+            _components = []
             if components is not None:
-                #print(components)
-                fields['components'] = components.to_dict()
+                for component in ([components] if not type(components) == list else components):
+                    if isinstance(component, Button):
+                        _components.append(component.to_dict())
+                    elif isinstance(component, DropdownMenue):
+                        _components.append(component.to_dict())
+                    elif isinstance(component, ActionRow):
+                        _components.extend(component.sendable())
+                fields['components'] = _components
 
         try:
             suppress = fields.pop('suppress')
@@ -1629,8 +1677,31 @@ async def edit(self, **fields):
                     allowed_mentions = allowed_mentions.to_dict()
                 fields['allowed_mentions'] = allowed_mentions
 
-        if fields:
-            data = await self._state.http.edit_message(self.channel.id, self.id, **fields)
+        is_interaction_responce = fields.pop('__is_interaction_responce', None)
+        if is_interaction_responce is True:
+            deffered = fields.pop('__deffered', False)
+            use_webhook = fields.pop('__use_webhook', False)
+            interaction_id = fields.pop('__interaction_id', None)
+            interaction_token = fields.pop('__interaction_token', None)
+            application_id = fields.pop('__application_id', None)
+            payload = {'data': fields}
+            if not deffered is True:
+                payload['type'] = 7
+            if payload:
+                try:
+                    r = await self._state.http.edit_interaction_response(use_webhook=use_webhook,
+                                                                     interaction_id=interaction_id,
+                                                                     token=interaction_token,
+                                                                     application_id=application_id,
+                                                                     fields=payload)
+                except NotFound:
+                    raise NotFound(r, "You have already responded to this Interaction!")
+                else:
+                    self._update(payload['data'])
+
+        elif is_interaction_responce is None:
+            payload = await self._state.http.edit_message(self.channel.id, self.id, **fields)
+            self._update(payload)
 
         if delete_after is not None:
             await self.delete(delay=delete_after)

discord/raw_models.py

@@ -5,6 +5,8 @@
 
 Copyright (c) 2015-present Rapptz
 
+Implementing of the Discord-Message-components made by mccoderpy (Discord-User mccuber04#2960)
+
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
 to deal in the Software without restriction, including without limitation
@@ -247,6 +249,7 @@ def __init__(self, data, http=None):
             self._version = data.get('version', None)
             self._type = data.get('type', None)
             self.__token = data.get('token', None)
+        self._raw = data
         self._message_id = data.get('message').get('id', None)
         self._data = data.get('data', None)
         self._member = data.get('member', None)
@@ -268,13 +271,28 @@ async def defer(self):
         'Defers' the response, showing a loading state to the user
         """
         if self._deferred:
-            raise Exception("You have already responded to this Interaction!")
+            return print("\033[91You have already responded to this Interaction!\033[0m")
         base = {"type": 6}
         try:
             await self.http.post_initial_response(_resp=base, use_webhook=False, interaction_id=self.__interaction_id, token=self.__token, application_id=self.__application_id)
         except NotFound:
             pass
-        self._deferred = True
+        else:
+            self._deferred = True
+
+    async def edit(self, **fields):
+        """
+        'Defers' if it isn't yet and edit the message
+        """
+        if not self.message:
+            self.message: Message = await self.channel.fetch_message(self._message_id)
+
+        try:
+            await self.message.edit(__is_interaction_responce=True, __deffered=self._deferred, __use_webhook=False, __interaction_id=self.__interaction_id, __interaction_token=self.__token, __application_id=self.__application_id, **fields)
+        except NotFound:
+            pass
+        else:
+            self._deferred = True
 
     @property
     def deffered(self):

discord/state.py

@@ -535,7 +535,10 @@ def parse_message_update(self, data):
             self.dispatch('raw_message_edit', raw)
 
     def parse_interaction_create(self, data):
+
         if data.get('type', data.get('t', None)) != 3:
+            #to make sure that other-libraries like `discord-py-slash-command` still work
+            self.dispatch('socket_responce', data)
             return
         raw = RawInteractionCreateEvent(data=data, http=self.http)
         raw.message = self._get_message(raw.message_id)
@@ -545,10 +548,11 @@ def parse_interaction_create(self, data):
             raw.member: Member = Member(guild=raw.guild, data=raw._member, state=self)
         else:
             raw.channel = self._get_private_channel(raw.channel_id)
-        raw.user = User(data=raw._user, state=self)
-        if raw.message:
-            self.dispatch('raw_interaction_create', raw)
+        if raw._user is not None:
+            raw.user = self.get_user(raw._user.get('id', None))
+        if raw.message is not None:
             self.dispatch('interaction_create', raw)
+            self.dispatch('raw_interaction_create', raw)
         else:
             self.dispatch('raw_interaction_create', raw)