Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: change default attribute of SlashCommandGroup #2303

Merged
merged 10 commits into from
Jan 3, 2024
Merged

fix: change default attribute of SlashCommandGroup #2303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b4fa1f3
Update core.py and changelog
Dasupergrasskakjd Dec 26, 2023
e9f6b94
Update core.py
Dasupergrasskakjd Dec 26, 2023
5ec0d86
Merge branch 'master' into fix-2302
Dasupergrasskakjd Dec 26, 2023
aaf4028
Merge branch 'master' into fix-2302
Dasupergrasskakjd Dec 27, 2023
4176061
Merge branch 'master' into fix-2302
Dasupergrasskakjd Jan 2, 2024
e29f7f0
Update core.py
Dasupergrasskakjd Jan 2, 2024
3f0168c
Update core.py
Dasupergrasskakjd Jan 2, 2024
81a79cf
chore: update changelog
Dorukyum Jan 3, 2024
480e573
fix: remove all references to cog being MISSING
Dorukyum Jan 3, 2024
2e31894
Update CHANGELOG.md
Dorukyum Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
9 changes: 3 additions & 6 deletions discord/commands/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -1162,7 +1162,7 @@ def __init__(

self._before_invoke = None
self._after_invoke = None
self.cog = MISSING
self.cog = None
self.id = None

# Permissions
Expand Down Expand Up @@ -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)
Expand Down
Loading