Merge branch 'main' into main

Author: mbaruh

bot/exts/moderation/watchchannels/_watchchannel.py

@@ -62,7 +62,7 @@ def __init__(
         self.log = logger  # Logger of the child cog for a correct name in the logs
 
         self._consume_task = None
-        self.watched_users = defaultdict(dict)
+        self.watched_users = {}
         self.message_queue = defaultdict(lambda: defaultdict(deque))
         self.consumption_queue = {}
         self.retries = 5
@@ -154,7 +154,7 @@ async def fetch_user_cache(self) -> bool:
             self.log.exception("Failed to fetch the watched users from the API", exc_info=err)
             return False
 
-        self.watched_users = defaultdict(dict)
+        self.watched_users.clear()
 
         for entry in data:
             user_id = entry.pop("user")
@@ -185,13 +185,16 @@ async def consume_messages(self, delay_consumption: bool = True) -> None:
             self.consumption_queue = self.message_queue.copy()
             self.message_queue.clear()
 
-        for user_channel_queues in self.consumption_queue.values():
-            for channel_queue in user_channel_queues.values():
+        for user_id, channel_queues in self.consumption_queue.items():
+            for channel_queue in channel_queues.values():
                 while channel_queue:
                     msg = channel_queue.popleft()
 
-                    self.log.trace(f"Consuming message {msg.id} ({len(msg.attachments)} attachments)")
-                    await self.relay_message(msg)
+                    if watch_info := self.watched_users.get(user_id, None):
+                        self.log.trace(f"Consuming message {msg.id} ({len(msg.attachments)} attachments)")
+                        await self.relay_message(msg, watch_info)
+                    else:
+                        self.log.trace(f"Not consuming message {msg.id} as user {user_id} is no longer watched.")
 
         self.consumption_queue.clear()
 
@@ -218,7 +221,7 @@ async def webhook_send(
                 exc_info=exc
             )
 
-    async def relay_message(self, msg: Message) -> None:
+    async def relay_message(self, msg: Message, watch_info: dict) -> None:
         """Relays the message to the relevant watch channel."""
         limit = BigBrotherConfig.header_message_limit
 
@@ -229,7 +232,7 @@ async def relay_message(self, msg: Message) -> None:
         ):
             self.message_history = MessageHistory(last_author=msg.author.id, last_channel=msg.channel.id)
 
-            await self.send_header(msg)
+            await self.send_header(msg, watch_info)
 
         if DiscordTokenFilter.find_token_in_message(msg.content) or WEBHOOK_URL_RE.search(msg.content):
             cleaned_content = "Content is censored because it contains a bot or webhook token."
@@ -268,21 +271,19 @@ async def relay_message(self, msg: Message) -> None:
 
         self.message_history.message_count += 1
 
-    async def send_header(self, msg: Message) -> None:
+    async def send_header(self, msg: Message, watch_info: dict) -> None:
         """Sends a header embed with information about the relayed messages to the watch channel."""
         if self.disable_header:
             return
 
-        user_id = msg.author.id
-
         guild = self.bot.get_guild(GuildConfig.id)
-        actor = await get_or_fetch_member(guild, self.watched_users[user_id]["actor"])
-        actor = actor.display_name if actor else self.watched_users[user_id]["actor"]
+        actor = await get_or_fetch_member(guild, watch_info["actor"])
+        actor = actor.display_name if actor else watch_info["actor"]
 
-        inserted_at = self.watched_users[user_id]["inserted_at"]
+        inserted_at = watch_info["inserted_at"]
         time_delta = time.format_relative(inserted_at)
 
-        reason = self.watched_users[user_id]["reason"]
+        reason = watch_info["reason"]
 
         if isinstance(msg.channel, DMChannel):
             # If a watched user DMs the bot there won't be a channel name or jump URL
@@ -343,12 +344,13 @@ async def prepare_watched_users_data(
                 update_cache = False
         list_data["updated"] = update_cache
 
-        watched_iter = self.watched_users.items()
+        # Copy into list to prevent issues if it is modified elsewhere while it's being iterated over.
+        watched_list = list(self.watched_users.items())
         if oldest_first:
-            watched_iter = reversed(watched_iter)
+            watched_list.reverse()
 
         list_data["info"] = {}
-        for user_id, user_data in watched_iter:
+        for user_id, user_data in watched_list:
             member = await get_or_fetch_member(ctx.guild, user_id)
             line = f"- `{user_id}`"
             if member:
@@ -366,8 +368,6 @@ async def prepare_watched_users_data(
     def _remove_user(self, user_id: int) -> None:
         """Removes a user from a watch channel."""
         self.watched_users.pop(user_id, None)
-        self.message_queue.pop(user_id, None)
-        self.consumption_queue.pop(user_id, None)
 
     async def cog_unload(self) -> None:
         """Takes care of unloading the cog and canceling the consumption task."""

poetry.lock

@@ -9,7 +9,7 @@ license = "MIT"
 python = "3.12.*"
 
 # See https://bot-core.pythondiscord.com/ for docs.
-pydis_core = { version = "11.2.0", extras = ["all"] }
+pydis_core = { version = "11.3.0", extras = ["all"] }
 
 aiohttp = "3.9.5"
 arrow = "1.3.0"
@@ -37,7 +37,7 @@ pre-commit = "3.7.1"
 pip-licenses = "4.5.1"
 pytest = "8.2.2"
 pytest-cov = "5.0.0"
-pytest-subtests = "0.13.0"
+pytest-subtests = "0.13.1"
 pytest-xdist = "3.6.1"
 ruff = "0.5.2"
 taskipy = "1.13.0"