withdraw fixed

abort matches, when the tournament was deleted

Author: karel26

plugins/tournament/commands.py

@@ -333,7 +333,7 @@ async def signup(self, interaction: discord.Interaction, tournament_id: int, squ
     @utils.squadron_role_check()
     async def withdraw(self, interaction: discord.Interaction, tournament_id: int, squadron_id: int):
         tournament = await self.get_tournament(tournament_id)
-        if tournament['start'] > datetime.now(timezone.utc):
+        if tournament['start'] <= datetime.now(timezone.utc):
             # noinspection PyUnresolvedReferences
             await interaction.response.send_message("You can not withdraw from an active tournament.", ephemeral=True)
             return

plugins/tournament/listener.py

@@ -194,6 +194,8 @@ async def wait_until_choices_finished(self, server: Server):
                             SELECT choices_{side}_ack FROM tm_matches WHERE match_id = %s
                         """, (match_id,))
                         row = await cursor.fetchone()
+                        if not row:
+                            raise ValueError("Match aborted!")
                         finished[side] = row[0]
             if time == int(time_to_choose / 2):
                 await self.inform_squadrons(
@@ -216,7 +218,11 @@ async def next_round(self, server: Server, match_id: int):
         await self.inform_squadrons(server, message=_("You can now use {} to chose your customizations!").format(
                 (await utils.get_command(self.bot, group=self.plugin.match.name,
                                          name=self.plugin.customize.name)).mention))
-        await self.wait_until_choices_finished(server)
+        try:
+            await self.wait_until_choices_finished(server)
+        except ValueError:
+            await self.audit(server, f"Match {match_id} aborted!")
+            return
 
         # Start the next round
         async with self.apool.connection() as conn: