CHANGES:

- Warehouse information can be exported and imported via Excel now.
- Refactoring of autocompletion calls.

Author: karel26

Scripts/net/DCSServerBot/DCSServerBotUtils.lua

@@ -57,6 +57,9 @@ end
 
 function saveSettings(settings)
     mergedSettings = mergeGuiSettings(settings)
+    if mergedSettings.name ~= server_name then
+        server_name = mergedSettings.name
+    end
     U.saveInFile(mergedSettings, "cfg", lfs.writedir() .. "Config/serverSettings.lua")
     return true
 end

core/const.py

@@ -10,6 +10,7 @@
     "MMHG_IN_HPA",
     "QFE_TO_QNH_INHG",
     "QFE_TO_QNH_MB",
+    "MAX_SAFE_INTEGER",
     "WEEKDAYS",
     "MONTH",
     "TRAFFIC_LIGHTS",
@@ -24,7 +25,7 @@
 MMHG_IN_HPA = 1.333224
 QFE_TO_QNH_INHG = 0.00107777777777778
 QFE_TO_QNH_MB = 0.03662667
-
+MAX_SAFE_INTEGER = 9007199254740991 # Lua 5.1 max integer representation, 2^253 - 1
 
 WEEKDAYS = {
     0: 'Mon',

core/data/impl/serverimpl.py

@@ -20,6 +20,7 @@
 from contextlib import suppress
 from copy import deepcopy
 from core import utils, Server
+from core.const import MAX_SAFE_INTEGER
 from core.data.dataobject import DataObjectFactory
 from core.data.const import Status, Channel, Coalition
 from core.extension import Extension, InstallException, UninstallException
@@ -399,7 +400,7 @@ def _serialize_value(value: Any) -> Any:
             if isinstance(value, bool):
                 return value
             elif isinstance(value, int):
-                return str(value)
+                return value if value < MAX_SAFE_INTEGER else str(value)
             elif isinstance(value, Enum):
                 return value.value
             elif isinstance(value, dict):

core/utils/discord.py

@@ -21,6 +21,7 @@
 from packaging.version import parse, Version
 from psycopg.rows import dict_row
 from typing import cast, TYPE_CHECKING, Iterable, Any, Callable
+from typing_extensions import deprecated
 
 from .helper import get_all_players, is_ucid, format_string, cache_with_expiration
 
@@ -57,7 +58,6 @@
     "print_ruler",
     "match",
     "find_similar_names",
-    "get_interaction_param",
     "get_all_linked_members",
     "NodeTransformer",
     "InstanceTransformer",
@@ -406,6 +406,7 @@ def check_roles(roles: Iterable[str | int], member: discord.Member | None = None
     return False
 
 
+@deprecated("Use app_has_role instead")
 def has_role(role: str):
     """
     Decorator for non-application commands to check if the user has a specific role.
@@ -440,6 +441,7 @@ def predicate(interaction: Interaction) -> bool:
     return app_commands.check(predicate)
 
 
+@deprecated("Use app_has_roles instead")
 def has_roles(roles: list[str]):
     """
     Decorator for non-application commands to check if the user has one of the provided roles.
@@ -493,9 +495,11 @@ def is_restricted(interaction: discord.Interaction) -> bool:
         return True
     return False
 
+
 def restricted_check(interaction: discord.Interaction) -> bool:
     return not is_restricted(interaction)
 
+
 def get_role_ids(plugin: Plugin, role_names) -> list[int]:
     role_ids = []
     if not isinstance(role_names, list):
@@ -884,29 +888,6 @@ def find_similar_names(list1: list[str], list2: list[str], threshold: int = 90)
     return similar_names
 
 
-def get_interaction_param(interaction: discord.Interaction, name: str) -> Any | None:
-    """
-    Returns the value of a specific parameter in a Discord interaction.
-
-    :param interaction: The Discord interaction object.
-    :param name: The name of the parameter to retrieve.
-    :return: The value of the parameter, or None if not found.
-    """
-    def inner(root: dict | list) -> Any | None:
-        if isinstance(root, dict):
-            if root.get('name') == name:
-                return root.get('value')
-        elif isinstance(root, list):
-            for param in root:
-                if 'options' in param:
-                    return inner(param['options'])
-                if param['name'] == name:
-                    return param['value']
-        return None
-
-    return inner(interaction.data.get('options', {}))
-
-
 def get_all_linked_members(interaction: discord.Interaction) -> list[discord.Member]:
     """
     :param interaction: the discord Interaction
@@ -1048,7 +1029,7 @@ def __init__(self, *, unused: bool = False):
 
     async def transform(self, interaction: discord.Interaction, value: str | None) -> Instance | None:
         if value:
-            node: Node = await NodeTransformer().transform(interaction, get_interaction_param(interaction, 'node'))
+            node: Node = await NodeTransformer().transform(interaction, interaction.namespace.node)
             if not node:
                 return None
             return node.instances.get(value)
@@ -1061,7 +1042,7 @@ async def autocomplete(self, interaction: discord.Interaction, current: str) ->
         if not await interaction.command._check_can_run(interaction):
             return []
         try:
-            node: Node = await NodeTransformer().transform(interaction, get_interaction_param(interaction, 'node'))
+            node: Node = await NodeTransformer().transform(interaction, interaction.namespace.node)
             if not node:
                 return []
             if self.unused:
@@ -1088,7 +1069,7 @@ async def airbase_autocomplete(interaction: discord.Interaction, current: str) -
     if not await interaction.command._check_can_run(interaction):
         return []
     try:
-        server: Server = await ServerTransformer().transform(interaction, get_interaction_param(interaction, 'server'))
+        server: Server = await ServerTransformer().transform(interaction, interaction.namespace.server)
         if not server or not server.current_mission:
             return []
         choices: list[app_commands.Choice[int]] = [
@@ -1143,8 +1124,7 @@ async def group_autocomplete(interaction: discord.Interaction, current: str) ->
     # is a user is not allowed to run the interaction, they are not allowed to see the autocompletions also
     if not await interaction.command._check_can_run(interaction):
         return []
-    server: Server = await ServerTransformer().transform(interaction,
-                                                         get_interaction_param(interaction, 'server'))
+    server: Server = await ServerTransformer().transform(interaction, interaction.namespace.server)
     return [
         app_commands.Choice(name=group_name, value=group_name)
         for group_name in set(player.group_name for player in server.get_active_players() if player.group_id != 0)
@@ -1227,16 +1207,15 @@ def __init__(self, *, active: bool | None = None, watchlist: bool | None = None,
         self.vip = vip
 
     async def transform(self, interaction: discord.Interaction, value: str) -> Player:
-        server: Server = await ServerTransformer().transform(interaction, get_interaction_param(interaction, 'server'))
+        server: Server = await ServerTransformer().transform(interaction, interaction.namespace.server)
         return server.get_player(ucid=value, active=self.active)
 
     async def autocomplete(self, interaction: Interaction, current: str) -> list[app_commands.Choice[str]]:
         if not await interaction.command._check_can_run(interaction):
             return []
         try:
             if self.active:
-                server: Server = await ServerTransformer().transform(interaction,
-                                                                     get_interaction_param(interaction, 'server'))
+                server: Server = await ServerTransformer().transform(interaction, interaction.namespace.server)
                 if not server:
                     return []
                 choices: list[app_commands.Choice[str]] = [

core/utils/squadrons.py

@@ -4,7 +4,7 @@
 from discord import app_commands
 from psycopg.rows import dict_row
 
-from .discord import get_interaction_param, check_roles
+from .discord import check_roles
 
 _all_ = [
     'squadron_autocomplete',
@@ -65,7 +65,7 @@ async def squadron_users_autocomplete(interaction: discord.Interaction, current:
     if not await interaction.command._check_can_run(interaction):
         return []
     try:
-        squadron_id = get_interaction_param(interaction, 'squadron')
+        squadron_id = interaction.namespace.squadron
         if not squadron_id:
             return []
         async with interaction.client.apool.connection() as conn:
@@ -94,7 +94,7 @@ def get_squadron_admins(node: Node, squadron_id: int) -> list[int]:
 
 def squadron_role_check():
     def predicate(interaction: discord.Interaction) -> bool:
-        squadron_id = get_interaction_param(interaction, 'squadron')
+        squadron_id = interaction.namespace.squadron
         if isinstance(squadron_id, int):
             admins = get_squadron_admins(interaction.client.node, squadron_id)
             if interaction.user.id in admins:

plugins/admin/commands.py

@@ -46,7 +46,7 @@ async def available_modules_autocomplete(interaction: discord.Interaction,
     if not await interaction.command._check_can_run(interaction):
         return []
     try:
-        node = await utils.NodeTransformer().transform(interaction, utils.get_interaction_param(interaction, "node"))
+        node = await utils.NodeTransformer().transform(interaction, interaction.namespace.node)
         available_modules = (set(await node.get_available_modules()) -
                              set(await node.get_installed_modules()))
         return [
@@ -64,7 +64,7 @@ async def installed_modules_autocomplete(interaction: discord.Interaction,
     if not await interaction.command._check_can_run(interaction):
         return []
     try:
-        node = await utils.NodeTransformer().transform(interaction, utils.get_interaction_param(interaction, "node"))
+        node = await utils.NodeTransformer().transform(interaction, interaction.namespace.node)
         available_modules = await node.get_installed_modules()
         choices: list[app_commands.Choice[str]] = [
             app_commands.Choice(name=x, value=x)
@@ -81,8 +81,7 @@ async def label_autocomplete(interaction: discord.Interaction, current: str) ->
     if not await interaction.command._check_can_run(interaction):
         return []
     try:
-        server: Server = await utils.ServerTransformer().transform(
-            interaction, utils.get_interaction_param(interaction, 'server'))
+        server: Server = await utils.ServerTransformer().transform(interaction, interaction.namespace.server)
         if not server:
             return []
         config = interaction.client.cogs['Admin'].get_config(server)
@@ -102,8 +101,7 @@ async def label_autocomplete(interaction: discord.Interaction, current: str) ->
 
 async def _mission_file_autocomplete(interaction: discord.Interaction, current: str) -> list[app_commands.Choice[str]]:
     try:
-        server: Server = await utils.ServerTransformer().transform(
-            interaction, utils.get_interaction_param(interaction, 'server'))
+        server: Server = await utils.ServerTransformer().transform(interaction, interaction.namespace.server)
         file_list = await server.getAllMissionFiles()
         exp_base = await server.get_missions_dir()
         choices: list[app_commands.Choice[str]] = [
@@ -121,11 +119,10 @@ async def file_autocomplete(interaction: discord.Interaction, current: str) -> l
     if not await interaction.command._check_can_run(interaction):
         return []
     try:
-        server: Server = await utils.ServerTransformer().transform(
-            interaction, utils.get_interaction_param(interaction, 'server'))
+        server: Server = await utils.ServerTransformer().transform(interaction, interaction.namespace.server)
         if not server:
             return []
-        label = utils.get_interaction_param(interaction, "what")
+        label = interaction.namespace.what
         # missions will be handled differently
         if label == 'Missions':
             return await _mission_file_autocomplete(interaction, current)
@@ -211,9 +208,9 @@ async def get_dcs_branches(interaction: discord.Interaction, current: str) -> li
 async def get_dcs_versions(interaction: discord.Interaction, current: str) -> list[app_commands.Choice[str]]:
     if not await interaction.command._check_can_run(interaction):
         return []
-    branch = utils.get_interaction_param(interaction, 'branch')
+    branch = interaction.namespace.branch
     if not branch:
-        node = await NodeTransformer().transform(interaction, utils.get_interaction_param(interaction, 'node'))
+        node = await NodeTransformer().transform(interaction, interaction.namespace.node)
         branch, _ = await node.get_dcs_branch_and_version()
     versions = await interaction.client.node.get_available_dcs_versions(branch)
     return [
@@ -240,8 +237,7 @@ async def all_servers_autocomplete(interaction: discord.Interaction, current: st
 async def extensions_autocomplete(interaction: discord.Interaction, current: str) -> list[app_commands.Choice[str]]:
     if not await interaction.command._check_can_run(interaction):
         return []
-    server: Server = await utils.ServerTransformer().transform(
-        interaction, utils.get_interaction_param(interaction, 'server'))
+    server: Server = await utils.ServerTransformer().transform(interaction, interaction.namespace.server)
     extensions = await server.list_extension()
     current = current.casefold()
     choices: list[app_commands.Choice[str]] = [

plugins/backup/commands.py

@@ -48,7 +48,7 @@ async def get_all_dates(node: Node, target: str) -> list[str]:
     if not await interaction.command._check_can_run(interaction):
         return []
     target = interaction.client.cogs['Backup'].locals.get('target')
-    node = await utils.NodeTransformer().transform(interaction, utils.get_interaction_param(interaction, "node"))
+    node = await utils.NodeTransformer().transform(interaction, interaction.namespace.node)
     return [
         app_commands.Choice(name=date, value=date) for date in await get_all_dates(node, target)
         if not current or current in date

plugins/gamemaster/commands.py

@@ -23,8 +23,7 @@ async def scriptfile_autocomplete(interaction: discord.Interaction, current: str
     if not await interaction.command._check_can_run(interaction):
         return []
     try:
-        server: Server = await utils.ServerTransformer().transform(interaction,
-                                                                   utils.get_interaction_param(interaction, 'server'))
+        server: Server = await utils.ServerTransformer().transform(interaction, interaction.namespace.server)
         if not server:
             return []
         base_dir = os.path.join(await server.get_missions_dir(), 'Scripts')
@@ -65,7 +64,7 @@ async def campaign_servers_autocomplete(interaction: discord.Interaction, curren
     if not await interaction.command._check_can_run(interaction):
         return []
     try:
-        campaign_name = utils.get_interaction_param(interaction, 'campaign')
+        campaign_name = interaction.namespace.campaign
         async with interaction.client.apool.connection() as conn:
             cursor = await conn.execute("""
                 SELECT DISTINCT server_name FROM campaigns_servers

plugins/lotatc/commands.py

@@ -22,11 +22,10 @@ async def gci_autocomplete(interaction: discord.Interaction, current: str) -> li
     if not await interaction.command._check_can_run(interaction):
         return []
     try:
-        server: Server = await utils.ServerTransformer().transform(interaction,
-                                                                   utils.get_interaction_param(interaction, 'server'))
+        server: Server = await utils.ServerTransformer().transform(interaction, interaction.namespace.server)
         if not server:
             return []
-        coalition: str = utils.get_interaction_param(interaction, 'coalition')
+        coalition: str = interaction.namespace.coalition
         listener = interaction.client.cogs['LotAtc'].eventlistener
         choices: list[app_commands.Choice[str]] = [
             app_commands.Choice(name=x, value=x)