Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
14 changes: 14 additions & 0 deletions cogs/utility.py
Original file line number Diff line number Diff line change
Expand Up @@ -873,6 +873,20 @@ async def config_remove(self, ctx, *, key: str.lower):
color=self.bot.main_color,
description=f"`{key}` had been reset to default.",
)

# Cancel exsisting active closures from thread_auto_close due to being disabled.
if key == "thread_auto_close":
closures = self.bot.config["closures"]
for recipient_id, items in tuple(closures.items()):
if items.get("auto_close", False) is True:
self.bot.config["closures"].pop(recipient_id)
await self.config.update()
thread = await self.bot.threads.find(recipient_id=int(recipient_id))
if thread:
await thread.cancel_closure(all=True)
else:
self.bot.config["closures"].pop(recipient_id)
await self.config.update()
else:
embed = discord.Embed(
title="Error",
Expand Down
9 changes: 8 additions & 1 deletion core/thread.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ def __init__(
self.wait_tasks = []
self.close_task = None
self.auto_close_task = None
self.auto_close_cancelled = False # Track if auto-close was explicitly cancelled
self._cancelled = False
self._dm_menu_msg_id = None
self._dm_menu_channel_id = None
Expand Down Expand Up @@ -1078,6 +1079,7 @@ async def close(
self.auto_close_task = task
else:
self.close_task = task
self.auto_close_cancelled = False # Reset flag when manually closing
else:
await self._close(closer, silent, delete_channel, message)

Expand Down Expand Up @@ -1278,6 +1280,7 @@ async def cancel_closure(self, auto_close: bool = False, all: bool = False) -> N
if self.auto_close_task is not None and (auto_close or all):
self.auto_close_task.cancel()
self.auto_close_task = None
self.auto_close_cancelled = True # Mark auto-close as explicitly cancelled

to_update = self.bot.config["closures"].pop(str(self.id), None)
if to_update is not None:
Expand Down Expand Up @@ -1810,7 +1813,11 @@ async def send(
return await destination.send(embed=embed)

if not note and from_mod:
self.bot.loop.create_task(self._restart_close_timer()) # Start or restart thread auto close
# Only restart auto-close if it wasn't explicitly cancelled
if not self.auto_close_cancelled:
self.bot.loop.create_task(self._restart_close_timer()) # Start or restart thread auto close
elif not note and not from_mod:
await self.cancel_closure(all=True)

if self.close_task is not None:
# cancel closing if a thread message is sent.
Expand Down
Loading