Merge pull request #43 from Frigondin/dev

Battleground : Fixe reset command and add multiple files to recon

Author: karel26

plugins/battleground2/commands.py

@@ -4,6 +4,7 @@
 
 from discord import app_commands
 from discord.app_commands import Group
+from typing import Optional
 
 from core import Plugin, utils, Channel, Coalition, Server, get_translation
 from services.bot import DCSServerBot
@@ -24,7 +25,7 @@ async def rename(self, conn: psycopg.AsyncConnection, old_name: str, new_name: s
     @battleground.command(description=_('Push MGRS coordinates with screenshots to DCS Battleground'))
     @app_commands.guild_only()
     @utils.app_has_role('DCS')
-    async def recon(self, interaction: discord.Interaction, name: str, mgrs: str, screenshot: discord.Attachment):
+    async def recon(self, interaction: discord.Interaction, name: str, mgrs: str, screenshot1: discord.Attachment, screenshot2: Optional[discord.Attachment], screenshot3: Optional[discord.Attachment], screenshot4: Optional[discord.Attachment], screenshot5: Optional[discord.Attachment], screenshot6: Optional[discord.Attachment], screenshot7: Optional[discord.Attachment], screenshot8: Optional[discord.Attachment], screenshot9: Optional[discord.Attachment], screenshot10: Optional[discord.Attachment]):
         mgrs = mgrs.replace(' ', '')
         if len(mgrs) != 15 or not mgrs[:2].isnumeric() or not mgrs[5:].isnumeric():
             # noinspection PyUnresolvedReferences
@@ -43,7 +44,7 @@ async def recon(self, interaction: discord.Interaction, name: str, mgrs: str, sc
             else:
                 continue
             done = True
-            screenshots = [att.url for att in [screenshot]]  # TODO: add multiple ones
+            screenshots = [att.url for att in list(filter(lambda item: item is not None,[screenshot1,screenshot2,screenshot3,screenshot4,screenshot5,screenshot6,screenshot7,screenshot8,screenshot9,screenshot10]))]
             author = {
                 "name": interaction.user.name,
                 "icon_url": interaction.user.display_avatar.url
@@ -87,7 +88,7 @@ async def recon(self, interaction: discord.Interaction, name: str, mgrs: str, sc
     async def reset(self, interaction: discord.Interaction,
                     server: app_commands.Transform[Server, utils.ServerTransformer]):
         async with self.apool.connection() as conn:
-            async with conn.transation():
+            async with conn.transaction():
                 await conn.execute("DELETE FROM bg_geometry2 WHERE server_name = %s", (server.name, ))
                 await conn.execute("DELETE FROM bg_missions WHERE server_name = %s", (server.name,))
                 await conn.execute("DELETE FROM bg_task WHERE server_name = %s", (server.name,))