Merge branch 'master' into features/voice-receive

Author: BobDotCom

.github/workflows/docs.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.10' ]
+        python-version: [ 3.8 ]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
@@ -17,7 +17,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install -U pip
-        pip install -U sphinx sphinxcontrib-trio aiohttp sphinxcontrib-websupport myst-parser typing-extensions
+        pip install -U sphinx sphinxcontrib-trio aiohttp sphinxcontrib-websupport myst-parser
     - name: Compile to html
       run: |
         cd docs

discord/__init__.py

@@ -13,57 +13,57 @@
 __author__ = 'Pycord Development'
 __license__ = 'MIT'
 __copyright__ = 'Copyright 2015-2021 Rapptz & Copyright 2021-present Pycord Development'
-__version__ = '2.0.0-rc.1'
+__version__ = '2.0.0b1'
 
 __path__ = __import__('pkgutil').extend_path(__path__, __name__)
 
 import logging
 from typing import NamedTuple, Literal
 
-from .client import *
-from .appinfo import *
-from .user import *
-from .emoji import *
-from .partial_emoji import *
+from . import utils, opus, abc, ui, sinks
 from .activity import *
-from .channel import *
-from .guild import *
-from .flags import *
-from .member import *
-from .message import *
+from .appinfo import *
 from .asset import *
+from .audit_logs import *
+from .bot import *
+from .channel import *
+from .client import *
+from .cog import Cog
+from .colour import *
+from .commands.__init__ import *
+from .components import *
+from .embeds import *
+from .emoji import *
+from .enums import *
 from .errors import *
-from .permissions import *
-from .role import *
 from .file import *
-from .colour import *
+from .flags import *
+from .guild import *
 from .integrations import *
+from .interactions import *
 from .invite import *
-from .template import *
-from .widget import *
-from .object import *
-from .reaction import *
-from . import utils, opus, abc, ui, sinks
-from .enums import *
-from .embeds import *
+from .member import *
 from .mentions import *
-from .shard import *
+from .message import *
+from .object import *
+from .partial_emoji import *
+from .permissions import *
 from .player import *
-from .webhook import *
-from .voice_client import *
-from .audit_logs import *
 from .raw_models import *
-from .team import *
-from .sticker import *
+from .reaction import *
+from .role import *
+from .scheduled_events import ScheduledEvent, ScheduledEventLocation
+from .shard import *
 from .stage_instance import *
-from .interactions import *
-from .components import *
+from .sticker import *
+from .team import *
+from .template import *
 from .threads import *
-from .bot import *
-from .commands.__init__ import *
-from .cog import Cog
+from .user import *
+from .voice_client import *
+from .webhook import *
 from .welcome_screen import *
-from .scheduled_events import ScheduledEvent, ScheduledEventLocation
+from .widget import *
 
 
 class VersionInfo(NamedTuple):
@@ -74,6 +74,6 @@ class VersionInfo(NamedTuple):
     serial: int
 
 
-version_info: VersionInfo = VersionInfo(major=2, minor=0, micro=0, releaselevel='candidate', serial=1)
+version_info: VersionInfo = VersionInfo(major=2, minor=0, micro=0, releaselevel='beta', serial=1)
 
 logging.getLogger(__name__).addHandler(logging.NullHandler())

discord/asset.py

@@ -268,11 +268,11 @@ def __str__(self) -> str:
     def __len__(self) -> int:
         return len(self._url)
 
-    def __repr__(self) -> str:
+    def __repr__(self):
         shorten = self._url.replace(self.BASE, '')
         return f'<Asset url={shorten!r}>'
 
-    def __eq__(self, other) -> bool:
+    def __eq__(self, other):
         return isinstance(other, Asset) and self._url == other._url
 
     def __hash__(self):

discord/bot.py

@@ -40,7 +40,6 @@
     Type,
     TypeVar,
     Union,
-    Type,
 )
 
 from .client import Client
@@ -90,6 +89,10 @@ def __init__(self, *args, **kwargs) -> None:
         self._pending_application_commands = []
         self._application_commands = {}
 
+    @property
+    def all_commands(self):
+        return self._application_commands
+
     @property
     def pending_application_commands(self):
         return self._pending_application_commands
@@ -150,7 +153,14 @@ def remove_application_command(
             The command that was removed. If the name is not valid then
             ``None`` is returned instead.
         """
-        return self._application_commands.pop(command.id)
+        if command.id is None:
+            try:
+                index = self._pending_application_commands.index(command)
+            except ValueError:
+                return None
+            return self._pending_application_commands.pop(index)
+
+        return self._application_commands.pop(int(command.id), None)
 
     @property
     def get_command(self):

discord/cog.py

@@ -251,6 +251,7 @@ def get_commands(self) -> List[ApplicationCommand]:
                 This does not include subcommands.
         """
         return [c for c in self.__cog_commands__ if isinstance(c, ApplicationCommand) and c.parent is None]
+
     @property
     def qualified_name(self) -> str:
         """:class:`str`: Returns the cog's specified name, not the class name."""
@@ -611,11 +612,17 @@ def _remove_module_references(self, name: str) -> None:
                 self.remove_cog(cogname)
 
         # remove all the commands from the module
-        for cmd in self.all_commands.copy().values():
+        if self._supports_prefixed_commands:
+            for cmd in self.prefixed_commands.copy().values():
+                if cmd.module is not None and _is_submodule(name, cmd.module):
+                    # if isinstance(cmd, GroupMixin):
+                    #     cmd.recursively_remove_all_commands()
+                    self.remove_command(cmd.name)
+        for cmd in self._application_commands.copy().values():
             if cmd.module is not None and _is_submodule(name, cmd.module):
                 # if isinstance(cmd, GroupMixin):
                 #     cmd.recursively_remove_all_commands()
-                self.remove_command(cmd.name)
+                self.remove_application_command(cmd)
 
         # remove all the listeners from the module
         for event_list in self.extra_events.copy().values():