updated poetry deps

pyproject.toml

@@ -23,6 +23,11 @@ aio-mc-rcon = "^3.2.0"
 pytest = "^7.3.1"
 pytest-datafiles = "^3.0.0"
 python-dotenv = "^1.0.0"
+sqlalchemy-stubs = "^0.4"
+types-requests = "^2.30.0.0"
+types-beautifulsoup4 = "^4.12.0.4"
+types-python-dateutil = "^2.8.19.12"
+types-pytz = "^2023.3.0.0"
 
 [tool.poetry.scripts]
 botdev = "dev.cli:main"

uqcsbot/bot.py

@@ -34,23 +34,13 @@ 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,13 +106,9 @@ 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
 
@@ -218,16 +214,12 @@ 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 = []