CHANGES:

- SRS can be launched with the old GUI server again (use: gui_server: true in your nodes.yaml)
- Proper error message if your bot was not invited to any discord yet.

Author: karel26

extensions/srs/README.md

@@ -32,7 +32,8 @@ MyNode:
           config: '{instance.home}\Config\SRS.cfg'
           host: 127.0.0.1
           port: 5002
-          minimized: true     # start SRS minimized (default: true)
+          gui_server: true    # Optional: use the SRS-Server.exe (GUI server) instead of the command line one
+          minimized: true     # Old SR-Server.exe: start SRS minimized (default: true)
           autoconnect: true   # install the appropriate DCS-SRS-AutoConnectGameGUI.lua, default: true
           awacs: true         # if you use LotAtc
           lotatc_export_port: 10712

extensions/srs/extension.py

@@ -402,10 +402,13 @@ def get_inst_path(self) -> str:
 
     def get_exe_path(self) -> str:
         if parse(self.version) >= parse('2.2.0.0'):
-            os_dir = 'ServerCommandLine-Windows' if sys.platform == 'win32' else 'ServerCommandLine-Linux'
-            self.exe_name = 'SRS-Server-Commandline.exe' if sys.platform == 'win32' else 'SRS-Server-Commandline'
-            return os.path.join(self.get_inst_path(), os_dir, self.exe_name)
-            #return os.path.join(self.get_inst_path(), 'Server', 'SRS-Server.exe')
+            if self.config.get('gui_server', False):
+                self.exe_name = 'SRS-Server.exe'
+                return os.path.join(self.get_inst_path(), 'Server', self.exe_name)
+            else:
+                os_dir = 'ServerCommandLine-Windows' if sys.platform == 'win32' else 'ServerCommandLine-Linux'
+                self.exe_name = 'SRS-Server-Commandline.exe' if sys.platform == 'win32' else 'SRS-Server-Commandline'
+                return os.path.join(self.get_inst_path(), os_dir, self.exe_name)
         else:
             self.exe_name = 'SR-Server.exe'
             return os.path.join(self.get_inst_path(), self.exe_name)

extensions/srs/schemas/srs_schema.yaml

@@ -29,6 +29,7 @@ schema;instance_srs_schema:
     config: {type: str, required: true, nullable: false}
     host: {type: str, nullable: false, range: {min: 1}}
     port: {type: int, nullable: false, func: unique_port}
+    gui_server: {type: bool, nullable: false}
     minimized: {type: bool, nullable: false}
     debug: {type: bool, nullable: false}
     awacs: {type: bool, nullable: false}

services/bot/dcsserverbot.py

@@ -196,6 +196,9 @@ async def register_guild_name():
 
         try:
             await self.wait_until_ready()
+            if not self.guilds:
+                self.log.error("You need to invite your bot to a Discord server!")
+                raise FatalException()
             asyncio.create_task(register_guild_name())
             if not self.synced:
                 self.log.info(f'- Preparing Discord Bot "{self.user.name}" ...')