Re-Upload

The old current one uploaded again as the pre-release was pushed into the main by mistake.

Author: mccoderpy

discord/__init__.py

@@ -41,8 +41,7 @@
 from .role import Role, RoleTags
 from .file import File
 from .colour import Color, Colour
-from .integrations import Integration, IntegrationAccount, BotIntegration, IntegrationApplication, StreamIntegration
-from .interactions import Interaction, ButtonClick, SelectionSelect
+from .integrations import Integration, IntegrationAccount
 from .invite import Invite, PartialInviteChannel, PartialInviteGuild
 from .template import Template
 from .widget import Widget, WidgetMember, WidgetChannel
@@ -51,7 +50,7 @@
 from . import utils, opus, abc
 from .enums import *
 from .embeds import Embed
-from .components import Button, SelectionMenu, ActionRow, ButtonColor, ButtonStyle, select_option
+from .components import Button, DropdownMenue, ActionRow, ButtonColor, ButtonStyle
 from .mentions import AllowedMentions
 from .shard import AutoShardedClient, ShardInfo
 from .player import *

discord/abc.py

@@ -40,7 +40,7 @@
 from .role import Role
 from .invite import Invite
 from .file import File
-from .components import Button, SelectionMenu, ActionRow
+from .components import Button, DropdownMenue, ActionRow
 from .voice_client import VoiceClient, VoiceProtocol
 from . import utils
 
