Updatet main-branch(discord) to 1.7.5.1

Author: mccoderpy

discord/__init__.py

@@ -12,10 +12,10 @@
 """
 
 __title__ = 'discord'
-__author__ = 'Rapptz'
+__author__ = 'Rapptz & mccoderpy'
 __license__ = 'MIT'
 __copyright__ = 'Copyright 2015-present Rapptz'
-__version__ = '1.7.2'
+__version__ = '1.7.5.1'
 
 __path__ = __import__('pkgutil').extend_path(__path__, __name__)
 
@@ -29,6 +29,7 @@
 from .partial_emoji import PartialEmoji
 from .activity import *
 from .channel import *
+from .components import ActionRow, Button, SelectMenu, SelectOption
 from .guild import Guild
 from .flags import *
 from .relationship import Relationship
@@ -51,7 +52,6 @@
 from . import utils, opus, abc
 from .enums import *
 from .embeds import Embed
-from .components import Button, SelectMenu, ActionRow, ButtonColor, ButtonStyle, select_option
 from .mentions import AllowedMentions
 from .shard import AutoShardedClient, ShardInfo
 from .player import *

discord/__main__.py

@@ -33,6 +33,7 @@
 import aiohttp
 import platform
 
+
 def show_version():
     entries = []
 
@@ -49,10 +50,12 @@ def show_version():
     entries.append('- system info: {0.system} {0.release} {0.version}'.format(uname))
     print('\n'.join(entries))
 
+
 def core(parser, args):
     if args.version:
         show_version()
 
+
 bot_template = """#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
@@ -177,12 +180,13 @@ async def cog_after_invoke(self, ctx):
 
 translation_table = str.maketrans(_base_table)
 
+
 def to_path(parser, name, *, replace_spaces=False):
     if isinstance(name, Path):
         return name
 
     if sys.platform == 'win32':
