Add msl methods

cogs/make_member.py

@@ -12,10 +12,7 @@
 from logging import Logger
 from typing import Final
 
-import aiohttp
-import bs4
 import discord
-from bs4 import BeautifulSoup
 from django.core.exceptions import ValidationError
 
 from config import settings
@@ -26,6 +23,7 @@
     GuestRoleDoesNotExistError,
 )
 from utils import CommandChecks, TeXBotApplicationContext, TeXBotBaseCog
+from utils.msl import is_student_id_member
 
 logger: Final[Logger] = logging.getLogger("TeX-Bot")
 
@@ -65,8 +63,6 @@
     ".ASPXAUTH": settings["MEMBERS_LIST_AUTH_SESSION_COOKIE"],
 }
 
-REQUEST_URL: Final[str] = settings["MEMBERS_LIST_URL"]
-
 
 class MakeMemberCommandCog(TeXBotBaseCog):
     # noinspection SpellCheckingInspection
@@ -163,62 +159,9 @@ async def make_member(self, ctx: TeXBotApplicationContext, group_member_id: str)
             )
             return
 
-        guild_member_ids: set[str] = set()
-
-        http_session: aiohttp.ClientSession = aiohttp.ClientSession(
-            headers=REQUEST_HEADERS,
-            cookies=REQUEST_COOKIES,
-        )
-        async with http_session, http_session.get(REQUEST_URL) as http_response:
-            response_html: str = await http_response.text()
-
-        MEMBER_HTML_TABLE_IDS: Final[frozenset[str]] = frozenset(
-            {
-                "ctl00_Main_rptGroups_ctl05_gvMemberships",
-                "ctl00_Main_rptGroups_ctl03_gvMemberships",
-                "ctl00_ctl00_Main_AdminPageContent_rptGroups_ctl03_gvMemberships",
-                "ctl00_ctl00_Main_AdminPageContent_rptGroups_ctl05_gvMemberships",
-            },
-        )
-        table_id: str
-        for table_id in MEMBER_HTML_TABLE_IDS:
-            parsed_html: bs4.Tag | bs4.NavigableString | None = BeautifulSoup(
-                response_html,
-                "html.parser",
-            ).find(
-                "table",
-                {"id": table_id},
-            )
-
-            if parsed_html is None or isinstance(parsed_html, bs4.NavigableString):
-                continue
-
-            guild_member_ids.update(
-                row.contents[2].text
-                for row in parsed_html.find_all(
-                    "tr",
-                    {"class": ["msl_row", "msl_altrow"]},
-                )
-            )
-
-        guild_member_ids.discard("")
-        guild_member_ids.discard("\n")
-        guild_member_ids.discard(" ")
-
-        if not guild_member_ids:
+        if not await is_student_id_member(student_id=group_member_id):
             await self.command_send_error(
-                ctx,
-                error_code="E1041",
-                logging_message=OSError(
-                    "The guild member IDs could not be retrieved from "
-                    "the MEMBERS_LIST_URL.",
-                ),
-            )
-            return
-
-        if group_member_id not in guild_member_ids:
-            await self.command_send_error(
-                ctx,
+                ctx=ctx,
                 message=(
                     f"You must be a member of {self.bot.group_full_name} "
                     "to use this command.\n"

config.py

@@ -378,20 +378,19 @@ def _setup_roles_messages(cls) -> None:
         cls._settings["ROLES_MESSAGES"] = set(messages_dict["roles_messages"])  # type: ignore[call-overload]
 
     @classmethod
-    def _setup_members_list_url(cls) -> None:
-        raw_members_list_url: str | None = os.getenv("MEMBERS_LIST_URL")
+    def _setup_msl_organisation_id(cls) -> None:
+        raw_msl_organisation_id: str | None = os.getenv("MSL_ORGANISATION_ID")
 
-        MEMBERS_LIST_URL_IS_VALID: Final[bool] = bool(
-            raw_members_list_url
-            and validators.url(raw_members_list_url),
+        MSL_ORGANISATION_ID_IS_VALID: Final[bool] = bool(
+            raw_msl_organisation_id
+            and re.fullmatch(r"\A\d{4}\Z", raw_msl_organisation_id),
         )
-        if not MEMBERS_LIST_URL_IS_VALID:
-            INVALID_MEMBERS_LIST_URL_MESSAGE: Final[str] = (
-                "MEMBERS_LIST_URL must be a valid URL."
+        if not MSL_ORGANISATION_ID_IS_VALID:
+            raise ImproperlyConfiguredError(
+                message="MSL_ORGANISATION_ID must be a 4-digit number.",
             )
-            raise ImproperlyConfiguredError(INVALID_MEMBERS_LIST_URL_MESSAGE)
 
-        cls._settings["MEMBERS_LIST_URL"] = raw_members_list_url
+        cls._settings["MSL_ORGANISATION_ID"] = raw_msl_organisation_id
 
     @classmethod
     def _setup_members_list_auth_session_cookie(cls) -> None:
@@ -708,7 +707,7 @@ def _setup_env_variables(cls) -> None:
         cls._setup_ping_command_easter_egg_probability()
         cls._setup_welcome_messages()
         cls._setup_roles_messages()
-        cls._setup_members_list_url()
+        cls._setup_msl_organisation_id()
         cls._setup_members_list_auth_session_cookie()
         cls._setup_membership_perks_url()
         cls._setup_purchase_membership_url()