feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

improve player name parsing

Browse Source
This commit is contained in:
Brokkonaut
2022-06-11 20:14:48 +02:00
parent a58206b21d
commit 7c6b756f18
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/de/diddiz/LogBlock/QueryParams.java
View File

@ -436,19 +436,19 @@ public final class QueryParams implements Cloneable {
if (!excludePlayersMode) { if (!excludePlayersMode) {
where.append('('); where.append('(');
for (final String killerName : players) { for (final String killerName : players) {
where.append("killers.playername = '").append(SqlUtil.escapeString(killerName)).append("' OR "); where.append("killers.playername = '").append(SqlUtil.escapeString(killerName, true)).append("' OR ");
} }
for (final String victimName : players) { for (final String victimName : players) {
where.append("victims.playername = '").append(SqlUtil.escapeString(victimName)).append("' OR "); where.append("victims.playername = '").append(SqlUtil.escapeString(victimName, true)).append("' OR ");
} }
where.delete(where.length() - 4, where.length()); where.delete(where.length() - 4, where.length());
where.append(") AND "); where.append(") AND ");
} else { } else {
for (final String killerName : players) { for (final String killerName : players) {
where.append("killers.playername != '").append(SqlUtil.escapeString(killerName)).append("' AND "); where.append("killers.playername != '").append(SqlUtil.escapeString(killerName, true)).append("' AND ");
} }
for (final String victimName : players) { for (final String victimName : players) {
where.append("victims.playername != '").append(SqlUtil.escapeString(victimName)).append("' AND "); where.append("victims.playername != '").append(SqlUtil.escapeString(victimName, true)).append("' AND ");
} }
} }
} }
@ -614,13 +614,13 @@ public final class QueryParams implements Cloneable {
if (!excludePlayersMode) { if (!excludePlayersMode) {
where.append('('); where.append('(');
for (final String playerName : players) { for (final String playerName : players) {
where.append("playername = '").append(SqlUtil.escapeString(playerName)).append("' OR "); where.append("playername = '").append(SqlUtil.escapeString(playerName, true)).append("' OR ");
} }
where.delete(where.length() - 4, where.length()); where.delete(where.length() - 4, where.length());
where.append(") AND "); where.append(") AND ");
} else { } else {
for (final String playerName : players) { for (final String playerName : players) {
where.append("playername != '").append(SqlUtil.escapeString(playerName)).append("' AND "); where.append("playername != '").append(SqlUtil.escapeString(playerName, true)).append("' AND ");
} }
} }
} }
@ -691,16 +691,20 @@ public final class QueryParams implements Cloneable {
if (values.length < 1) { if (values.length < 1) {
throw new IllegalArgumentException("No or wrong count of arguments for '" + param + "'"); throw new IllegalArgumentException("No or wrong count of arguments for '" + param + "'");
} }
for (final String playerName : values) { for (String playerName : values) {
if (playerName.length() > 0) { if (playerName.length() > 0) {
if (playerName.contains("!")) { if (playerName.startsWith("!")) {
playerName = playerName.substring(1);
excludePlayersMode = true; excludePlayersMode = true;
if (playerName.isEmpty()) {
continue;
}
} }
if (playerName.contains("\"")) { if (playerName.contains("\"")) {
players.add(playerName.replaceAll("[^a-zA-Z0-9_]", "")); players.add(playerName.replace("\"", ""));
} else { } else {
final Player matches = logblock.getServer().getPlayerExact(playerName); final Player matches = logblock.getServer().getPlayerExact(playerName);
players.add(matches != null ? matches.getName() : playerName.replaceAll("[^a-zA-Z0-9_]", "")); players.add(matches != null ? matches.getName() : playerName.replace("\\\"", ""));
} }
} }
} }