-        forbidden = ('CON', 'PRN', 'AUX', 'NUL', 'COM1', 'COM2', 'COM3', 'COM4', 'COM5', 'COM6', 'COM7', \
+        forbidden = ('CON', 'PRN', 'AUX', 'NUL', 'COM1', 'COM2', 'COM3', 'COM4', 'COM5', 'COM6', 'COM7',
                      'COM8', 'COM9', 'LPT1', 'LPT2', 'LPT3', 'LPT4', 'LPT5', 'LPT6', 'LPT7', 'LPT8', 'LPT9')
         if len(name) <= 4 and name.upper() in forbidden:
             parser.error('invalid directory name given, use a different one')
@@ -192,6 +196,7 @@ def to_path(parser, name, *, replace_spaces=False):
         name = name.replace(' ', '-')
     return Path(name)
 
+
 def newbot(parser, args):
     new_directory = to_path(parser, args.directory) / to_path(parser, args.name)
 
@@ -233,6 +238,7 @@ def newbot(parser, args):
 
     print('successfully made bot at', new_directory)
 
+
 def newcog(parser, args):
     cog_dir = to_path(parser, args.directory)
     try:
@@ -266,6 +272,7 @@ def newcog(parser, args):
     else:
         print('successfully made cog at', directory)
 
+
 def add_newbot_args(subparser):
     parser = subparser.add_parser('newbot', help='creates a command bot project quickly')
     parser.set_defaults(func=newbot)
@@ -276,6 +283,7 @@ def add_newbot_args(subparser):
     parser.add_argument('--sharded', help='whether to use AutoShardedBot', action='store_true')
     parser.add_argument('--no-git', help='do not create a .gitignore file', action='store_true', dest='no_git')
 
+
 def add_newcog_args(subparser):
     parser = subparser.add_parser('newcog', help='creates a new cog template quickly')
     parser.set_defaults(func=newcog)
@@ -287,6 +295,7 @@ def add_newcog_args(subparser):
     parser.add_argument('--hide-commands', help='whether to hide all commands in the cog', action='store_true')
     parser.add_argument('--full', help='add all special methods as well', action='store_true')
 
+
 def parse_args():
     parser = argparse.ArgumentParser(prog='discord', description='Tools for helping with discord.py')
     parser.add_argument('-v', '--version', action='store_true', help='shows the library version')
@@ -297,9 +306,11 @@ def parse_args():
     add_newcog_args(subparser)
     return parser, parser.parse_args()
 
+
 def main():
     parser, args = parse_args()
     args.func(parser, args)
 
+
 if __name__ == '__main__':
     main()

discord/abc.py

@@ -34,7 +34,7 @@
 
 from .iterators import HistoryIterator
 from .context_managers import Typing
-from .enums import ChannelType
+from .enums import try_enum, ChannelType, PermissionType
 from .errors import InvalidArgument, ClientException
 from .mentions import AllowedMentions
 from .permissions import PermissionOverwrite, Permissions
@@ -175,10 +175,7 @@ def __init__(self, **kwargs):
         self.id = kwargs.pop('id')
         self.allow = int(kwargs.pop('allow_new', 0))
         self.deny = int(kwargs.pop('deny_new', 0))
-        _type = kwargs.pop('type')
-        if _type not in ('role', 'user', 'member'):
-            _type = {0: 'role', 1: 'member'}.get(_type)
-        self.type = sys.intern(_type)
+        self.type = sys.intern(kwargs.pop('type'))
 
     def _asdict(self):
         return {
@@ -331,10 +328,13 @@ def _fill_overwrites(self, data):
         everyone_id = self.guild.id
 
         for index, overridden in enumerate(data.get('permission_overwrites', [])):
+            overridden_type = try_enum(PermissionType, overridden.pop('type'))
+            if not overridden_type:
+                raise AttributeError('Type type should be 0 - member, or 1 - role not %s' % overridden_type)
             overridden_id = int(overridden.pop('id'))
-            self._overwrites.append(_Overwrites(id=overridden_id, **overridden))
+            self._overwrites.append(_Overwrites(id=overridden_id, type=overridden_type.name, **overridden))
 
-            if overridden['type'] == 'member':
+            if overridden_type.name == 'member':
                 continue
 
             if overridden_id == everyone_id:
@@ -1031,18 +1031,23 @@ async def send(self, content=None, *, tts=False, embed=None, embeds=None, compon
 
         if embed is not None:
             embed = embed.to_dict()
-
+        embed_list = []
+        if embed:
+            embed_list.append(embed)
+        if embeds:
+            embed_list.extend([e.to_dict() for e in embeds])
+        embeds = embed_list
+        if len(embeds) > 10:
+            raise InvalidArgument(f'The maximum number of embeds that can be send with a message is 10, got: {len(embeds)}')
         if components:
             _components = []
             for component in ([components] if not isinstance(components, list) else components):
-                if isinstance(component, Button):
-                    _components.extend(ActionRow(component).sendable())
-                elif isinstance(component, SelectMenu):
-                    _components.extend(ActionRow(component).sendable())
+                if isinstance(component, (Button, SelectMenu)):
+                    _components.extend(ActionRow(component).to_dict())
                 elif isinstance(component, ActionRow):
-                    _components.extend(component.sendable())
+                    _components.extend(component.to_dict())
                 elif isinstance(component, list):
-                    _components.extend(ActionRow(*[obj for obj in component if any([isinstance(obj, Button), isinstance(obj, SelectMenu)])]).sendable())
+                    _components.extend(ActionRow(*[obj for obj in component if isinstance(obj, (Button, SelectMenu))]).to_dict())
             components = _components
 
         if allowed_mentions is not None:
@@ -1066,23 +1071,17 @@ async def send(self, content=None, *, tts=False, embed=None, embeds=None, compon
         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)
+        is_interaction_response = kwargs.pop('__is_interaction_response', 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)
         followup = kwargs.pop('followup', False)
-        if is_interaction_responce is False or None:
+        if is_interaction_response is False or None:
             hidden = None
-        embedlist = []
-        if embed:
-            embedlist.append(embed)
-        if embeds:
-            embedlist.extend([e.to_dict() for e in embeds])
-        embeds = embedlist
-        if len(embeds) > 10:
-            raise InvalidArgument(f'The maximum number of embeds that can be sent with a response is 10, get: {len(embeds)}')
+        if hidden is True and file or files:
+            raise AttributeError('An ephemeral(hidden) Message could not contain file(s)')
         if file is not None:
             if not isinstance(file, File):
                 raise InvalidArgument('file parameter must be File')

discord/audit_logs.py

@@ -82,7 +82,7 @@ def _transform_overwrites(entry, data):
             target = Object(id=ow_id)
 
         overwrites.append((target, ow))
-
+    print(overwrites)
     return overwrites
 
 class AuditLogDiff:

discord/client.py

@@ -1024,11 +1024,20 @@ async def on_ready():
         return coro
 
     def on_click(self, custom_id=None):
-        """A decorator that registers a raw_button_click event that checks on execution if the ``custom_id's`` are the same; if so, the :func:`func` is called..
+        """
+        A decorator that registers a raw_button_click event that checks on execution if the ``custom_id's`` are the same; if so, the :func:`func` is called..
+
+        The function this is attached to must take the same parameters as a
+        `raw_button_click-Event <https://discordpy-message-components.rtfd.io/en/latest/addition.html#on_raw_button_click>`_.
 
-        You can find more info about this in the `documentation <https://discordpy-message-components.readthedocs.io/en/latest/additions.html#on-click>`.
+        .. important::
+            The func must be a coroutine, if not, :exc:`TypeError` is raised.
 
-        The func must be a :ref:`coroutine <coroutine>`, if not, :exc:`TypeError` is raised.
+        Parameters
+        ----------
+        custom_id: Optional[str]
+            If the :attr:`custom_id` of the :class:`discord.Button` could not use as an function name
+            or you want to give the function a different name then the custom_id use this one to set the custom_id.
 
         Example
         -------
@@ -1038,16 +1047,16 @@ def on_click(self, custom_id=None):
             # the Button
             Button(label='Hey im a cool blue Button',
                     custom_id='cool blue Button',
-                    style=ButtonColor.blurple)
+                    style=ButtonStyle.blurple)
 
-            # function thats called when the Button pressed
+            # function that's called when the Button pressed
             @client.on_click(custom_id='cool blue Button')
-            async def cool_blue_button(i: discord.Interaction):
-                await i.respond('Hey you pressed a `cool blue Button`!', hidden=True)
+            async def cool_blue_button(i: discord.Interaction, button):
+                await i.respond(f'Hey you pressed a {button.custom_id}!', hidden=True)
 
         Raises
         ------
-        :class:`TypeError`
+        TypeError
             The coroutine passed is not actually a coroutine.
         """
         def decorator(func):
@@ -1056,35 +1065,32 @@ def decorator(func):
 
             _name = custom_id if custom_id is not None else func.__name__
 
-            def check(i):
-                return i.component.custom_id == str(_name)
-
             try:
                 listeners = self._listeners['raw_button_click']
             except KeyError:
                 listeners = []
                 self._listeners['raw_button_click'] = listeners
 
-            listeners.append((func, check))
+            listeners.append((func, lambda i, c: str(c.custom_id) == str(custom_id)))
             return func
 
         return decorator
 
     def on_select(self, custom_id=None):
-        """A decorator with which you can assign a function to a specific :class:`SelectMenu` (or its custom_id).
+        """
+        A decorator with which you can assign a function to a specific :class:`discord.SelectMenu` (or its custom_id).
         
-        .. note::
-            This will always give exactly one Parameter of type `discord.Interaction <./interaction.html#discord-interaction>`_ like an `raw_selection_select-Event <#on-raw-button-click>`_.
+        The function this is attached to must take the same parameters as a
+        `raw_selection_select-Event <https://discordpy-message-components.rtfd.io/en/latest/addition.html#on_raw_selection_select>`_.
 
         .. important::
-            The Function this decorator attached to must be an corountine (means an awaitable)
+            The func must be a coroutine, if not, :exc:`TypeError` is raised.
 
         Parameters
-        ----------
-        
-        :attr:`custom_id`: Optional[str]
-
-            If the :attr:`custom_id` of the SelectMenu could not use as an function name or you want to give the function a diferent name then the custom_id use this one to set the custom_id.
+        -----------
+        custom_id: Optional[str]
+            If the :attr:`custom_id` of the :class:`discord.SelectMenu` could not use as an function name
+            or you want to give the function a different name then the custom_id use this one to set the custom_id.
 
 
         Example
@@ -1094,16 +1100,16 @@ def on_select(self, custom_id=None):
 
             # the SelectMenu
             SelectMenu(custom_id='choose_your_gender',
-                    options=[
-                            select_option(label='Female', value='Female', emoji='♀️'),
-                            select_option(label='Male', value='Male', emoji='♂️'),
-                            select_option(label='Non Binary', value='Non Binary', emoji='⚧')
-                            ], placeholder='Choose your Gender')
+                       options=[
+                           SelectOption(label='Female', value='Female', emoji='♀️'),
+                           SelectOption(label='Male', value='Male', emoji='♂️'),
+                           SelectOption(label='Trans/Non Binary', value='Trans/Non Binary', emoji='⚧')
+                       ], placeholder='Choose your Gender')
 
-            # function thats called when the SelectMenu is used
+            # function that's called when the SelectMenu is used
             @client.on_select()
-            async def choose_your_gender(i: discord.Interaction):
-                await i.respond(f'You selected `{i.component.values[0]}`!', hidden=True)
+            async def choose_your_gender(i: discord.Interaction, select_menu):
+                await i.respond(f'You selected `{select_menu.values[0]}`!', hidden=True)
 
         Raises
         --------
@@ -1114,18 +1120,15 @@ def decorator(func):
             if not asyncio.iscoroutinefunction(func):
                 raise TypeError('event registered must be a coroutine function')
 
-            _name = custom_id if custom_id is not None else func.__name__
-
-            def check(i):
-                return i.component.custom_id == str(_name)
+            _custom_id = custom_id if custom_id is not None else func.__name__
 
             try:
                 listeners = self._listeners['raw_selection_select']
             except KeyError:
                 listeners = []
                 self._listeners['raw_selection_select'] = listeners
 
-            listeners.append((func, check))
+            listeners.append((func, lambda i, c: str(c.custom_id) == str(_custom_id)))
             return func
 
         return decorator