Merge branch 'development'

Author: karel26

extensions/lotatc/extension.py

@@ -96,7 +96,11 @@ def load_config(self) -> dict:
         if not os.path.exists(config_path):
             major_version, _ = self.get_inst_version()
             from_path = os.path.join(self.get_inst_path(), 'server', major_version)
-            shutil.copy2(os.path.join(from_path, 'config.lua'), config_path)
+            origin = os.path.join(from_path, 'config.lua')
+            if not os.path.exists(origin):
+                self.log.error(f"{self.name}: Installation Error - Missing config.lua in {from_path}!")
+                return cfg
+            shutil.copy2(origin, config_path)
         for path in [os.path.join(self.home, 'config.lua'), os.path.join(self.home, 'config.custom.lua')]:
             try:
                 with open(path, mode='r', encoding='utf-8') as file:
@@ -106,7 +110,7 @@ def load_config(self) -> dict:
             except FileNotFoundError:
                 pass
             except Exception:
-                self.log.error(f"Error while parsing {path}!", exc_info=True)
+                self.log.error(f"{self.name}: Error while parsing {path}!", exc_info=True)
         return cfg
 
     def get_inst_path(self) -> str:

extensions/mizedit/extension.py

@@ -78,7 +78,10 @@ async def get_presets(self, config: dict) -> list[dict]:
                 return []
 
         now = datetime.now()
-        presets = config['settings']
+        presets = config.get('settings')
+        if not presets:
+            return []
+
         if isinstance(presets, dict):
             tz: str | None = config.get('timezone')
             tzinfo = ZoneInfo(tz) if tz else None
@@ -162,8 +165,11 @@ def _filter(self, filename: str) -> bool:
     async def beforeMissionLoad(self, filename: str) -> tuple[str, bool]:
         if 'filter' in self.config and not self._filter(filename):
             return filename, False
-        await self.apply_presets(self.server, filename, await self.get_presets(self.config),
-                                 debug=self.config.get('debug', False))
+        presets = await self.get_presets(self.config)
+        if not presets:
+            self.log.error("MizEdit: No presets defined!")
+            return filename, False
+        await self.apply_presets(self.server, filename, presets, debug=self.config.get('debug', False))
         return filename, True
 
     @override

plugins/cloud/commands.py

@@ -150,7 +150,7 @@ async def cog_unload(self) -> None:
         if self.config.get('upload_errors', True):
             for handler in self.log.root.handlers:
                 if isinstance(handler, CloudLoggingHandler):
-                    await asyncio.to_thread(handler.close)
+                    handler.close()
                     self.log.root.removeHandler(handler)
         if self.config.get('register', True):
             tasks.append(utils.safe_cancel(self.register))
