From d3fe6d633ceb953e8f7d9b1716a9816526aaba8f Mon Sep 17 00:00:00 2001 From: Josh <8677174+bijij@users.noreply.github.com> Date: Sat, 1 Apr 2023 22:09:58 +1000 Subject: [PATCH] Rename State.get_reaction_emoji --- discord/onboarding.py | 2 +- discord/reaction.py | 2 +- discord/state.py | 2 +- discord/webhook/async_.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/discord/onboarding.py b/discord/onboarding.py index 96be087cd..f4999b0f4 100644 --- a/discord/onboarding.py +++ b/discord/onboarding.py @@ -90,7 +90,7 @@ class OnboardingPromptOption: self.id: int = int(data['id']) self.title: str = data['title'] self.description: Optional[str] = data['description'] - self.emoji: Optional[Union[PartialEmoji, Emoji, str]] = self._state.get_reaction_emoji(data['emoji']) + self.emoji: Optional[Union[PartialEmoji, Emoji, str]] = self._state.get_emoji_from_partial_payload(data['emoji']) self.channel_ids: Set[int] = {int(channel_id) for channel_id in data['channel_ids']} self.role_ids: Set[int] = {int(role_id) for role_id in data['role_ids']} diff --git a/discord/reaction.py b/discord/reaction.py index 5f50ec8f4..e1f88061f 100644 --- a/discord/reaction.py +++ b/discord/reaction.py @@ -85,7 +85,7 @@ class Reaction: def __init__(self, *, message: Message, data: ReactionPayload, emoji: Optional[Union[PartialEmoji, Emoji, str]] = None): self.message: Message = message - self.emoji: Union[PartialEmoji, Emoji, str] = emoji or message._state.get_reaction_emoji(data['emoji']) + self.emoji: Union[PartialEmoji, Emoji, str] = emoji or message._state.get_emoji_from_partial_payload(data['emoji']) self.count: int = data.get('count', 1) self.me: bool = data['me'] diff --git a/discord/state.py b/discord/state.py index 8b556f28c..68ca61f36 100644 --- a/discord/state.py +++ b/discord/state.py @@ -1572,7 +1572,7 @@ class ConnectionState(Generic[ClientT]): return channel.guild.get_member(user_id) return self.get_user(user_id) - def get_reaction_emoji(self, data: PartialEmojiPayload) -> Union[Emoji, PartialEmoji, str]: + def get_emoji_from_partial_payload(self, data: PartialEmojiPayload) -> Union[Emoji, PartialEmoji, str]: emoji_id = utils._get_as_snowflake(data, 'id') if not emoji_id: diff --git a/discord/webhook/async_.py b/discord/webhook/async_.py index f9b03193a..acf69c310 100644 --- a/discord/webhook/async_.py +++ b/discord/webhook/async_.py @@ -731,7 +731,7 @@ class _WebhookState: def get_reaction_emoji(self, data: PartialEmojiPayload) -> Union[PartialEmoji, Emoji, str]: if self._parent is not None: - return self._parent.get_reaction_emoji(data) + return self._parent.get_emoji_from_partial_payload(data) emoji_id = utils._get_as_snowflake(data, 'id')