CHANGES:

- Mission: you can now define a channel different from the admin channel to upload missions into.

Author: karel26

core/utils/discord.py

@@ -1594,13 +1594,16 @@ def __init__(self, server: Server, message: discord.Message, pattern: list[str])
         self.server = server
 
     @staticmethod
-    async def get_server(message: discord.Message) -> Optional[Server]:
+    async def get_server(message: discord.Message, channel_id: Optional[int] = None) -> Optional[Server]:
         from services.bot import BotService
         from services.servicebus import ServiceBus
 
         bot = ServiceRegistry.get(BotService).bot
         server = bot.get_server(message, admin_only=True)
-        if not server and message.channel.id == bot.locals.get('channels', {}).get('admin'):
+        if not channel_id:
+            channel_id = bot.locals.get('channels', {}).get('admin')
+
+        if not server and message.channel.id == channel_id:
             bus = ServiceRegistry.get(ServiceBus)
             ctx = await bot.get_context(message)
             server = await utils.server_selection(bus, ctx, title=_("To which server do you want to upload?"))

plugins/mission/README.md

@@ -81,10 +81,11 @@ DEFAULT:
     - pilot_death
     - shot
     - hit
-  uploads:              # Configure how mission uploads are handled
-    enabled: true       # Here you can disable the feature at all (default: true = enabled)
+  uploads:                      # Configure how mission uploads are handled
+    enabled: true               # Here you can disable the feature at all (default: true = enabled)
+    channel: 112233445566778899 # Optional: mission upload channel (default: admin channel)
     discord:
-      - DCS Admin       # Define which roles are allowed to upload missions (default: DCS Admin)
+      - DCS Admin               # Define which roles are allowed to upload missions (default: DCS Admin)
 ```
 
 ## Auto-Scanning

plugins/mission/commands.py

@@ -2091,7 +2091,39 @@ async def on_message(self, message: discord.Message):
             return
 
         # check if we are in the correct channel
-        server = await MissionUploadHandler.get_server(message)
+        server = None
+        for node_name, node in self.locals.items():
+            if node_name == 'commands':
+                continue
+            if node_name == DEFAULT_TAG:
+                channel = node.get('uploads', {}).get('channel')
+                if channel:
+                    if message.channel.id == channel:
+                        server = await MissionUploadHandler.get_server(message, channel)
+                    break
+            elif 'uploads' in node:
+                channel = node.get('uploads', {}).get('channel')
+                if message.channel.id == channel:
+                    server = next((
+                        server for server in self.bus.servers.values()
+                        if server.instance.name == node_name
+                    ), None)
+                    break
+            else:
+                for instance_name, instance in node.items():
+                    channel = instance.get('uploads', {}).get('channel')
+                    if message.channel.id == channel:
+                        server = next((
+                            server for server in self.bus.servers.values()
+                            if server.instance.name == instance_name
+                        ), None)
+                        break
+                else:
+                    continue
+                break
+        else:
+            server = await MissionUploadHandler.get_server(message)
+
         if not server:
             return
 

plugins/mission/schemas/mission_schema.yaml

@@ -1,4 +1,12 @@
-schema;default_schema:
+schema;instance_schema:
+  type: map
+  func: is_node
+  nullable: false
+  mapping:
+    regex;(.+):
+      include: 'element_schema'
+
+schema;element_schema:
   type: map
   nullable: false
   mapping:
@@ -12,6 +20,7 @@ schema;default_schema:
       nullable: false
       mapping:
         enabled: {type: bool, nullable: false}
+        channel: {type: int, nullable: false}
         discord:
           type: seq
           sequence:
@@ -23,8 +32,13 @@ func: check_main_structure
 nullable: false
 mapping:
   DEFAULT:
-    include: 'default_schema'
+    include: 'element_schema'
   commands:
     include: 'commands_schema'
   chat_commands:
     include: 'chat_commands_schema'
+  regex;(.+):
+    type: any
+    func: any_of
+    nullable: false
+    enum: ['element_schema', 'instance_schema']