From 234a29e7e549e3b1716368ef6622214fc7a1b093 Mon Sep 17 00:00:00 2001
From: gsd <mamu@ebal.net>
Date: Sat, 28 Oct 2023 21:03:19 +0300
Subject: [PATCH] country playon

---
 src/main/java/app/entities/server/PlayOn.java | 1 +
 src/main/java/app/services/StatsService.java  | 8 ++++++--
 src/main/java/app/services/io/GeoIP.java      | 8 ++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/app/entities/server/PlayOn.java b/src/main/java/app/entities/server/PlayOn.java
index d1926f1..1b275de 100644
--- a/src/main/java/app/entities/server/PlayOn.java
+++ b/src/main/java/app/entities/server/PlayOn.java
@@ -11,6 +11,7 @@ public class PlayOn {
     int player_id;
     String ip;
     String name;
+    String country;
 
     public String getIp() {
         if (ip.contains(":")){
diff --git a/src/main/java/app/services/StatsService.java b/src/main/java/app/services/StatsService.java
index 0ec3b71..342346f 100644
--- a/src/main/java/app/services/StatsService.java
+++ b/src/main/java/app/services/StatsService.java
@@ -5,6 +5,7 @@ import app.entities.other.SteamID;
 import app.entities.server.PlayOn;
 import app.entities.server.Server;
 import app.entities.server.players.RCONPlayer;
+import app.services.io.GeoIP;
 import app.utils.CryptedCookie;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
@@ -17,11 +18,13 @@ public class StatsService {
     Stats stats;
 
     private CryptedCookie cryptedCookie;
+    private GeoIP geoIP;
 
     @Autowired
-    public StatsService (Stats stats, CryptedCookie cryptedCookie) {
+    public StatsService (Stats stats, CryptedCookie cryptedCookie, GeoIP geoIP) {
         this.stats = stats;
         this.cryptedCookie = cryptedCookie;
+        this.geoIP = geoIP;
     }
 
     public PlayOn searchPlayer(SteamID steamID){
@@ -31,7 +34,8 @@ public class StatsService {
                     stringServerEntry.getKey(),
                     player.getId(),
                     cryptedCookie.Hashed(player.getIp()),
-                    player.getName());
+                    player.getName(),
+                    geoIP.GetCountry(player.getIp().split(":", 2)[0], "Unknown"));
         }
         return null;
     }
diff --git a/src/main/java/app/services/io/GeoIP.java b/src/main/java/app/services/io/GeoIP.java
index c5a8bbc..9d27fd0 100644
--- a/src/main/java/app/services/io/GeoIP.java
+++ b/src/main/java/app/services/io/GeoIP.java
@@ -24,4 +24,12 @@ public class GeoIP {
     public String GetCountry(String ip) throws UnknownHostException, GeoIp2Exception, IOException {
         return databaseReader.country(InetAddress.getByName(ip)).getCountry().getName();
     }
+
+    public String GetCountry(String ip, String replace) {
+        try {
+            return this.GetCountry(ip);
+        } catch (GeoIp2Exception | IOException e) {
+            return replace;
+        }
+    }
 }