mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-07-11 12:28:03 +00:00
Code Issues Projects Releases Wiki Activity

Hoist webhook detection outside of store_user helper

Browse Source
This commit is contained in:
Rapptz 2023-06-11 12:21:37 -04:00
parent 94bf7d8644
commit f1bade4bda
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
discord/interactions.py
View File

@ -1041,8 +1041,8 @@ class _InteractionMessageState:
def _get_guild(self, guild_id): def _get_guild(self, guild_id):
return self._parent._get_guild(guild_id) return self._parent._get_guild(guild_id)
def store_user(self, data): def store_user(self, data, *, cache: bool = True):
return self._parent.store_user(data) return self._parent.store_user(data, cache=cache)
def create_user(self, data): def create_user(self, data):
return self._parent.create_user(data) return self._parent.create_user(data)

2
discord/message.py
View File

@ -1808,7 +1808,7 @@ class Message(PartialMessage, Hashable):
self.nonce = value self.nonce = value
def _handle_author(self, author: UserPayload) -> None: def _handle_author(self, author: UserPayload) -> None:
self.author = self._state.store_user(author) self.author = self._state.store_user(author, cache=self.webhook_id is None)
if isinstance(self.guild, Guild): if isinstance(self.guild, Guild):
found = self.guild.get_member(self.author.id) found = self.guild.get_member(self.author.id)
if found is not None: if found is not None:

7
discord/state.py
View File

@ -349,19 +349,18 @@ class ConnectionState(Generic[ClientT]):
for vc in self.voice_clients: for vc in self.voice_clients:
vc.main_ws = ws # type: ignore # Silencing the unknown attribute (ok at runtime). vc.main_ws = ws # type: ignore # Silencing the unknown attribute (ok at runtime).
def store_user(self, data: Union[UserPayload, PartialUserPayload]) -> User: def store_user(self, data: Union[UserPayload, PartialUserPayload], *, cache: bool = True) -> User:
# this way is 300% faster than `dict.setdefault`. # this way is 300% faster than `dict.setdefault`.
user_id = int(data['id']) user_id = int(data['id'])
try: try:
return self._users[user_id] return self._users[user_id]
except KeyError: except KeyError:
user = User(state=self, data=data) user = User(state=self, data=data)
# TODO: with the removal of discrims this becomes a bit annoying if cache:
if user.discriminator != '0000':
self._users[user_id] = user self._users[user_id] = user
return user return user
def store_user_no_intents(self, data: Union[UserPayload, PartialUserPayload]) -> User: def store_user_no_intents(self, data: Union[UserPayload, PartialUserPayload], *, cache: bool = True) -> User:
return User(state=self, data=data) return User(state=self, data=data)
def create_user(self, data: Union[UserPayload, PartialUserPayload]) -> User: def create_user(self, data: Union[UserPayload, PartialUserPayload]) -> User:

4
discord/webhook/async_.py
View File

@ -715,9 +715,9 @@ class _WebhookState:
return self._parent._get_guild(guild_id) return self._parent._get_guild(guild_id)
return None return None
def store_user(self, data: Union[UserPayload, PartialUserPayload]) -> BaseUser: def store_user(self, data: Union[UserPayload, PartialUserPayload], *, cache: bool = True) -> BaseUser:
if self._parent is not None: if self._parent is not None:
return self._parent.store_user(data) return self._parent.store_user(data, cache=cache)
# state parameter is artificial # state parameter is artificial
return BaseUser(state=self, data=data) # type: ignore return BaseUser(state=self, data=data) # type: ignore