Merge main into 453-action-reminders

Author: cssbhamdev

cogs/committee_actions_tracking.py

@@ -1,5 +1,6 @@
 """Contains cog classes for tracking committee-actions."""
 
+import contextlib
 import logging
 import random
 import time
@@ -15,6 +16,7 @@
 from config import settings
 from db.core.models import AssignedCommitteeAction, DiscordMember
 from exceptions import (
+    CommitteeElectRoleDoesNotExistError,
     CommitteeRoleDoesNotExistError,
     InvalidActionDescriptionError,
     InvalidActionTargetError,
@@ -360,11 +362,22 @@ async def autocomplete_get_committee_members(
         except CommitteeRoleDoesNotExistError:
             return set()
 
+        committee_elect_role: discord.Role | None = None
+        with contextlib.suppress(CommitteeElectRoleDoesNotExistError):
+            committee_elect_role = await ctx.bot.committee_elect_role
+
         return {
             discord.OptionChoice(
                 name=f"{member.display_name} ({member.global_name})", value=str(member.id)
             )
-            for member in committee_role.members
+            for member in (
+                set(committee_role.members)
+                | (
+                    set(committee_elect_role.members)
+                    if committee_elect_role is not None
+                    else set()
+                )
+            )
             if not member.bot
         }
 
@@ -512,9 +525,7 @@ async def create(
         required=True,
         parameter_name="status",
     )
-    @CommandChecks.check_interaction_user_has_committee_role
-    @CommandChecks.check_interaction_user_in_main_guild
-    async def update_status(
+    async def update_status(  # NOTE: Committee role check is not present because non-committee can have actions, and need to be able to list their own actions.
         self, ctx: "TeXBotApplicationContext", action_id: str, status: str
     ) -> None:
         """
@@ -796,9 +807,7 @@ async def action_all_committee(
         default=None,
         parameter_name="status",
     )
-    @CommandChecks.check_interaction_user_has_committee_role
-    @CommandChecks.check_interaction_user_in_main_guild
-    async def list_user_actions(
+    async def list_user_actions(  # NOTE: Committee role check is not present because non-committee can have actions, and need to be able to list their own actions.
         self,
         ctx: "TeXBotApplicationContext",
         *,
@@ -810,15 +819,32 @@ async def list_user_actions(
         Definition and callback of the "/list" command.
 
         Takes in a user and lists out their current actions.
+        If no user is specified, the user issuing the command will be used.
+        If a user has the committee role, they can list actions for other users.
+        If a user does not have the committee role, they can only list their own actions.
         """
-        action_member: discord.Member | discord.User
+        action_member_id = action_member_id.strip()
+
+        action_member: discord.Member | discord.User = (
+            await self.bot.get_member_from_str_id(action_member_id)
+            if action_member_id
+            else ctx.user
+        )
 
-        if action_member_id:
-            action_member = await self.bot.get_member_from_str_id(
-                action_member_id,
+        if action_member != ctx.user and not await self.bot.check_user_has_committee_role(
+            ctx.user
+        ):
+            await ctx.respond(
+                content="Committee role is required to list actions for other users.",
+                ephemeral=True,
             )
-        else:
-            action_member = ctx.user
+            logger.debug(
+                "User: %s, tried to list actions for user: %s, "
+                "but did not have the committee role.",
+                ctx.user,
+                action_member,
+            )
+            return
 
         desired_status: list[str] = (
             [status]