Skip to content

fix: fix few bugs with reactions #993

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

Merged
EepyElvyra merged 1 commit into from
Aug 3, 2022
Merged

fix: fix few bugs with reactions #993

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
17 changes: 10 additions & 7 deletions interactions/api/models/message.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1109,7 +1109,7 @@ async def create_reaction(
raise LibraryException(code=13)

_emoji = (
f":{emoji.name.replace(':', '')}:{emoji.id or ''}"
(f":{emoji.name.replace(':', '')}:{emoji.id or ''}" if emoji.id else emoji.name)
if isinstance(emoji, Emoji)
else emoji
)
Expand Down Expand Up @@ -1143,7 +1143,7 @@ async def remove_all_reactions_of(
raise LibraryException(code=13)

_emoji = (
f":{emoji.name.replace(':', '')}:{emoji.id or ''}"
(f":{emoji.name.replace(':', '')}:{emoji.id or ''}" if emoji.id else emoji.name)
if isinstance(emoji, Emoji)
else emoji
)
Expand All @@ -1166,7 +1166,7 @@ async def remove_own_reaction_of(
raise LibraryException(code=13)

_emoji = (
f":{emoji.name.replace(':', '')}:{emoji.id or ''}"
(f":{emoji.name.replace(':', '')}:{emoji.id or ''}" if emoji.id else emoji.name)
if isinstance(emoji, Emoji)
else emoji
)
Expand All @@ -1187,16 +1187,19 @@ async def remove_reaction_from(
:type user: Union[Member, user, int]
"""
_emoji = (
f":{emoji.name.replace(':', '')}:{emoji.id or ''}"
(f":{emoji.name.replace(':', '')}:{emoji.id or ''}" if emoji.id else emoji.name)
if isinstance(emoji, Emoji)
else emoji
)
if not self._client:
raise LibraryException(code=13)

_user_id = user if isinstance(user, int) else user.id
_user_id = user if isinstance(user, (int, Snowflake)) else user.id
return await self._client.remove_user_reaction(
channel_id=int(self.channel_id), message_id=int(self.id), user_id=_user_id, emoji=_emoji
channel_id=int(self.channel_id),
message_id=int(self.id),
user_id=int(_user_id),
emoji=_emoji,
)

async def get_users_from_reaction(
Expand All @@ -1217,7 +1220,7 @@ async def get_users_from_reaction(
_all_users: List[User] = []

_emoji = (
f":{emoji.name.replace(':', '')}:{emoji.id or ''}"
(f":{emoji.name.replace(':', '')}:{emoji.id or ''}" if emoji.id else emoji.name)
if isinstance(emoji, Emoji)
else emoji
)
Expand Down