Skip to content

Commit 92f5c8e

Browse files
committed
Fix various bugs with threads glitching
1 parent a123bf6 commit 92f5c8e

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

bot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1164,7 +1164,7 @@ async def handle_reaction_events(self, payload):
11641164
logger.warning("Failed to find linked message for reactions: %s", e)
11651165
return
11661166

1167-
if self.config["transfer_reactions"]:
1167+
if self.config["transfer_reactions"] and linked_message is not None:
11681168
if payload.event_type == "REACTION_ADD":
11691169
if await self.add_reaction(linked_message, reaction):
11701170
await self.add_reaction(message, reaction)

core/thread.py

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -663,22 +663,23 @@ async def find_linked_message_from_dm(self, message, either_direction=False):
663663
else:
664664
compare_url = None
665665

666-
async for linked_message in self.channel.history():
667-
if not linked_message.embeds:
668-
continue
669-
url = linked_message.embeds[0].author.url
670-
if not url:
671-
continue
672-
if url == compare_url:
673-
return linked_message
666+
if self.channel is not None:
667+
async for linked_message in self.channel.history():
668+
if not linked_message.embeds:
669+
continue
670+
url = linked_message.embeds[0].author.url
671+
if not url:
672+
continue
673+
if url == compare_url:
674+
return linked_message
674675

675-
msg_id = url.split("#")[-1]
676-
if not msg_id.isdigit():
677-
continue
678-
msg_id = int(msg_id)
679-
if int(msg_id) == message.id:
680-
return linked_message
681-
raise ValueError("Thread channel message not found.")
676+
msg_id = url.split("#")[-1]
677+
if not msg_id.isdigit():
678+
continue
679+
msg_id = int(msg_id)
680+
if int(msg_id) == message.id:
681+
return linked_message
682+
raise ValueError("Thread channel message not found.")
682683

683684
async def edit_dm_message(self, message: discord.Message, content: str) -> None:
684685
try:

0 commit comments

Comments
 (0)