кайф

src/main/java/app/services/ProfileService.java

@@ -10,6 +10,7 @@ import app.services.db.PermitionService;
 import app.services.db.UsertimeService;
 import app.services.steam.SteamWebApi;
 import app.utils.SteamIDConverter;
+import app.utils.SteamInviteConverter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -138,6 +139,12 @@ public class ProfileService {
             if(ban != null) result = SteamIDConverter.getSteamID(ban.getSteam_id());
             if (result != null) return result;
         }
+        //Проверить что это инвайт в друзья
+        result = SteamInviteConverter.getSteamID(any);
+        if (result != null) return result;
+        //Проверить что возможно это ссылка на стим профиль с именем
+        result = steamWebApi.getSteamID(any);
+        if (result != null) return result;
         //Проверить что возможно это стим ид в любой интрапретации
         result = SteamIDConverter.getSteamID(any);
         if (result != null) return result;

src/main/java/app/services/steam/SteamWebApi.java

@@ -1,6 +1,9 @@
 package app.services.steam;
 
+import app.entities.other.SteamID;
 import app.entities.steam.SteamData;
+import app.utils.SteamIDConverter;
+import app.utils.SteamUrlConverter;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,4 +35,8 @@ public class SteamWebApi {
             return null;
         }
     }
+
+    public SteamID getSteamID(String community_url) {
+        return SteamUrlConverter.getSteamID(community_url, restTemplate);
+    }
 }

src/main/java/app/utils/SteamInviteConverter.java

@@ -0,0 +1,39 @@
+package app.utils;
+
+import app.entities.other.SteamID;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+//https://github.com/Gobot1234/steam.py/blob/26c7c2056a552391bda8dc05f3d0c60f6f3c3f0d/steam/id.py#L134
+public class SteamInviteConverter {
+    private static final Pattern INVITE_REGEX = Pattern.compile("(?:(?:https?://)?(?:www\\.)?(?:s\\.team/p/))?(?<code>[\\-0123456789abcdefbcdfghjkmnpqrtvw]{1,8})");
+    private static final String _INVITE_HEX = "0123456789abcdef";
+    private static final String _INVITE_CUSTOM = "bcdfghjkmnpqrtvw";
+
+    public static SteamID getSteamID(String invite_url) {
+        if (!invite_url.startsWith("https://s.team/p/")){
+            return null;
+        }
+
+        Matcher result;
+
+        if(!(result = INVITE_REGEX.matcher(invite_url)).find()) {
+            return null;
+        }
+
+        String code = result.group("code").replace("-", "");
+        String maybe_steam32 = "";
+        int custom_index;
+
+        for(int i = 0; i < code.length(); i++) {
+            custom_index = _INVITE_CUSTOM.indexOf(code.charAt(i));
+            if (custom_index == -1) {
+                return null;
+            }
+            maybe_steam32 += _INVITE_HEX.charAt(custom_index);
+        }
+
+        return SteamIDConverter.getSteamID("[U:1:%s]".formatted(Integer.parseInt(maybe_steam32, 16)));
+    }
+}

src/main/java/app/utils/SteamUrlConverter.java

@@ -0,0 +1,40 @@
+package app.utils;
+
+import app.entities.other.SteamID;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+//https://github.com/Gobot1234/steam.py/blob/26c7c2056a552391bda8dc05f3d0c60f6f3c3f0d/steam/id.py#L168
+public class SteamUrlConverter {
+    private static final Pattern USER_ID64_FROM_URL_REGEX = Pattern.compile("g_rgProfileData\\s*=\\s*(?<json>\\{.*?});\\s*");
+    private static final Pattern URL_REGEX = Pattern.compile("(?:https?://)?(?:www\\.)?(?<url>steamcommunity\\.com/(?<type>id)/(?<value>.+))");
+
+    public static SteamID getSteamID(String community_url, RestTemplate restTemplate) {
+        Matcher result;
+        if (!(result = URL_REGEX.matcher(community_url)).find()) {
+            return null;
+        }
+
+        String steam_result = restTemplate.getForEntity("https://%s".formatted(result.group("url")), String.class).getBody();
+        Matcher steam_data;
+        if (!(steam_data = USER_ID64_FROM_URL_REGEX.matcher(steam_result)).find()) {
+            return null;
+        }
+        String json_result = steam_data.group("json");
+
+        int steam_id_start = json_result.indexOf("\"steamid\":");
+        if (steam_id_start == -1) {
+            return null;
+        } else {
+            steam_id_start += 11;
+        }
+        int steam_id_end = json_result.indexOf("\"", steam_id_start);
+        if (steam_id_end == -1) {
+            return null;
+        }
+
+        return SteamIDConverter.getSteamID(json_result.substring(steam_id_start,steam_id_end));
+    }
+}

src/test/java/app/steam/SteamINVITE2STAEMID64.java

