BUGFIX:

- /airbase commands did not work in public channels, if only one server was present
- /airbase info ephemeral didn't work

Author: karel26

README.md

@@ -530,7 +530,7 @@ autorole:                                       # Automatically give roles to pe
   online: Online                                # Give people that are online on any of your servers the "Online" role.
 no_dcs_autoban: false                           # If true, people banned on your Discord will not be banned on your servers (default: false)
 message_ban: User has been banned on Discord.   # Default reason to show people that try to join your DCS servers when they are banned on Discord.
-message_autodelete: 300                         # Most of the Discord messages are private messages. If not, this is the timeout after which they vanish. Default is 300 (5 mins). 
+message_autodelete: 300                         # Optional: Most of the Discord messages are private messages. If not, this is the timeout after which they vanish. Default is 300 (5 mins). 
 channels:
   admin: 1122334455667788                       # Optional: Central admin channel (see below).
   audit: 88776655443322                         # Central audit channel to send audit events to (default: none)

migrate.py

@@ -407,9 +407,10 @@ def migrate_3(node: str):
                 'owner': int(cfg['BOT']['OWNER']),
                 'automatch': cfg['BOT'].getboolean('AUTOMATCH'),
                 'autoban': cfg['BOT'].getboolean('AUTOBAN'),
-                'message_ban': cfg['BOT']['MESSAGE_BAN'],
-                'message_autodelete': int(cfg['BOT']['MESSAGE_AUTODELETE'])
+                'message_ban': cfg['BOT']['MESSAGE_BAN']
             }
+            if int(cfg['BOT']['MESSAGE_AUTODELETE']) > 0:
+                bot['message_autodelete'] = int(cfg['BOT']['MESSAGE_AUTODELETE'])
             # take the first admin channel as the single one
             if single_admin:
                 for server_name, instance in utils.findDCSInstances():

plugins/admin/commands.py

@@ -918,7 +918,8 @@ async def _startup(server: Server):
                 await server.startup()
                 server.maintenance = False
             except (TimeoutError, asyncio.TimeoutError):
-                await interaction.followup.send(_("Timeout while starting server {}!").format(server.name))
+                await interaction.followup.send(_("Timeout while starting server {}!").format(server.name),
+                                                ephemeral=True)
 
         async def _node_online(node_name: str):
             next_startup = 0
@@ -929,7 +930,7 @@ async def _node_online(node_name: str):
                     next_startup += startup_delay
                 else:
                     server.maintenance = False
-            await interaction.followup.send(_("Node {} is now online.").format(node_name))
+            await interaction.followup.send(_("Node {} is now online.").format(node_name), ephemeral=ephemeral)
             await self.bot.audit(f"took node {node_name} online.", user=interaction.user)
 
         ephemeral = utils.get_ephemeral(interaction)

plugins/mission/commands.py