@@ -936,7 +936,7 @@ async def _get_channel(self):
     async def send(self, content=None, *, tts=False, embed=None, components=None, file=None,
                                           files=None, delete_after=None, nonce=None,
                                           allowed_mentions=None, reference=None,
-                                          mention_author=None, hidden=None, **kwargs):
+                                          mention_author=None):
         """|coro|
 
         Sends a message to the destination with the content given.
@@ -997,10 +997,6 @@ async def send(self, content=None, *, tts=False, embed=None, components=None, fi
 
             .. versionadded:: 1.6
 
-        hidden: Optional[:class:`bool`]
-            If :bool:`True` the message will be only bee visible for the performer of the interaction.
-            If this isnt called within an :class:`RawInteractionCreateEvent` it will be ignored
-
         Raises
         --------
         ~discord.HTTPException
@@ -1031,12 +1027,12 @@ async def send(self, content=None, *, tts=False, embed=None, components=None, fi
             for component in ([components] if not isinstance(components, list) else components):
                 if isinstance(component, Button):
                     _components.extend(ActionRow(component).sendable())
-                elif isinstance(component, SelectionMenu):
-                    _components.extend(ActionRow(component).sendable())
+                elif isinstance(component, DropdownMenue):
+                    _components.append(component.to_dict())
                 elif isinstance(component, ActionRow):
                     _components.extend(component.sendable())
                 elif isinstance(component, list):
-                    _components.extend(ActionRow(*[obj for obj in component if any(isinstance(obj, Button) or isinstance(obj, SelectionMenu))]).sendable())
+                    _components.extend(ActionRow(*[obj for obj in component if isinstance(obj, Button)]).sendable())
             components = _components
 
         if allowed_mentions is not None:
@@ -1060,34 +1056,14 @@ async def send(self, content=None, *, tts=False, embed=None, components=None, fi
         if file is not None and files is not None:
             raise InvalidArgument('cannot pass both file and files parameter to send()')
 
-        is_interaction_responce = kwargs.pop('__is_interaction_responce', None)
-        deferred = kwargs.pop('__deferred', False)
-        use_webhook = kwargs.pop('__use_webhook', False)
-        interaction_id = kwargs.pop('__interaction_id', None)
-        interaction_token = kwargs.pop('__interaction_token', None)
-        application_id = kwargs.pop('__application_id', None)
-        if is_interaction_responce == False or None:
-            hidden = None
         if file is not None:
             if not isinstance(file, File):
                 raise InvalidArgument('file parameter must be File')
 
             try:
-                if hidden is not None:
-                    data = await state.http.send_interaction_response(use_webhook=use_webhook,
-                                                                      interaction_id=interaction_id,
-                                                                      token=interaction_token,
-                                                                      application_id=application_id,
-                                                                      deferred=deferred,
-                                                                      files=[file], allowed_mentions=allowed_mentions,
-                                                                      content=content, tts=tts, embed=embed,
-                                                                      components=components,
-                                                                      nonce=nonce, message_reference=reference,
-                                                                      flags=64 if hidden else None)
-                else:
-                    data = await state.http.send_files(channel.id, files=[file], allowed_mentions=allowed_mentions,
-                                                       content=content, tts=tts, embed=embed, components=components,
-                                                       nonce=nonce, message_reference=reference)
+                data = await state.http.send_files(channel.id, files=[file], allowed_mentions=allowed_mentions,
+                                                   content=content, tts=tts, embed=embed, components=components,
+                                                   nonce=nonce, message_reference=reference)
             finally:
                 file.close()
 
@@ -1098,45 +1074,21 @@ async def send(self, content=None, *, tts=False, embed=None, components=None, fi
                 raise InvalidArgument('files parameter must be a list of File')
 
             try:
-                if hidden is not None:
-                    data = await state.http.send_interaction_response(use_webhook=use_webhook,
-                                                                      interaction_id=interaction_id,
-                                                                      token=interaction_token,
-                                                                      application_id=application_id,
-                                                                      deferred=deferred,
-                                                                      files=file, allowed_mentions=allowed_mentions,
-                                                                      content=content, tts=tts, embed=embed,
-                                                                      components=components,
-                                                                      nonce=nonce, message_reference=reference,
-                                                                      flags=64 if hidden else None)
-                else:
-                    data = await state.http.send_files(channel.id, files=files, content=content, tts=tts,
-                                                       embed=embed, components=components, nonce=nonce,
-                                                       allowed_mentions=allowed_mentions, message_reference=reference)
+                data = await state.http.send_files(channel.id, files=files, content=content, tts=tts,
+                                                   embed=embed, components=components, nonce=nonce,
+                                                   allowed_mentions=allowed_mentions, message_reference=reference)
             finally:
                 for f in files:
                     f.close()
         else:
-            if hidden is not None:
-                data = await state.http.send_interaction_response(use_webhook=use_webhook,
-                                                                  interaction_id=interaction_id,
-                                                                  token=interaction_token,
-                                                                  application_id=application_id,
-                                                                  deferred=deferred, allowed_mentions=allowed_mentions,
-                                                                  content=content, tts=tts, embed=embed,
-                                                                  components=components,
-                                                                  nonce=nonce, message_reference=reference,
-                                                                  flags=64 if hidden else None)
-            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:
-            ret = state.create_message(channel=channel, data=data)
-            if delete_after is not None and hidden is None:
-                await ret.delete(delay=delete_after)
-            return ret
-        return None
+            data = await state.http.send_message(channel.id, content, tts=tts, embed=embed, components=components,
+                                                                      nonce=nonce, allowed_mentions=allowed_mentions,
+                                                                      message_reference=reference)
+
+        ret = state.create_message(channel=channel, data=data)
+        if delete_after is not None:
+            await ret.delete(delay=delete_after)
+        return ret
 
     async def trigger_typing(self):
         """|coro|

discord/client.py

@@ -972,18 +972,12 @@ def check(reaction, user):
         """
 
         future = self.loop.create_future()
-        if event.lower().lstrip('raw_') in ('button_click', 'selection_select'):
-            ck = check
+        if check is None:
             def _check(*args):
-                return ck(*args) if check else True and args[0].component.component_type == {'button_click': 2, 'selection_select': 3}.get(event.lower().lstrip('raw_'))
+                return True
             check = _check
-            ev = event.lower()
-        else:
-            if check is None:
-                def _check(*args):
-                    return True
-                check = _check
-            ev = event.lower()
+
+        ev = event.lower()
         try:
             listeners = self._listeners[ev]
         except KeyError: