BUGFIX:

- RestAPI: /player_info - modulestats only returned modules where kills > 1

Author: karel26

core/utils/os.py

@@ -24,6 +24,26 @@
 
     from pywinauto.win32defines import SEE_MASK_NOCLOSEPROCESS, SW_HIDE, SW_SHOWMINNOACTIVE
 
+    class SHELLEXECUTEINFO(ctypes.Structure):
+        _fields_ = [
+            ("cbSize", ctypes.c_ulong),
+            ("fMask", ctypes.c_ulong),
+            ("hwnd", ctypes.c_void_p),
+            ("lpVerb", ctypes.c_wchar_p),
+            ("lpFile", ctypes.c_wchar_p),
+            ("lpParameters", ctypes.c_wchar_p),
+            ("lpDirectory", ctypes.c_wchar_p),
+            ("nShow", ctypes.c_int),
+            ("hInstApp", ctypes.c_void_p),
+            ("lpIDList", ctypes.c_void_p),
+            ("lpClass", ctypes.c_wchar_p),
+            ("hkeyClass", ctypes.c_void_p),
+            ("dwHotKey", ctypes.c_ulong),
+            ("hIcon", ctypes.c_void_p),
+            ("hProcess", ctypes.c_void_p),
+        ]
+
+
 __all__ = [
     "find_process",
     "find_process_async",
@@ -313,27 +333,6 @@ def shouldRollover(self, record):
         return 0
 
 
-if sys.platform == 'win32':
-    class SHELLEXECUTEINFO(ctypes.Structure):
-        _fields_ = [
-            ("cbSize", ctypes.c_ulong),
-            ("fMask", ctypes.c_ulong),
-            ("hwnd", ctypes.c_void_p),
-            ("lpVerb", ctypes.c_wchar_p),
-            ("lpFile", ctypes.c_wchar_p),
-            ("lpParameters", ctypes.c_wchar_p),
-            ("lpDirectory", ctypes.c_wchar_p),
-            ("nShow", ctypes.c_int),
-            ("hInstApp", ctypes.c_void_p),
-            ("lpIDList", ctypes.c_void_p),
-            ("lpClass", ctypes.c_wchar_p),
-            ("hkeyClass", ctypes.c_void_p),
-            ("dwHotKey", ctypes.c_ulong),
-            ("hIcon", ctypes.c_void_p),
-            ("hProcess", ctypes.c_void_p),
-        ]
-
-
 def run_elevated(exe_path, cwd, *args):
     """Start *exe_path* as Administrator and return the return code."""
     if sys.platform != 'win32':

plugins/restapi/commands.py

@@ -762,9 +762,9 @@ async def modulestats(self, nick: str = Form(...), date: str | None = Form(None)
                    CASE WHEN SUM(s.deaths_planes + s.deaths_helicopters + s.deaths_ships + s.deaths_sams + s.deaths_ground) = 0 
                         THEN SUM(s.kills) ELSE SUM(s.kills)::DECIMAL / SUM((s.deaths_planes + s.deaths_helicopters + s.deaths_ships + s.deaths_sams + s.deaths_ground)::DECIMAL) END AS "kdr" 
             FROM mv_statistics s
-            WHERE player_ucid = %(ucid)s 
+            WHERE s.player_ucid = %(ucid)s 
             {where}
-            GROUP BY 1 HAVING SUM(kills) > 1 
+            GROUP BY 1 HAVING SUM(s.kills) > 0 
             ORDER BY 2 DESC
         """
         async with self.apool.connection() as conn: