Threads with friends

cogs/add_users_to_threads_and_channels.py

@@ -83,67 +83,87 @@ async def add_users_or_roles_silently(
         | discord.Role
         | Iterable[discord.Member]
         | Iterable[discord.Role],
-        thread: discord.Thread,
+        channel_or_thread: discord.Thread | discord.TextChannel,
     ) -> None:
         """Add a user or role to a thread without pinging them."""
         if isinstance(users_or_roles, Iterable):
             user_or_role: discord.Role | discord.Member
             for user_or_role in users_or_roles:
                 await self.add_users_or_roles_silently(
-                    users_or_roles=user_or_role, thread=thread
+                    users_or_roles=user_or_role, channel_or_thread=channel_or_thread
                 )
             return
 
-        message: discord.Message = await thread.send(
-            content=f"Adding {users_or_roles!r} to thread...",
-            silent=True,
+        if isinstance(channel_or_thread, discord.Thread):
+            message: discord.Message = await channel_or_thread.send(
+                content=f"Adding {users_or_roles!r} to thread...",
+                silent=True,
+            )
+            await message.edit(content=f"{users_or_roles.mention}")
+            await message.delete(delay=1)
+            return
+
+        await channel_or_thread.set_permissions(
+            target=users_or_roles,
+            read_messages=True,
+            send_messages=True,
+            reason=f"User {self.bot.user} used TeX-Bot slash-command `add_users_to_channel`.",
         )
-        await message.edit(content=f"{users_or_roles.mention}")
-        await message.delete(delay=1)
 
     async def add_users_or_roles_with_ping(
         self,
         users_or_roles: discord.Member
         | discord.Role
-        | list[discord.Member]
-        | list[discord.Role],
-        thread: discord.Thread,
+        | Iterable[discord.Member]
+        | Iterable[discord.Role],
+        channel_or_thread: discord.Thread | discord.TextChannel,
     ) -> None:
         """Add a user or role to a thread and ping them."""
         if isinstance(users_or_roles, Iterable):
             user_or_role: discord.Role | discord.Member
             for user_or_role in users_or_roles:
                 await self.add_users_or_roles_with_ping(
-                    users_or_roles=user_or_role, thread=thread
+                    users_or_roles=user_or_role, channel_or_thread=channel_or_thread
                 )
             return
 
-        if isinstance(users_or_roles, discord.Member):
-            try:
-                await thread.add_user(user=users_or_roles)
-            except discord.NotFound:
-                logger.debug(
-                    "User: %s has blocked the bot and "
-                    "therefore could not be added to thread: %s.",
-                    users_or_roles,
-                    thread,
-                )
-            return
+        if isinstance(channel_or_thread, discord.Thread):
+            if isinstance(users_or_roles, discord.Member):
+                try:
+                    await channel_or_thread.add_user(user=users_or_roles)
+                except discord.NotFound:
+                    logger.debug(
+                        "User: %s has blocked the bot and "
+                        "therefore could not be added to thread: %s.",
+                        users_or_roles,
+                        channel_or_thread,
+                    )
+                return
 
-        if isinstance(users_or_roles, discord.Role):
             member: discord.Member
             for member in users_or_roles.members:
                 try:
-                    await thread.add_user(member)
+                    await channel_or_thread.add_user(member)
                 except discord.NotFound:
                     logger.debug(
                         "User: %s has blocked the bot and "
                         "therefore could not be added to thread: %s.",
                         member,
-                        thread,
+                        channel_or_thread,
                     )
             return
 
+        await channel_or_thread.set_permissions(
+            target=users_or_roles,
+            read_messages=True,
+            send_messages=True,
+            reason=f"User {self.bot.user} used TeX-Bot slash-command `add_users_to_channel`.",
+        )
+
+        await channel_or_thread.send(
+            content=f"{users_or_roles.mention} has been added to the channel.",
+        )
+
     @TeXBotBaseCog.listener()
     @capture_guild_does_not_exist_error
     async def on_thread_create(self, thread: discord.Thread) -> None:
@@ -161,7 +181,7 @@ async def on_thread_create(self, thread: discord.Thread) -> None:
             return
 
         await self.add_users_or_roles_silently(
-            users_or_roles=[committee_role, committee_elect_role], thread=thread
+            users_or_roles=(committee_role, committee_elect_role), channel_or_thread=thread
         )
 
     @discord.slash_command(  # type: ignore[no-untyped-call, misc]
@@ -204,24 +224,10 @@ async def add_user_to_channel(  # type: ignore[misc]
             await ctx.respond(content=f"The user: {user_id_str} is not valid.")
             return
 
-        if isinstance(ctx.channel, discord.TextChannel):
-            await ctx.channel.set_permissions(
-                target=user_to_add,
-                read_messages=True,
-                send_messages=True,
-                reason=f"User {ctx.user} used TeX-Bot slash-command `add_user_to_channel`.",
-            )
-
-            if not silent:
-                await ctx.channel.send(
-                    content=f"{user_to_add.mention} has been added to the channel."
-                )
-
-        if isinstance(ctx.channel, discord.Thread):
-            if silent:
-                await self.add_users_or_roles_silently(user_to_add, ctx.channel)
-            else:
-                await self.add_users_or_roles_with_ping(user_to_add, ctx.channel)
+        if silent:
+            await self.add_users_or_roles_silently(user_to_add, ctx.channel)
+        else:
+            await self.add_users_or_roles_with_ping(user_to_add, ctx.channel)
 
         await ctx.respond(
             content=(
@@ -264,8 +270,6 @@ async def add_role_to_channel(  # type: ignore[misc]
             )
             return
 
-        channel: discord.TextChannel | discord.Thread = ctx.channel
-
         main_guild: discord.Guild = ctx.bot.main_guild
 
         try:
@@ -284,24 +288,10 @@ async def add_role_to_channel(  # type: ignore[misc]
             )
             return
 
-        if isinstance(channel, discord.TextChannel):
-            await channel.set_permissions(
-                target=role_to_add,
-                read_messages=True,
-                send_messages=True,
-                reason=f"User {ctx.user} used TeX-Bot slash-command `add_role_to_channel`.",
-            )
-
-            if not silent:
-                await channel.send(
-                    content=f"{role_to_add.mention} has been added to the channel."
-                )
-
-        if isinstance(channel, discord.Thread):
-            if silent:
-                await self.add_users_or_roles_silently(role_to_add, channel)
-            else:
-                await self.add_users_or_roles_with_ping(role_to_add, channel)
+        if silent:
+            await self.add_users_or_roles_silently(role_to_add, ctx.channel)
+        else:
+            await self.add_users_or_roles_with_ping(role_to_add, ctx.channel)
 
         await ctx.respond(
             content=f"Role {role_to_add.mention} has been added to the channel.",

config.py

@@ -679,7 +679,7 @@ def _setup_strike_performed_manually_warning_location(cls) -> None:
         )
 
     @classmethod
-    def _setup_add_committee_to_threads(cls) -> None:
+    def _setup_auto_add_committee_to_threads(cls) -> None:
         raw_auto_add_committee_to_threads: str = str(
             os.getenv("AUTO_ADD_COMMITTEE_TO_THREADS", "True")
         ).lower()
@@ -731,7 +731,7 @@ def _setup_env_variables(cls) -> None:
         cls._setup_statistics_roles()
         cls._setup_moderation_document_url()
         cls._setup_strike_performed_manually_warning_location()
-        cls._setup_add_committee_to_threads()
+        cls._setup_auto_add_committee_to_threads()
 
         cls._is_env_variables_setup = True