@@ -0,0 +1,68 @@
+package app.steam;
+
+import app.entities.other.SteamID;
+import app.utils.SteamIDConverter;
+import app.utils.SteamInviteConverter;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class SteamINVITE2STAEMID64 {
+    // REGEX FROM: https://github.com/Gobot1234/steam.py/blob/26c7c2056a552391bda8dc05f3d0c60f6f3c3f0d/steam/id.py#L134
+    final Pattern INVITE_REGEX = Pattern.compile("(?:(?:https?://)?(?:www\\.)?(?:s\\.team/p/))?(?<code>[\\-0123456789abcdefbcdfghjkmnpqrtvw]{1,8})");
+    final String _INVITE_HEX = "0123456789abcdef";
+    final String _INVITE_CUSTOM = "bcdfghjkmnpqrtvw";
+
+    @Test
+    public void ValidURL() {
+        SteamID steamID = SteamInviteConverter.getSteamID("https://s.team/p/knj-wdjd/MNVPNhuy");
+        System.out.println(steamID);
+    }
+
+    @Test
+    public void InvalidURL() {
+        SteamID steamID = SteamInviteConverter.getSteamID("https://s.team/p/knj-ffzwgdjd/MNVPNhuy");
+        System.out.println(steamID);
+    }
+
+    @Test
+    public void InvalidDomainURL() {
+        SteamID steamID = SteamInviteConverter.getSteamID("https://s.teaadmssssss/p/knj-wdjd/MNVPNhuy");
+        System.out.println(steamID);
+    }
+
+
+    public SteamID get_id64(String example_url) {
+        Matcher result;
+
+        if (!example_url.startsWith("https://s.team/p/")){
+            throw new IllegalStateException();
+        }
+
+        if(!(result = INVITE_REGEX.matcher(example_url)).find()) {
+            System.out.println("No match found on: %s".formatted(example_url));
+            throw new IllegalStateException();
+        }
+        String code = result.group("code").replace("-", "");
+        System.out.println(code);
+
+        String maybe_steam32 = "";
+        int custom_index;
+
+        for(int i = 0; i < code.length(); i++) {
+            custom_index = _INVITE_CUSTOM.indexOf(code.charAt(i));
+            if (custom_index == -1) {
+                System.out.printf("Invalid char: %c\n", code.charAt(i));
+                throw new IllegalStateException();
+            }
+            maybe_steam32 += _INVITE_HEX.charAt(custom_index);
+        }
+
+        System.out.println(maybe_steam32);
+        System.out.println(Integer.parseInt(maybe_steam32, 16));
+        return SteamIDConverter.getSteamID("[U:1:%s]".formatted(Integer.parseInt(maybe_steam32, 16)));
+    }
+}

src/test/java/app/steam/SteamURL2STEAMID64.java

@@ -0,0 +1,82 @@
+package app.steam;
+
+import app.entities.other.SteamID;
+import app.utils.SteamIDConverter;
+import app.utils.SteamUrlConverter;
+import org.junit.Test;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class SteamURL2STEAMID64 {
+
+    RestTemplate restTemplate = new RestTemplate();
+    final Pattern USER_ID64_FROM_URL_REGEX = Pattern.compile(
+            "g_rgProfileData\\s*=\\s*(?<json>\\{.*?});\\s*"
+    );
+    final Pattern URL_REGEX = Pattern.compile(
+            "(?:https?://)?(?:www\\.)?(?<url>steamcommunity\\.com/(?<type>id)/(?<value>.+))"
+    );
+
+    @Test
+    public void ValidURL() {
+        SteamID steamID = SteamUrlConverter.getSteamID("https://steamcommunity.com/id/catxakep", restTemplate);
+        System.out.println(steamID);
+    }
+
+    @Test
+    public void InvalidURL_end() {
+        SteamID steamID = SteamUrlConverter.getSteamID("https://steamcommunity.com/id/cafsefsetxakep", restTemplate);
+        System.out.println(steamID);
+    }
+
+    @Test
+    public void InvalidURL() {
+        SteamID steamID = SteamUrlConverter.getSteamID("https://steamcommunity.com/profiles/76561198087598690", restTemplate);
+        System.out.println(steamID);
+    }
+
+    public void get_id64(String example_url) {
+        // REGEX FROM: https://github.com/Gobot1234/steam.py/blob/26c7c2056a552391bda8dc05f3d0c60f6f3c3f0d/steam/id.py#L168
+        Matcher result;
+
+        if (!(result = URL_REGEX.matcher(example_url)).find()) {
+            System.out.println("No match found on: %s".formatted(example_url));
+            throw new IllegalStateException();
+        }
+        //////////////////////////////////////////////////////////////////////////////////////////////
+        System.out.println(result.group("url"));
+        System.out.println(result.group("type"));
+        System.out.println(result.group("value"));
+        //////////////////////////////////////////////////////////////////////////////////////////////
+        String steam_result = restTemplate.getForEntity("https://%s".formatted(result.group("url")), String.class).getBody();
+        Matcher steam_data;
+        if (!(steam_data = USER_ID64_FROM_URL_REGEX.matcher(steam_result)).find()) {
+            System.out.println("Cannot fetch json from: %s".formatted(example_url));
+            throw new IllegalStateException();
+        }
+        //////////////////////////////////////////////////////////////////////////////////////////////
+        String json_result = steam_data.group("json");
+        System.out.println(json_result);
+        //////////////////////////////////////////////////////////////////////////////////////////////
+        int steam_id_start = json_result.indexOf("\"steamid\":");
+        if (steam_id_start == -1) {
+            System.out.println("Cannot found start pos \"steamid\" in json: %s".formatted(example_url));
+            throw new IllegalStateException();
+        } else {
+            steam_id_start += 11;
+            System.out.printf("Start pos: %d\n", steam_id_start);
+        }
+        //////////////////////////////////////////////////////////////////////////////////////////////
+        int steam_id_end = json_result.indexOf("\"", steam_id_start);
+        if (steam_id_end == -1) {
+            System.out.println("Cannot found end pos \"steamid\" in json: %s".formatted(example_url));
+            throw new IllegalStateException();
+        } else {
+            System.out.printf("End pos: %d\n", steam_id_end);
+        }
+        String steam64 = json_result.substring(steam_id_start,steam_id_end);
+        System.out.println(SteamIDConverter.getSteamID(steam64));
+    }
+}