From f687af3d6a38c532b63a29746c97696e456a94f0 Mon Sep 17 00:00:00 2001 From: gsd Date: Sat, 11 Mar 2023 11:07:04 +0300 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20-=D0=B8=D0=BF?= =?UTF-8?q?=20=D0=B2=20=D0=B1=D0=B4=20=D0=B4=D0=B0=D0=B2=D0=B0=D0=BB=D1=81?= =?UTF-8?q?=D1=8F=20=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=B5=20=D1=81=20=D0=BF?= =?UTF-8?q?=D0=BE=D1=80=D1=82=D0=BE=D0=BC,=20=D1=87=D1=82=D0=BE=20=D0=BD?= =?UTF-8?q?=D0=B5=20=D0=B4=D0=B0=D0=B2=D0=B0=D0=BB=D0=BE=20=D0=B2=20=D0=B1?= =?UTF-8?q?=D0=B4=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D1=8C=20=D1=81=D0=B4?= =?UTF-8?q?=D0=B5=D0=BB=D0=B0=D1=82=D1=8C=20-=D0=B7=D0=B0=D1=87=D0=B5?= =?UTF-8?q?=D0=BC=D1=82=D0=BE=20=D1=8F=20=D0=BA=D0=B0=D1=81=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BB=20=D0=BB=D0=BE=D0=BD=D0=B3=20=D0=B2=20=D1=81?= =?UTF-8?q?=D1=82=D1=80=D0=B8=D0=BD=D0=B3=20=D0=BF=D0=BE=D1=82=D0=BE=D0=BC?= =?UTF-8?q?=20=D0=BE=D0=BF=D1=8F=D1=82=D1=8C=20=D0=B2=20=D0=BB=D0=BE=D0=BD?= =?UTF-8?q?=D0=B3,=20=D0=B4=D1=8F=D0=B4=D1=8F=20=D1=82=D1=8B=20=D1=82?= =?UTF-8?q?=D1=83=D0=BF=D0=BE=D0=B9=3F=3F=20-=D0=B5=D1=89=D0=B5=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=B1=D1=8B=D0=BB=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE?= =?UTF-8?q?=D1=81=20=D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B8=20=D1=81=D0=B4?= =?UTF-8?q?=D0=B5=D0=BB=D0=B0=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/entities/a2s/external/ExternalValveClient.java | 2 +- src/main/java/app/entities/server/PlayOn.java | 8 ++++++++ src/main/java/app/services/db/FreeVIPService.java | 6 +++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/app/entities/a2s/external/ExternalValveClient.java b/src/main/java/app/entities/a2s/external/ExternalValveClient.java index 4c0cdad..25acbae 100644 --- a/src/main/java/app/entities/a2s/external/ExternalValveClient.java +++ b/src/main/java/app/entities/a2s/external/ExternalValveClient.java @@ -62,7 +62,7 @@ public abstract class ExternalValveClient { try { return new ArrayList<>(Arrays.asList(restTemplate.postForEntity("%s/api/players".formatted(gateway), request, RCONPlayer[].class).getBody())); } catch (Exception err) { - System.out.printf("Cannot get rcon players from %s", request.getServer()); + System.out.printf("Cannot get rcon players from %s\n", request.getServer()); return new ArrayList<>(); } } diff --git a/src/main/java/app/entities/server/PlayOn.java b/src/main/java/app/entities/server/PlayOn.java index 8900dd1..d9d8ba9 100644 --- a/src/main/java/app/entities/server/PlayOn.java +++ b/src/main/java/app/entities/server/PlayOn.java @@ -10,4 +10,12 @@ public class PlayOn { int player_id; String ip; String name; + + public String getIp() { + if (ip.contains(":")){ + return ip.split(":",1)[0]; + } else { + return ip; + } + } } diff --git a/src/main/java/app/services/db/FreeVIPService.java b/src/main/java/app/services/db/FreeVIPService.java index d0a2457..3407e01 100644 --- a/src/main/java/app/services/db/FreeVIPService.java +++ b/src/main/java/app/services/db/FreeVIPService.java @@ -52,7 +52,7 @@ public class FreeVIPService{ public Long getLastGivedFreeVIP(SteamID steamID) { return (Long) entityManager.createNativeQuery("SELECT UNIX_TIMESTAMP(`date`) as u_time FROM free_vip WHERE steam3 LIKE ?1 ORDER BY `date` DESC") .setParameter(1, steamID.steam3) - .getResultStream().map(u_time -> Long.valueOf((String) u_time)).findFirst().orElse(0L); + .getResultStream().findFirst().orElse(0L); } public Long getLastGivedFreeVIP(SocialAuth socialAuth) { @@ -62,11 +62,11 @@ public class FreeVIPService{ else if (socialAuth.getVk_id() != 0) { return (Long) entityManager.createNativeQuery("SELECT UNIX_TIMESTAMP(`date`) as u_time FROM free_vip WHERE vk_id = ?1 ORDER BY `date` DESC") .setParameter(1, socialAuth.getVk_id()) - .getResultStream().map(u_time -> Long.valueOf((String) u_time)).findFirst().orElse(0L); + .getResultStream().findFirst().orElse(0L); } else if (socialAuth.getDiscord_id() != 0) { return (Long) entityManager.createNativeQuery("SELECT UNIX_TIMESTAMP(`date`) as u_time FROM free_vip WHERE discord_id = ?1 ORDER BY `date` DESC") .setParameter(1, socialAuth.getDiscord_id()) - .getResultStream().map(u_time -> Long.valueOf((String) u_time)).findFirst().orElse(0L); + .getResultStream().findFirst().orElse(0L); } else { return 0L; }