Skip to content

Commit 18292e8

Browse files
authored
fix: fix few bugs with reactions (#993)
1 parent ef46f58 commit 18292e8

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

interactions/api/models/message.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1109,7 +1109,7 @@ async def create_reaction(
11091109
raise LibraryException(code=13)
11101110

11111111
_emoji = (
1112-
f":{emoji.name.replace(':', '')}:{emoji.id or ''}"
1112+
(f":{emoji.name.replace(':', '')}:{emoji.id or ''}" if emoji.id else emoji.name)
11131113
if isinstance(emoji, Emoji)
11141114
else emoji
11151115
)
@@ -1143,7 +1143,7 @@ async def remove_all_reactions_of(
11431143
raise LibraryException(code=13)
11441144

11451145
_emoji = (
1146-
f":{emoji.name.replace(':', '')}:{emoji.id or ''}"
1146+
(f":{emoji.name.replace(':', '')}:{emoji.id or ''}" if emoji.id else emoji.name)
11471147
if isinstance(emoji, Emoji)
11481148
else emoji
11491149
)
@@ -1166,7 +1166,7 @@ async def remove_own_reaction_of(
11661166
raise LibraryException(code=13)
11671167

11681168
_emoji = (
1169-
f":{emoji.name.replace(':', '')}:{emoji.id or ''}"
1169+
(f":{emoji.name.replace(':', '')}:{emoji.id or ''}" if emoji.id else emoji.name)
11701170
if isinstance(emoji, Emoji)
11711171
else emoji
11721172
)
@@ -1187,16 +1187,19 @@ async def remove_reaction_from(
11871187
:type user: Union[Member, user, int]
11881188
"""
11891189
_emoji = (
1190-
f":{emoji.name.replace(':', '')}:{emoji.id or ''}"
1190+
(f":{emoji.name.replace(':', '')}:{emoji.id or ''}" if emoji.id else emoji.name)
11911191
if isinstance(emoji, Emoji)
11921192
else emoji
11931193
)
11941194
if not self._client:
11951195
raise LibraryException(code=13)
11961196

1197-
_user_id = user if isinstance(user, int) else user.id
1197+
_user_id = user if isinstance(user, (int, Snowflake)) else user.id
11981198
return await self._client.remove_user_reaction(
1199-
channel_id=int(self.channel_id), message_id=int(self.id), user_id=_user_id, emoji=_emoji
1199+
channel_id=int(self.channel_id),
1200+
message_id=int(self.id),
1201+
user_id=int(_user_id),
1202+
emoji=_emoji,
12001203
)
12011204

12021205
async def get_users_from_reaction(
@@ -1217,7 +1220,7 @@ async def get_users_from_reaction(
12171220
_all_users: List[User] = []
12181221

12191222
_emoji = (
1220-
f":{emoji.name.replace(':', '')}:{emoji.id or ''}"
1223+
(f":{emoji.name.replace(':', '')}:{emoji.id or ''}" if emoji.id else emoji.name)
12211224
if isinstance(emoji, Emoji)
12221225
else emoji
12231226
)

0 commit comments

Comments
 (0)