@@ -1065,23 +1065,24 @@ async def persistence(self, interaction: discord.Interaction,
     @airbase.command(name="info", description=_('Information about a specific airbase'))
     @utils.app_has_role('DCS')
     @app_commands.guild_only()
+    @app_commands.rename(_server='server')
     @app_commands.rename(idx=_('airbase'))
     @app_commands.describe(idx=_('Airbase for warehouse information'))
     @app_commands.autocomplete(idx=utils.airbase_autocomplete)
     async def airbase_info(self, interaction: discord.Interaction,
-                           server: app_commands.Transform[Server, utils.ServerTransformer(
+                           _server: app_commands.Transform[Server, utils.ServerTransformer(
                                status=[Status.RUNNING, Status.PAUSED])],
                            idx: int):
-        if server.status not in [Status.RUNNING, Status.PAUSED]:
+        if _server.status not in [Status.RUNNING, Status.PAUSED]:
             # noinspection PyUnresolvedReferences
             await interaction.response.send_message(_("Server {} is not running.").format(server.display_name),
                                                     ephemeral=True)
             return
 
         # noinspection PyUnresolvedReferences
-        await interaction.response.defer()
-        airbase = server.current_mission.airbases[idx]
-        data = await server.send_to_dcs_sync({
+        await interaction.response.defer(ephemeral=utils.get_ephemeral(interaction))
+        airbase = _server.current_mission.airbases[idx]
+        data = await _server.send_to_dcs_sync({
             "command": "getAirbase",
             "name": airbase['name']
         })
@@ -1093,10 +1094,10 @@ async def airbase_info(self, interaction: discord.Interaction,
         report = Report(self.bot, self.plugin_name, 'airbase.json')
         env = await report.render(coalition=colors[data['coalition']], airbase=airbase, data=data)
         if utils.check_roles(set(self.bot.roles['DCS Admin'] + self.bot.roles['GameMaster']), interaction.user):
-            view = AirbaseView(server, airbase, data)
+            view = AirbaseView(_server, airbase, data)
         else:
             view = discord.utils.MISSING
-        msg = await interaction.followup.send(embed=env.embed, view=view, ephemeral=utils.get_ephemeral(interaction))
+        msg = await interaction.followup.send(embed=env.embed, view=view)
         try:
             await view.wait()
         finally:
@@ -1108,29 +1109,30 @@ async def airbase_info(self, interaction: discord.Interaction,
     @airbase.command(description=_('Automatic Terminal Information Service (ATIS)'))
     @utils.app_has_role('DCS')
     @app_commands.guild_only()
+    @app_commands.rename(_server='server')
     @app_commands.rename(idx=_('airbase'))
     @app_commands.describe(idx=_('Airbase for ATIS information'))
     @app_commands.autocomplete(idx=utils.airbase_autocomplete)
     async def atis(self, interaction: discord.Interaction,
-                   server: app_commands.Transform[Server, utils.ServerTransformer(
+                   _server: app_commands.Transform[Server, utils.ServerTransformer(
                        status=[Status.RUNNING, Status.PAUSED])],
                    idx: int):
-        if server.status not in [Status.RUNNING, Status.PAUSED]:
+        if _server.status not in [Status.RUNNING, Status.PAUSED]:
             # noinspection PyUnresolvedReferences
             await interaction.response.send_message(_("Server {} is not running.").format(server.display_name),
                                                     ephemeral=True)
             return
         # noinspection PyUnresolvedReferences
         await interaction.response.defer()
-        airbase = server.current_mission.airbases[idx]
-        data = await server.send_to_dcs_sync({
+        airbase = _server.current_mission.airbases[idx]
+        data = await _server.send_to_dcs_sync({
             "command": "getWeatherInfo",
             "x": airbase['position']['x'],
             "y": airbase['position']['y'],
             "z": airbase['position']['z']
         })
         report = Report(self.bot, self.plugin_name, 'atis.json')
-        env = await report.render(airbase=airbase, data=data, server=server)
+        env = await report.render(airbase=airbase, data=data, server=_server)
         msg = await interaction.original_response()
         await msg.edit(embed=env.embed, delete_after=self.bot.locals.get('message_autodelete'))
 
@@ -1151,7 +1153,7 @@ async def capture(self, interaction: discord.Interaction,
             return
 
         # noinspection PyUnresolvedReferences
-        await interaction.response.defer()
+        await interaction.response.defer(ephemeral=utils.get_ephemeral(interaction))
         airbase = server.current_mission.airbases[idx]
         await server.send_to_dcs_sync({
             "command": "captureAirbase",
@@ -1160,7 +1162,7 @@ async def capture(self, interaction: discord.Interaction,
         })
         await interaction.followup.send(
             _("Airbase \"{}\": Coalition changed to **{}**.\n:warning: Auto-capturing is now **disabled**!").format(
-                airbase['name'], coalition.lower()), ephemeral=utils.get_ephemeral(interaction))
+                airbase['name'], coalition.lower()))
 
     @staticmethod
     async def manage_items(server: Server, airbase: dict, category: str, item: str | list[int],
@@ -1214,16 +1216,17 @@ async def manage_warehouse(server: Server, airbase: dict, value: int | None = No
     @airbase.command(description=_('Manage warehouses'))
     @utils.app_has_role('DCS')
     @app_commands.guild_only()
+    @app_commands.rename(_server='server')
     @app_commands.rename(idx=_('airbase'))
     @app_commands.describe(idx=_('Airbase for warehouse information'))
     @app_commands.autocomplete(idx=utils.airbase_autocomplete)
     @app_commands.autocomplete(category=wh_category_autocomplete)
     @app_commands.autocomplete(item=wh_item_autocomplete)
     async def warehouse(self, interaction: discord.Interaction,
-                        server: app_commands.Transform[Server, utils.ServerTransformer(
+                        _server: app_commands.Transform[Server, utils.ServerTransformer(
                             status=[Status.RUNNING, Status.PAUSED])],
                         idx: int, category: str | None = None, item: str | None = None, value: int | None = None):
-        if server.status not in [Status.RUNNING, Status.PAUSED]:
+        if _server.status not in [Status.RUNNING, Status.PAUSED]:
             # noinspection PyUnresolvedReferences
             await interaction.response.send_message(_("Server {} is not running.").format(server.display_name),
                                                     ephemeral=True)
@@ -1234,15 +1237,15 @@ async def warehouse(self, interaction: discord.Interaction,
             raise PermissionError(_("You cannot change warehouse items."))
 
         # noinspection PyUnresolvedReferences
-        await interaction.response.defer()
-        airbase = server.current_mission.airbases[idx]
+        await interaction.response.defer(ephemeral=True)
+        airbase = _server.current_mission.airbases[idx]
 
         embed = discord.Embed(title=_("Warehouse information for {}").format(airbase['name']),
                               color=discord.Color.blue())
 
         if category and item:
             _item = list(map(int, item.split('.'))) if isinstance(item, str) else item
-            data = await Mission.manage_items(server, airbase, category, _item, value)
+            data = await Mission.manage_items(_server, airbase, category, _item, value)
             if data['value'] == 1000000:
                 display = _("unlimited")
             elif category == 'liquids':
@@ -1251,11 +1254,11 @@ async def warehouse(self, interaction: discord.Interaction,
                 display = _("{} pcs").format(data['value'])
 
             item_name = next(
-                (x['name'] for x in server.resources.get(category) if str(x['wstype']) == item),
+                (x['name'] for x in _server.resources.get(category) if str(x['wstype']) == item),
                 'n/a'
             )
             embed.add_field(name=_("Inventory for {}").format(item_name), value="```" + display + "```")
-            await interaction.followup.send(embed=embed, ephemeral=utils.get_ephemeral(interaction))
+            await interaction.followup.send(embed=embed)
 
         else:
             if value is not None:
@@ -1266,11 +1269,11 @@ async def warehouse(self, interaction: discord.Interaction,
                     return
 
                 if category is not None:
-                    await Mission.manage_category(server, airbase, category, value)
+                    await Mission.manage_category(_server, airbase, category, value)
                 else:
-                    await Mission.manage_warehouse(server, airbase, value)
+                    await Mission.manage_warehouse(_server, airbase, value)
 
-            data = await server.send_to_dcs_sync({
+            data = await _server.send_to_dcs_sync({
                 "command": "getAirbase",
                 "name": airbase['name']
             })

plugins/voting/commands.py

@@ -45,11 +45,12 @@ async def _list(self, interaction: discord.Interaction):
 
     @vote.command(description=_('Create a vote'))
     @app_commands.guild_only()
+    @app_commands.rename(_server='server')
     @utils.app_has_role('DCS')
     async def create(self, interaction: discord.Interaction,
-                     server: app_commands.Transform[Server, utils.ServerTransformer(status=[Status.RUNNING])],
+                     _server: app_commands.Transform[Server, utils.ServerTransformer(status=[Status.RUNNING])],
                      what: Literal['Restart', 'Mission Change', 'Weather Change']):
-        config = self.get_config(server)
+        config = self.get_config(_server)
         # Users with either the "creator" role or "DCS Admin" can use this command
         roles = set(config.get('creator', []) + self.bot.roles['DCS Admin'])
         if not utils.check_roles(roles, interaction.user):
@@ -71,28 +72,28 @@ async def create(self, interaction: discord.Interaction,
                 return
             _creditssystem = cast(CreditSystem, self.bot.cogs['CreditSystem'])
             data = await _creditssystem.get_credits(ucid)
-            campaign_id, campaign_name = utils.get_running_campaign(self.node, server)
+            campaign_id, campaign_name = utils.get_running_campaign(self.node, _server)
             credits = next((x['credits'] for x in data if x['id'] == campaign_id), 0)
             if credits < points:
                 # noinspection PyUnresolvedReferences
                 await interaction.response.send_message(
                     _("You don't have enough credits to create a vote!"), ephemeral=True)
                 return
 
-        if self.eventlistener._all_votes.get(server.name):
+        if self.eventlistener._all_votes.get(_server.name):
             # noinspection PyUnresolvedReferences
             await interaction.response.send_message(_('There is already a voting running on this server.'),
                                                     ephemeral=True)
             return
 
         if what == 'Mission Change' and config['options'].get('mission') is not None:
-            message = _("Vote for a mission change on server {}").format(server.name)
+            message = _("Vote for a mission change on server {}").format(_server.name)
             element = 'mission'
         elif what == 'Restart' and config['options'].get('restart') is not None:
-            message = _("Vote for a restart of server {}").format(server.name)
+            message = _("Vote for a restart of server {}").format(_server.name)
             element = 'restart'
         elif what == 'Weather Change' and config['options'].get('preset') is not None:
-            message = _("Vote for a weather change on server {}").format(server.name)
+            message = _("Vote for a weather change on server {}").format(_server.name)
             element = 'preset'
         else:
             # noinspection PyUnresolvedReferences
@@ -108,7 +109,7 @@ async def create(self, interaction: discord.Interaction,
 
         class_name = f"plugins.voting.options.{element}.{element.title()}"
         item: VotableItem = utils.str_to_class(class_name)(
-            server, config['options'].get(element)
+            _server, config['options'].get(element)
         )
         choices = await item.get_choices()
         if len(choices) > 2:
@@ -130,8 +131,8 @@ async def create(self, interaction: discord.Interaction,
         if not item.can_vote():
             await interaction.followup.send(_('This option is not available at the moment.'), ephemeral=True)
 
-        handler = VotingHandler(listener=self.eventlistener, item=item, server=server, config=config)
-        self.eventlistener._all_votes[server.name] = handler
+        handler = VotingHandler(listener=self.eventlistener, item=item, server=_server, config=config)
+        self.eventlistener._all_votes[_server.name] = handler
         handler.votes[vote] = 1
 
         await interaction.followup.send(_('{} created. It is open for {}').format(

services/bot/schemas/bot_schema.yaml

@@ -15,7 +15,7 @@ mapping:
       online: {type: text, nullable: false}
   no_dcs_autoban: {type: bool, nullable: false}
   message_ban: {type: str, nullable: false, range: {min: 1}}
-  message_autodelete: {type: int, range: {min: 0}, nullable: false}
+  message_autodelete: {type: int, range: {min: 1}, nullable: false}
   channels:
     type: map
     nullable: false