SRS small fix on autoupdate

Fixed player auto-unlock in competitive
added terrain display in /tournament verify

Author: karel26

core/data/server.py

@@ -187,7 +187,7 @@ def get_player(self, **kwargs) -> Optional[Player]:
         for player in self.players.values():
             if player.id == 1:
                 continue
-            if 'active' in kwargs and player.active != kwargs['active']:
+            if kwargs.get('active') is not None and player.active != kwargs['active']:
                 continue
             if 'ucid' in kwargs and player.ucid == kwargs['ucid']:
                 return player

core/utils/discord.py

@@ -1139,7 +1139,7 @@ class PlayerTransformer(app_commands.Transformer):
     """
 
     """
-    def __init__(self, *, active: bool = False, watchlist: Optional[bool] = None, vip: Optional[bool] = None):
+    def __init__(self, *, active: Optional[bool] = None, watchlist: Optional[bool] = None, vip: Optional[bool] = None):
         super().__init__()
         self.active = active
         self.watchlist = watchlist

extensions/srs/extension.py

@@ -18,6 +18,7 @@
     import ctypes
 
 from configparser import RawConfigParser
+from contextlib import suppress
 from core import Extension, utils, Server, ServiceRegistry, Autoexec, get_translation, InstallException
 from discord.ext import tasks
 from services.bot import BotService
@@ -444,7 +445,7 @@ def is_installed(self) -> bool:
             return False
 
     async def check_for_updates(self) -> Optional[str]:
-        try:
+        with suppress(aiohttp.ClientConnectionError):
             async with aiohttp.ClientSession(connector=aiohttp.TCPConnector(
                     ssl=ssl.create_default_context(cafile=certifi.where()))) as session:
                 async with session.get(SRS_GITHUB_URL, proxy=self.node.proxy,
@@ -453,10 +454,7 @@ async def check_for_updates(self) -> Optional[str]:
                         version = response.url.raw_parts[-1]
                         if version != self.version:
                             return version
-                        else:
-                            return None
-        except aiohttp.ClientConnectionError:
-            return None
+        return None
 
     def do_update(self):
         try:

plugins/competitive/listener.py

@@ -277,8 +277,9 @@ def print_crew(players: list[Player]) -> str:
         async def remove_players(match: Match, server: Server, players: list[Player]):
             for player in players:
                 match.player_dead(player)
-                # remove the player from the running match so that they can join another one
-                self.in_match[server.name].pop(player.ucid, None)
+                if match.match_id != GLOBAL_MATCH_ID:
+                    # remove the player from the running match so that they can join another one
+                    self.in_match[server.name].pop(player.ucid, None)
                 if self.get_config(server).get('kick_on_death', False):
                     kick_time = self.get_config(server).get('kick_time', 30)
                     self.loop.call_later(delay=kick_time,

plugins/mission/commands.py

@@ -1036,7 +1036,7 @@ async def lock(self, interaction: discord.Interaction,
     @utils.app_has_role('DCS Admin')
     async def unlock(self, interaction: discord.Interaction,
                      server: app_commands.Transform[Server, utils.ServerTransformer(status=[Status.RUNNING])],
-                     player: app_commands.Transform[Player, utils.PlayerTransformer(active=False)]):
+                     player: app_commands.Transform[Player, utils.PlayerTransformer()]):
         if not player:
             # noinspection PyUnresolvedReferences
             await interaction.response.send_message(_("Player not found."), ephemeral=True)

plugins/tournament/commands.py

@@ -787,14 +787,23 @@ async def verify(self, interaction: discord.Interaction, tournament_id: int, squ
                     await interaction.followup.send(_("Squadron ID not found."), ephemeral=True)
                     return
 
-        embed = discord.Embed(color=discord.Color.blue(), title=_('Application for Squadron "{}"').format(
-            utils.escape_string(row['name'])))
-        embed.description = row['application']
-        if row['image_url']:
-            embed.set_thumbnail(url=row['image_url'])
-        embed.add_field(name=_("# Members"), value=str(row['member_count']))
-        embed.add_field(name=_("Role"), value=self.bot.get_role(row['role']).name if row['role'] else _("n/a"))
-        embed.add_field(name=_("State"), value=row['status'])
+                embed = discord.Embed(color=discord.Color.blue(), title=_('Application for Squadron "{}"').format(
+                    utils.escape_string(row['name'])))
+                embed.description = row['application']
+                if row['image_url']:
+                    embed.set_thumbnail(url=row['image_url'])
+                embed.add_field(name=_("# Members"), value=str(row['member_count']))
+                embed.add_field(name=_("Role"), value=self.bot.get_role(row['role']).name if row['role'] else _("n/a"))
+                embed.add_field(name=_("State"), value=row['status'])
+
+                terrains = []
+                async for row in await cursor.execute("""
+                    SELECT terrain FROM tm_squadron_terrain_preferences 
+                    WHERE tournament_id = %s AND squadron_id = %s
+                """, (tournament_id, squadron_id)):
+                    terrains.append('- ' + row['terrain'])
+                if terrains:
+                    embed.add_field(name=_("Terrain Preferences"), value='\n'.join(terrains), inline=False)
 
         view = ApplicationView(self, tournament_id=tournament_id, squadron_id=squadron_id)
         msg = await interaction.followup.send(embed=embed, view=view, ephemeral=utils.get_ephemeral(interaction))