@@ -208,10 +208,10 @@ async def _request_with_retry(self, method: str, url: str, *, retries: int = 1,
 
                 last_error = ex
 
-                # Reset broken/stale sessions before retrying
-                if self._session and not self._session.closed:
-                    await self._session.close()
-                self._session = None
+                if isinstance(ex, (aiohttp.ClientConnectorError, aiohttp.ServerDisconnectedError)):
+                    if self._session and not self._session.closed:
+                        await self._session.close()
+                    self._session = None
 
                 if attempt >= retries:
                     self.log.warning("Cloud service unavailable.")

plugins/cloud/logger.py

@@ -101,9 +101,15 @@ def close(self):
             except Exception:
                 pass
         if self._session and not self._session.closed:
-            loop = asyncio.get_event_loop()
-            if loop.is_running():
-                loop.create_task(self._session.close())
-            else:
-                loop.run_until_complete(self._session.close())
+            try:
+                loop = asyncio.get_event_loop()
+                if loop.is_running():
+                    loop.create_task(self._session.close())
+                else:
+                    loop.run_until_complete(self._session.close())
+            except RuntimeError:
+                # Fallback for threads without a loop
+                new_loop = asyncio.new_event_loop()
+                new_loop.run_until_complete(self._session.close())
+                new_loop.close()
         super().close()

plugins/discord/commands.py

@@ -1,5 +1,6 @@
 import discord
 
+from contextlib import suppress
 from core import Plugin, command, utils, get_translation, Group
 from datetime import timedelta
 from discord import app_commands, Permissions
@@ -73,7 +74,9 @@ async def clear(self, interaction: discord.Interaction, channel: discord.TextCha
         await purge_channel(node=self.node, channel=channel.id, older_than=older_than,
                             ignore=ignore.id if ignore else None, after_id=int(after_id) if after_id else None,
                             before_id=int(before_id) if before_id else None)
-        await msg.edit(content=_("All messages deleted."))
+        with suppress(discord.NotFound):
+            await msg.delete()
+        await interaction.followup.send(_("All messages deleted."))
 
     @command(name='addrole', description=_('Adds a role to a member'))
     @app_commands.guild_only()

plugins/mission/commands.py

@@ -596,12 +596,16 @@ async def delete(self, interaction: discord.Interaction,
                         await server.node.remove_file(secondary + '.orig')
                         await interaction.followup.send(_('Mission "{}" deleted.').format(mission_name),
                                                         ephemeral=ephemeral)
+                        await self.bot.audit(_("deleted mission {}").format(os.path.basename(filename[:-4])),
+                                             user=interaction.user)
+                    except PermissionError:
+                        await interaction.followup.send(
+                            _('Permission denied while deleting mission "{}".').format(mission_name),
+                            ephemeral=ephemeral)
                     except FileNotFoundError:
                         await interaction.followup.send(
                             _('Mission "{}" was already deleted.').format(mission_name),
                             ephemeral=ephemeral)
-                await self.bot.audit(_("deleted mission {}").format(os.path.basename(filename[:-4])),
-                                     user=interaction.user)
             except (TimeoutError, asyncio.TimeoutError):
                 await interaction.followup.send(_("Timeout while deleting mission.\n"
                                                   "Please reconfirm that the deletion was successful."),

plugins/music/listener.py

@@ -1,6 +1,6 @@
 import asyncio
 
-from core import EventListener, Server, event
+from core import EventListener, Server, event, PluginInstallationError
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -14,6 +14,9 @@ async def _init_radios(self, server: Server, data: dict) -> None:
             await self.plugin.service.init_radios(server)
         except (TimeoutError, asyncio.TimeoutError):
             return
+        except PluginInstallationError as ex:
+            self.log.error(ex)
+            return
         # if we've just started, we need to start the radios
         if data['channel'].startswith('sync-') and data.get('players'):
             await self.plugin.service.start_radios(server)

plugins/restapi/commands.py

@@ -13,6 +13,7 @@
 from fastapi.security import APIKeyHeader
 from plugins.creditsystem.squadron import Squadron
 from plugins.userstats.filter import StatisticsFilter, PeriodFilter
+from psycopg.errors import UndefinedTable
 from psycopg.rows import dict_row
 from services.bot import DCSServerBot
 from services.servicebus import ServiceBus
@@ -1947,18 +1948,21 @@ async def traps(self, nick: str = Form(None), date: str | None = Form(None),
         else:
             join = ""
             where = "WHERE t.player_ucid = %(ucid)s"
-        async with self.apool.connection() as conn:
-            async with conn.cursor(row_factory=dict_row) as cursor:
-                ucid = await self.get_ucid(nick, date)
-                await cursor.execute(f"""
-                    SELECT t.id, t.unit_type, t.grade, t.comment, t.place, t.trapcase, t.wire, t.night, t.points, t.time
-                    FROM traps t
-                    {join}
-                    {where}
-                    ORDER BY time DESC 
-                    LIMIT {limit} OFFSET {offset}
-                """, {"ucid": ucid, "server_name": resolved_server_name})
-                return [TrapEntry.model_validate(result) for result in await cursor.fetchall()]
+        try:
+            async with self.apool.connection() as conn:
+                async with conn.cursor(row_factory=dict_row) as cursor:
+                    ucid = await self.get_ucid(nick, date)
+                    await cursor.execute(f"""
+                        SELECT t.id, t.unit_type, t.grade, t.comment, t.place, t.trapcase, t.wire, t.night, t.points, t.time
+                        FROM traps t
+                        {join}
+                        {where}
+                        ORDER BY time DESC 
+                        LIMIT {limit} OFFSET {offset}
+                    """, {"ucid": ucid, "server_name": resolved_server_name})
+                    return [TrapEntry.model_validate(result) for result in await cursor.fetchall()]
+        except UndefinedTable:
+            raise HTTPException(status_code=500, detail="Greenieboard is not active on this server")
 
     async def traps_image(self, trap_id: int = Query(...)):
         self.log.debug(f'Calling /traps_image with trap_id="{trap_id}"')

plugins/scheduler/commands.py

@@ -484,6 +484,13 @@ async def run_action(self, server: Server, rconf: dict):
             new_mission = rconf.get('mission_id')
             if isinstance(new_mission, list):
                 new_mission = random.choice(new_mission)
+            elif isinstance(new_mission, (int, str)):
+                new_mission = int(new_mission)
+                if new_mission > len(mission_list):
+                    self.log.warning(f"{self.__cog_name__}: "
+                                     f"Mission ID {new_mission} exceeds mission list length on server {server.name}, "
+                                     f"resetting to 1")
+                    new_mission = 1
             elif not new_mission:
                 new_mission = await self.get_mission_from_list(server, rconf.get('mission_file'))
                 if not new_mission: