Skip to content

Resolve method-field naming clashes in app commands and gateway modules #188

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

Open
sonarqube-agent wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Resolve method-field naming clashes in app commands and gateway modules #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 11 additions & 10 deletions discord/app_commands/installs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@ def to_array(self) -> List[InteractionInstallationType]:
return values


_CONTEXT_TYPE_GUILD: int = 0
_CONTEXT_TYPE_DM_CHANNEL: int = 1
_CONTEXT_TYPE_PRIVATE_CHANNEL: int = 2


class AppCommandContext:
r"""Wraps up the Discord :class:`~discord.app_commands.Command` execution context.

Expand All @@ -125,10 +130,6 @@ class AppCommandContext:
Whether the context allows usage in a DM or a GDM channel.
"""

GUILD: ClassVar[int] = 0
DM_CHANNEL: ClassVar[int] = 1
PRIVATE_CHANNEL: ClassVar[int] = 2

__slots__ = ('_guild', '_dm_channel', '_private_channel')

def __init__(
Expand Down Expand Up @@ -188,20 +189,20 @@ def _merge_to_array(self, other: Optional[AppCommandContext]) -> Optional[List[I
def _from_value(cls, value: Sequence[InteractionContextType]) -> Self:
self = cls()
for x in value:
if x == cls.GUILD:
if x == _CONTEXT_TYPE_GUILD:
self._guild = True
elif x == cls.DM_CHANNEL:
elif x == _CONTEXT_TYPE_DM_CHANNEL:
self._dm_channel = True
elif x == cls.PRIVATE_CHANNEL:
elif x == _CONTEXT_TYPE_PRIVATE_CHANNEL:
self._private_channel = True
return self

def to_array(self) -> List[InteractionContextType]:
values = []
if self._guild:
values.append(self.GUILD)
values.append(_CONTEXT_TYPE_GUILD)
if self._dm_channel:
values.append(self.DM_CHANNEL)
values.append(_CONTEXT_TYPE_DM_CHANNEL)
if self._private_channel:
values.append(self.PRIVATE_CHANNEL)
values.append(_CONTEXT_TYPE_PRIVATE_CHANNEL)
return values
8 changes: 4 additions & 4 deletions discord/gateway.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,11 +297,11 @@ class DiscordWebSocket:
DEFAULT_GATEWAY = yarl.URL('wss://gateway.discord.gg/')
DISPATCH = 0
HEARTBEAT = 1
IDENTIFY = 2
IDENTIFY_OP = 2
PRESENCE = 3
VOICE_STATE = 4
VOICE_PING = 5
RESUME = 6
OP_RESUME = 6
RECONNECT = 7
REQUEST_MEMBERS = 8
INVALIDATE_SESSION = 9
Expand Down Expand Up @@ -440,7 +440,7 @@ def wait_for(
async def identify(self) -> None:
"""Sends the IDENTIFY packet."""
payload = {
'op': self.IDENTIFY,
'op': self.IDENTIFY_OP,
'd': {
'token': self.token,
'properties': {
Expand Down Expand Up @@ -475,7 +475,7 @@ async def identify(self) -> None:
async def resume(self) -> None:
"""Sends the RESUME packet."""
payload = {
'op': self.RESUME,
'op': self.OP_RESUME,
'd': {
'seq': self.sequence,
'session_id': self.session_id,
Expand Down