diff --git a/src/main/java/app/services/db/DetectService.java b/src/main/java/app/services/db/DetectService.java index 05d82e8..4c03c3c 100644 --- a/src/main/java/app/services/db/DetectService.java +++ b/src/main/java/app/services/db/DetectService.java @@ -9,10 +9,7 @@ import jakarta.persistence.PersistenceContext; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; @Service public class DetectService { @@ -30,11 +27,11 @@ public class DetectService { public List getAccountsPerSteamID(SteamID steamID) { List founded_steamid = new ArrayList<>(); for (Map.Entry stringServerEntry : stats.getServers().entrySet()) { - founded_steamid.addAll(entityManager.createNativeQuery("SELECT * FROM `"+stringServerEntry.getValue().getDb()+"`."+"`user_connections` WHERE `connect_ip` in (SELECT `connect_ip` FROM `" + stringServerEntry.getValue().getDb() + "`." +"`user_connections` WHERE `steam_id` LIKE ?1 AND `connect_ip` NOT LIKE '10.%' ORDER BY `id` DESC) GROUP BY `steam_id`") + founded_steamid.addAll(entityManager.createNativeQuery("SELECT `steam_id` FROM `"+stringServerEntry.getValue().getDb()+"`."+"`user_connections` WHERE `connect_ip` in (SELECT `connect_ip` FROM `" + stringServerEntry.getValue().getDb() + "`." +"`user_connections` WHERE `steam_id` LIKE ?1 AND `connect_ip` NOT LIKE '10.%' ORDER BY `id` DESC) GROUP BY `steam_id`") .setParameter(1, steamID.steam2) .getResultStream().map(String::valueOf).toList()); } - return founded_steamid.stream().distinct().map(SteamIDConverter::getSteamID).toList(); + return founded_steamid.stream().distinct().map(SteamIDConverter::getSteamID).filter(Objects::nonNull).toList(); } public List getAttachedDiscordAccountPerSteam(SteamID steamID) {