misc/chomens-bot-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: improve FindAltsCommand a bit

Browse Source
This commit is contained in:
ChomeNS
2025-05-15 18:21:39 +07:00
parent b699cb2f7a
commit 8dad298c50
3 changed files with 27 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build-number.txt
View File

@@ -1 +1 @@
3195
3196

52
src/main/java/me/chayapak1/chomens_bot/commands/FindAltsCommand.java
View File

@@ -8,20 +8,20 @@ import me.chayapak1.chomens_bot.command.CommandContext;
import me.chayapak1.chomens_bot.command.CommandException;
import me.chayapak1.chomens_bot.command.TrustLevel;
import me.chayapak1.chomens_bot.data.chat.ChatPacketType;
import me.chayapak1.chomens_bot.data.player.PlayerEntry;
import me.chayapak1.chomens_bot.plugins.DatabasePlugin;
import net.kyori.adventure.text.Component;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
public class FindAltsCommand extends Command {
// we allow both, since the flag used to be `allserver`
private static final String ALL_SERVER_FLAG = "allserver";
private static final String ALL_SERVERS_FLAG = "allservers";
private static final int LIMIT = 200;
public FindAltsCommand () {
super(
"findalts",
@@ -48,23 +48,13 @@ public class FindAltsCommand extends Command {
final String player = context.getString(true, true);
final PlayerEntry playerEntry = bot.players.getEntry(player);
DatabasePlugin.EXECUTOR_SERVICE.submit(() -> {
if (playerEntry == null) {
context.sendOutput(handle(bot, player, true, player, allServer));
} else if (playerEntry.ip != null) {
context.sendOutput(handle(bot, playerEntry.ip, false, player, allServer));
final String ipFromUsername = bot.playersDatabase.getPlayerIP(player);
if (ipFromUsername == null) {
context.sendOutput(handle(bot, player, player, allServer));
} else {
final CompletableFuture<String> future = bot.players.getPlayerIP(playerEntry);
if (future == null) return null;
future.thenApply(targetIP -> {
context.sendOutput(handle(bot, targetIP, false, player, allServer));
return targetIP;
});
context.sendOutput(handle(bot, ipFromUsername, player, allServer));
}
return null;
@@ -73,26 +63,26 @@ public class FindAltsCommand extends Command {
return null;
}
private Component handle (final Bot bot, final String targetIP, final boolean argumentIsIP, final String player, final boolean allServer) {
final Map<String, JsonNode> altsMap = bot.playersDatabase.findPlayerAlts(targetIP, allServer);
private Component handle (final Bot bot, final String targetIP, final String player, final boolean allServer) {
final Map<String, JsonNode> altsMap = bot.playersDatabase.findPlayerAlts(targetIP, allServer, LIMIT);
final Component playerComponent = Component
.text(player)
.color(bot.colorPalette.username);
final Component playerComponent = Component.text(player, bot.colorPalette.username);
final boolean isIP = targetIP.equals(player);
Component component = Component
.translatable("commands.findalts.output", bot.colorPalette.defaultColor)
.arguments(
Component.translatable(argumentIsIP ? "commands.findalts.ip" : "commands.findalts.player"),
argumentIsIP ?
Component.translatable(isIP ? "commands.findalts.ip" : "commands.findalts.player"),
isIP ?
playerComponent :
Component.translatable("%s (%s)")
.arguments(
playerComponent,
Component
.text(targetIP)
.color(bot.colorPalette.number)
)
Component.translatable(
"%s (%s)",
playerComponent,
Component
.text(targetIP)
.color(bot.colorPalette.number)
)
)
.appendNewline();

10
src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java
View File

@@ -27,8 +27,8 @@ public class PlayersDatabasePlugin implements Listener {
private static final String UPDATE_PLAYER = "UPDATE players SET data = JSON_SET(data, ?, JSON_MERGE_PATCH(JSON_EXTRACT(data, ?), ?)) WHERE username = ?;";
private static final String GET_DATA = "SELECT data FROM players WHERE username = ?;";
private static final String GET_IP = "SELECT JSON_UNQUOTE(JSON_VALUE(data, ?)) AS ip FROM players WHERE username = ?;";
private static final String FIND_ALTS_SINGLE_SERVER = "SELECT * FROM players WHERE JSON_CONTAINS(JSON_EXTRACT(data, '$.ips'), JSON_OBJECT(?, ?));";
private static final String FIND_ALTS_ALL_SERVERS = "SELECT * FROM players WHERE JSON_SEARCH(JSON_EXTRACT(data, '$.ips'), 'one', ?) IS NOT NULL;";
private static final String FIND_ALTS_SINGLE_SERVER = "SELECT * FROM players WHERE JSON_CONTAINS(JSON_EXTRACT(data, '$.ips'), JSON_OBJECT(?, ?)) LIMIT ?;";
private static final String FIND_ALTS_ALL_SERVERS = "SELECT * FROM players WHERE JSON_SEARCH(JSON_EXTRACT(data, '$.ips'), 'one', ?) IS NOT NULL LIMIT ?;";
private static final ObjectMapper objectMapper = new ObjectMapper();
@@ -101,9 +101,7 @@ public class PlayersDatabasePlugin implements Listener {
}
}
public Map<String, JsonNode> findPlayerAlts (final String ip) { return findPlayerAlts(ip, false); }
public Map<String, JsonNode> findPlayerAlts (final String ip, final boolean allServer) {
public Map<String, JsonNode> findPlayerAlts (final String ip, final boolean allServer, final int limit) {
try {
final Map<String, JsonNode> output = new HashMap<>();
@@ -113,11 +111,13 @@ public class PlayersDatabasePlugin implements Listener {
statement = Main.database.connection.prepareStatement(FIND_ALTS_ALL_SERVERS);
statement.setString(1, ip);
statement.setInt(2, limit);
} else {
statement = Main.database.connection.prepareStatement(FIND_ALTS_SINGLE_SERVER);
statement.setString(1, bot.getServerString(true));
statement.setString(2, ip);
statement.setInt(3, limit);
}
final ResultSet result = statement.executeQuery();