Merge branch 'master' into soundboard

CHANGELOG.md

@@ -205,6 +205,8 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2295](https://github.com/Pycord-Development/pycord/issues/2295))
 - Fixed `AttributeError` when failing to establish initial websocket connection.
   ([#2301](https://github.com/Pycord-Development/pycord/pull/2301))
+- Fixed `AttributeError` caused by `command.cog` being `MISSING`.
+  ([#2303](https://github.com/Pycord-Development/pycord/issues/2303))
 
 ## [2.4.1] - 2023-03-20
 

discord/commands/core.py

@@ -846,7 +846,7 @@ def _is_typing_annotated(self, annotation):
 
     @property
     def cog(self):
-        return getattr(self, "_cog", MISSING)
+        return getattr(self, "_cog", None)
 
     @cog.setter
     def cog(self, val):
@@ -1162,7 +1162,7 @@ def __init__(
 
         self._before_invoke = None
         self._after_invoke = None
-        self.cog = MISSING
+        self.cog = None
         self.id = None
 
         # Permissions
@@ -1238,10 +1238,7 @@ def to_dict(self) -> dict:
         return as_dict
 
     def add_command(self, command: SlashCommand) -> None:
-        # check if subcommand has no cog set
-        # also check if cog is MISSING because it
-        # might not have been set by the cog yet
-        if command.cog is MISSING and self.cog is not MISSING:
+        if command.cog is None and self.cog is not None:
             command.cog = self.cog
 
         self.subcommands.append(command)

requirements/dev.txt

@@ -4,7 +4,7 @@ pytest~=7.4.3
 pytest-asyncio~=0.23.2
 # pytest-order~=1.0.1
 mypy~=1.8.0
-coverage~=7.3
+coverage~=7.4
 pre-commit==3.5.0
 codespell==2.2.6
 bandit==1.7.6