start work on static typechecks, based after 'channels' is removed

mypy.ini

@@ -0,0 +1,2 @@
+[mypy]
+plugins = sqlmypy

uqcsbot/bot.py

@@ -34,13 +34,23 @@ async def setup_hook(self):
         await self.web_server()
 
     async def admin_alert(
+<<<<<<< Updated upstream
         self, 
         title: str, 
         colour: discord.Colour, 
         description: str = None, 
         footer: str = None, 
         fields: List[tuple] = None, 
         fields_inline: bool = True
+=======
+        self,
+        title: str,
+        colour: discord.Colour,
+        description: str | None = None,
+        footer: str | None = None,
+        fields: List[tuple] | None = None,
+        fields_inline: bool = True,
+>>>>>>> Stashed changes
     ):
         """ Sends an alert to the admin channel for logging. """
         admin_channel = discord.utils.get(self.uqcs_server.channels, name=ADMIN_ALERTS)

uqcsbot/events.py

@@ -106,7 +106,13 @@ def encode_text(cls, text: str) -> str:
         return text.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")
 
     @classmethod
+<<<<<<< Updated upstream
     def from_cal_event(cls, cal_event, source: str = "UQCS", recurrence_dt: datetime = None):
+=======
+    def from_cal_event(
+        cls, cal_event, source: str = "UQCS", recurrence_dt: datetime | None = None
+    ):
+>>>>>>> Stashed changes
         """
         Converts an ical event to an Event
 
@@ -212,7 +218,16 @@ def _handle_calendar(self, calendar) -> List[Event]:
 
         return events
 
+<<<<<<< Updated upstream
     async def send_events(self, channel: discord.abc.Messageable, interaction: discord.Interaction = None, *args):
+=======
+    async def send_events(
+        self,
+        channel: discord.abc.Messageable,
+        interaction: discord.Interaction | None = None,
+        *args,
+    ):
+>>>>>>> Stashed changes
         current_time = self._get_current_time()
         event_filter = EventFilter.from_argument(args)
         events = []