Improve text_channel and member fetch from ID processing (#535)

Signed-off-by: Matt Norton <matt@carrotmanmatt.com>
Co-authored-by: automatic-pr-updater[bot] <217796550+automatic-pr-updater[bot]@users.noreply.github.com>

Author: CarrotManMatt

utils/tex_bot.py

@@ -29,7 +29,7 @@
 if TYPE_CHECKING:
     from collections.abc import Awaitable, Sequence
     from logging import Logger
-    from typing import Final, NoReturn
+    from typing import Final, LiteralString, NoReturn
 
     from utils import AllChannelTypes
 
@@ -108,7 +108,7 @@ async def committee_role(self) -> discord.Role:
 
         Raises `CommitteeRoleDoesNotExist` if the role does not exist.
         """
-        if not self._committee_role or not self._guild_has_role(self._committee_role):
+        if not self._committee_role or not self._main_guild_has_role(self._committee_role):
             self._committee_role = discord.utils.get(
                 await self.main_guild.fetch_roles(),
                 name="Committee",
@@ -131,7 +131,7 @@ async def committee_elect_role(self) -> discord.Role:
         """
         COMMITTEE_ELECT_ROLE_NEEDS_FETCHING: Final[bool] = bool(
             not self._committee_elect_role
-            or not self._guild_has_role(self._committee_elect_role),
+            or not self._main_guild_has_role(self._committee_elect_role),
         )
         if COMMITTEE_ELECT_ROLE_NEEDS_FETCHING:
             self._committee_elect_role = discord.utils.get(
@@ -156,7 +156,7 @@ async def guest_role(self) -> discord.Role:
 
         Raises `GuestRoleDoesNotExist` if the role does not exist.
         """
-        if not self._guest_role or not self._guild_has_role(self._guest_role):
+        if not self._guest_role or not self._main_guild_has_role(self._guest_role):
             self._guest_role = discord.utils.get(
                 await self.main_guild.fetch_roles(),
                 name="Guest",
@@ -179,7 +179,7 @@ async def member_role(self) -> discord.Role:
 
         Raises `MemberRoleDoesNotExist` if the role does not exist.
         """
-        if not self._member_role or not self._guild_has_role(self._member_role):
+        if not self._member_role or not self._main_guild_has_role(self._member_role):
             self._member_role = discord.utils.get(self.main_guild.roles, name="Member")
             self._member_role = discord.utils.get(
                 await self.main_guild.fetch_roles(),
@@ -201,7 +201,7 @@ async def archivist_role(self) -> discord.Role:
 
         Raises `ArchivistRoleDoesNotExist` if the role does not exist.
         """
-        if not self._archivist_role or not self._guild_has_role(self._archivist_role):
+        if not self._archivist_role or not self._main_guild_has_role(self._archivist_role):
             self._archivist_role = discord.utils.get(
                 await self.main_guild.fetch_roles(),
                 name="Archivist",
@@ -219,7 +219,7 @@ async def applicant_role(self) -> discord.Role:
 
         The applicant role allows users to see the specific applicant channels.
         """
-        if not self._applicant_role or not self._guild_has_role(self._applicant_role):
+        if not self._applicant_role or not self._main_guild_has_role(self._applicant_role):
             self._applicant_role = discord.utils.get(
                 await self.main_guild.fetch_roles(),
                 name="Applicant",
@@ -240,8 +240,8 @@ async def roles_channel(self) -> discord.TextChannel:
 
         Raises `RolesChannelDoesNotExist` if the channel does not exist.
         """
-        if not self._roles_channel or not self._guild_has_channel(self._roles_channel):
-            self._roles_channel = await self._fetch_text_channel("roles")
+        if not self._roles_channel or not self._main_guild_has_channel(self._roles_channel):
+            self._roles_channel = await self._fetch_main_guild_text_channel("roles")
 
         if not self._roles_channel:
             raise RolesChannelDoesNotExistError
@@ -255,8 +255,10 @@ async def general_channel(self) -> discord.TextChannel:
 
         Raises `GeneralChannelDoesNotExist` if the channel does not exist.
         """
-        if not self._general_channel or not self._guild_has_channel(self._general_channel):
-            self._general_channel = await self._fetch_text_channel("general")
+        if not self._general_channel or not self._main_guild_has_channel(
+            self._general_channel
+        ):
+            self._general_channel = await self._fetch_main_guild_text_channel("general")
 
         if not self._general_channel:
             raise GeneralChannelDoesNotExistError
@@ -272,9 +274,10 @@ async def rules_channel(self) -> discord.TextChannel:
 
         Raises `RulesChannelDoesNotExist` if the channel does not exist.
         """
-        if not self._rules_channel or not self._guild_has_channel(self._rules_channel):
+        if not self._rules_channel or not self._main_guild_has_channel(self._rules_channel):
             self._rules_channel = (
-                self.main_guild.rules_channel or await self._fetch_text_channel("welcome")
+                self.main_guild.rules_channel
+                or await self._fetch_main_guild_text_channel("welcome")
             )
 
         if not self._rules_channel:
@@ -390,13 +393,15 @@ def group_moderation_contact(self) -> str:
     def _check_guild_accessible(self, guild_id: int) -> bool:
         return bool(discord.utils.get(self.guilds, id=guild_id))
 
-    def _guild_has_role(self, role: discord.Role) -> bool:
+    def _main_guild_has_role(self, role: discord.Role) -> bool:
         return bool(discord.utils.get(self.main_guild.roles, id=role.id))
 
-    def _guild_has_channel(self, channel: discord.TextChannel) -> bool:
+    def _main_guild_has_channel(self, channel: discord.TextChannel) -> bool:
         return bool(discord.utils.get(self.main_guild.text_channels, id=channel.id))
 
-    async def _fetch_text_channel(self, name: str) -> discord.TextChannel | None:
+    async def _fetch_main_guild_text_channel(
+        self, name: "LiteralString"
+    ) -> discord.TextChannel | None:
         text_channel: AllChannelTypes | None = discord.utils.get(
             await self.main_guild.fetch_channels(),
             name=name,
@@ -485,7 +490,7 @@ async def get_member_from_str_id(self, str_member_id: str) -> discord.Member:
         Raises `ValueError` if the provided ID does not represent any member
         of your group's Discord guild.
         """
-        str_member_id = str_member_id.replace("<@", "").replace(">", "")
+        str_member_id = re.sub(r"\A\s*(<@)(.*)(?(1)>|)\s*\Z", r"\2", str_member_id)
 
         if not re.fullmatch(r"\A\d{17,20}\Z", str_member_id):
             INVALID_USER_ID_MESSAGE: Final[str] = f"'{str_member_id}' is not a valid user ID."