bonus done

Author: tslashd

surftimer/ck_bonus.py

@@ -800,9 +800,7 @@ def selectPersonalBonusStylesRecords(
         )
     )
 
-    if xquery:
-        xquery = xquery.pop()
-    else:
+    if len(xquery) <= 0:
         response.status_code = status.HTTP_204_NO_CONTENT
         return response
 
@@ -887,11 +885,18 @@ def getRankSteamIdBonus(
         response.body = json.loads(cached_data, use_decimal=True, parse_nan=True)
         return response
 
-    xquery = selectQuery(
-        surftimer.queries.sql_stray_getRankSteamIdBonus.format(
-            mapname, zonegroup, limit
+    if zonegroup == 0:
+        xquery = selectQuery(
+            surftimer.queries.sql_stray_steamIdFromMapRank.format(
+                mapname, limit
+            )
+        )
+    else:
+        xquery = selectQuery(
+            surftimer.queries.sql_stray_getRankSteamIdBonus.format(
+                mapname, zonegroup, limit
+            )
         )
-    )
 
     if xquery:
         xquery = xquery.pop()

surftimer/queries.py

@@ -113,8 +113,9 @@
 sql_selectAllMapTimesinMap = (
     "SELECT runtimepro from ck_playertimes WHERE mapname = '{}';"
 )
-
+sql_stray_steamIdFromMapRank = "SELECT steamid FROM ck_playertimes WHERE mapname = '{}' AND style = 0 AND runtimepro > -1.0 ORDER BY runtimepro ASC LIMIT {}, 1;"
 sql_selectMapRankUnknownWithMap = "SELECT `steamid`, `name`, `mapname`, `runtimepro` FROM `ck_playertimes` WHERE `mapname` = '{}' AND style = 0 ORDER BY `runtimepro` ASC LIMIT {}, 1;"
+
 ## ck_spawnlocations
 sql_createSpawnLocations = "CREATE TABLE IF NOT EXISTS ck_spawnlocations (mapname VARCHAR(54) NOT NULL, pos_x FLOAT NOT NULL, pos_y FLOAT NOT NULL, pos_z FLOAT NOT NULL, ang_x FLOAT NOT NULL, ang_y FLOAT NOT NULL, ang_z FLOAT NOT NULL,  `vel_x` float NOT NULL DEFAULT '0', `vel_y` float NOT NULL DEFAULT '0', `vel_z` float NOT NULL DEFAULT '0', zonegroup INT(12) DEFAULT 0, stage INT(12) DEFAULT 0, teleside INT(11) DEFAULT 0, PRIMARY KEY(mapname, zonegroup, stage, teleside)) DEFAULT CHARSET=utf8mb4;"
 sql_insertSpawnLocations = "INSERT INTO ck_spawnlocations (mapname, pos_x, pos_y, pos_z, ang_x, ang_y, ang_z, vel_x, vel_y, vel_z, zonegroup, teleside) VALUES ('{}', '{}', '{}', '{}', '{}', '{}', '{}', '{}', '{}', '{}', {}, {});"