Add support for nickname search

AuroraLS3 · AuroraLS3 · commit 7b2e316ce8f3 · 2026-02-14T12:03:38.000+02:00
The nicknames are hidden unless exported to csv after search, but the search will filter based on them. Affects issues: - Close #1773
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/TablePlayer.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/TablePlayer.java
@@ -40,6 +40,7 @@ public class TablePlayer implements Comparable<TablePlayer> {
     private Long lastSeen;
     private String geolocation;
     private Ping ping;
+    private String nicknames;
 
     private boolean banned = false;
 
@@ -97,6 +98,10 @@ public boolean isBanned() {
         return banned;
     }
 
+    public String getNicknames() {
+        return nicknames;
+    }
+
     @Override
     public int compareTo(TablePlayer other) {
         // Most recent first
@@ -203,6 +208,11 @@ public Builder ping(Ping ping) {
             return this;
         }
 
+        public Builder nicknames(String nicknames) {
+            player.nicknames = nicknames;
+            return this;
+        }
+
         public TablePlayer build() {
             return player;
         }
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/datatransfer/TablePlayerDto.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/datatransfer/TablePlayerDto.java
@@ -40,6 +40,7 @@ public class TablePlayerDto {
     private Double pingAverage;
     private Integer pingMax;
     private Integer pingMin;
+    private String nicknames;
 
     private Map<String, ExtensionValueDataDto> extensionValues;
 
@@ -147,6 +148,14 @@ public void setPingMin(Integer pingMin) {
         this.pingMin = pingMin;
     }
 
+    public String getNicknames() {
+        return nicknames;
+    }
+
+    public void setNicknames(String nicknames) {
+        this.nicknames = nicknames;
+    }
+
     public static final class TablePlayerDtoBuilder {
         private final TablePlayerDto tablePlayerDto;
 
@@ -206,6 +215,11 @@ public TablePlayerDtoBuilder withPing(Ping ping) {
             return this;
         }
 
+        public TablePlayerDtoBuilder withNicknames(String nicknames) {
+            tablePlayerDto.setNicknames(nicknames);
+            return this;
+        }
+
         public TablePlayerDto build() {return tablePlayerDto;}
     }
 }
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PlayersTableJSONCreator.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PlayersTableJSONCreator.java
@@ -143,6 +143,7 @@ private List<TablePlayerDto> toPlayers() {
                         .withCountry(player.getGeolocation().orElse(null))
                         .withExtensionValues(mapToExtensionValues(extensionData.get(player.getPlayerUUID())))
                         .withPing(player.getPing())
+                        .withNicknames(player.getNicknames())
                         .build()
                 ).collect(Collectors.toList());
     }
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/playertable/NetworkTablePlayersQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/playertable/NetworkTablePlayersQuery.java
@@ -82,6 +82,13 @@ public List<TablePlayer> executeQuery(SQLDB db) {
                 FROM + UserInfoTable.TABLE_NAME + " ub" +
                 WHERE + UserInfoTable.BANNED + "=?";
 
+        String selectNicknames = SELECT +
+                "un." + UsersTable.ID + ',' +
+                "GROUP_CONCAT(DISTINCT " + "n." + NicknamesTable.NICKNAME + ",',') as nicknames" +
+                FROM + NicknamesTable.TABLE_NAME + " n" +
+                INNER_JOIN + UsersTable.TABLE_NAME + " un ON n." + NicknamesTable.USER_UUID + "=un." + UsersTable.USER_UUID +
+                GROUP_BY + "un." + UsersTable.ID;
+
         String selectBaseUsers = SELECT +
                 "u." + UsersTable.USER_UUID + ',' +
                 "u." + UsersTable.USER_NAME + ',' +
@@ -94,13 +101,15 @@ public List<TablePlayer> executeQuery(SQLDB db) {
                 "act.activity_index," +
                 "pi.min_ping," +
                 "pi.max_ping," +
-                "pi.avg_ping" +
+                "pi.avg_ping," +
+                "ni.nicknames" +
                 FROM + UsersTable.TABLE_NAME + " u" +
                 LEFT_JOIN + '(' + selectBanned + ") ban on ban." + UserInfoTable.USER_ID + "=u." + UsersTable.ID +
                 LEFT_JOIN + '(' + selectLatestGeolocations + ") geo on geo." + GeoInfoTable.USER_ID + "=u." + UsersTable.ID +
                 LEFT_JOIN + '(' + selectSessionData + ") ses on ses." + SessionsTable.USER_ID + "=u." + UsersTable.ID +
                 LEFT_JOIN + '(' + NetworkActivityIndexQueries.selectActivityIndexSQL() + ") act on u." + UsersTable.ID + "=act." + UserInfoTable.USER_ID +
                 LEFT_JOIN + '(' + selectPingData + ") pi on pi." + PingTable.USER_ID + "=u." + UsersTable.ID +
+                LEFT_JOIN + '(' + selectNicknames + ") ni on ni." + UsersTable.ID + "=u." + UsersTable.ID +
                 ORDER_BY + "ses.last_seen DESC LIMIT ?";
 
         return db.query(new QueryStatement<>(selectBaseUsers, 1000) {
@@ -127,7 +136,8 @@ public List<TablePlayer> processResults(ResultSet set) throws SQLException {
                             .ping(new Ping(0L, null,
                                     set.getInt(PingTable.MIN_PING),
                                     set.getInt(PingTable.MAX_PING),
-                                    set.getDouble(PingTable.AVG_PING)));
+                                    set.getDouble(PingTable.AVG_PING)))
+                            .nicknames(set.getString("nicknames"));
                     if (set.getString("banned") != null) {
                         player.banned();
                     }
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/playertable/QueryTablePlayersQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/playertable/QueryTablePlayersQuery.java
@@ -112,6 +112,13 @@ public List<TablePlayer> executeQuery(SQLDB db) {
                 (serverUUIDs.isEmpty() ? "" : AND + "p." + PingTable.SERVER_ID + " IN (" + selectServerIds + ")") +
                 GROUP_BY + "p." + PingTable.USER_ID;
 
+        String selectNicknames = SELECT +
+                "un." + UsersTable.ID + ',' +
+                "GROUP_CONCAT(DISTINCT " + "n." + NicknamesTable.NICKNAME + ",',') as nicknames" +
+                FROM + NicknamesTable.TABLE_NAME + " n" +
+                INNER_JOIN + UsersTable.TABLE_NAME + " un ON n." + NicknamesTable.USER_UUID + "=un." + UsersTable.USER_UUID +
+                GROUP_BY + "un." + UsersTable.ID;
+
         String selectBaseUsers = SELECT +
                 "u." + UsersTable.USER_UUID + ',' +
                 "u." + UsersTable.USER_NAME + ',' +
@@ -124,13 +131,15 @@ public List<TablePlayer> executeQuery(SQLDB db) {
                 "act.activity_index," +
                 "pi.min_ping," +
                 "pi.max_ping," +
-                "pi.avg_ping" +
+                "pi.avg_ping," +
+                "ni.nicknames" +
                 FROM + UsersTable.TABLE_NAME + " u" +
                 LEFT_JOIN + '(' + selectBanned + ") ban on ban." + UserInfoTable.USER_ID + "=u." + UsersTable.ID +
                 LEFT_JOIN + '(' + selectLatestGeolocations + ") geo on geo." + GeoInfoTable.USER_ID + "=u." + UsersTable.ID +
                 LEFT_JOIN + '(' + selectSessionData + ") ses on ses." + SessionsTable.USER_ID + "=u." + UsersTable.ID +
                 LEFT_JOIN + '(' + NetworkActivityIndexQueries.selectActivityIndexSQL() + ") act on u." + UsersTable.ID + "=act." + UserInfoTable.USER_ID +
                 LEFT_JOIN + '(' + selectPingData + ") pi on pi." + PingTable.USER_ID + "=u." + UsersTable.ID +
+                LEFT_JOIN + '(' + selectNicknames + ") ni on ni." + UsersTable.ID + "=u." + UsersTable.ID +
                 WHERE + "u." + UsersTable.ID + userIdsInSet +
                 ORDER_BY + "ses.last_seen DESC";
 
@@ -159,7 +168,8 @@ public List<TablePlayer> processResults(ResultSet set) throws SQLException {
                             .ping(new Ping(0L, null,
                                     set.getInt(PingTable.MIN_PING),
                                     set.getInt(PingTable.MAX_PING),
-                                    set.getDouble(PingTable.AVG_PING)));
+                                    set.getDouble(PingTable.AVG_PING)))
+                            .nicknames(set.getString("nicknames"));
                     if (set.getString("banned") != null) {
                         player.banned();
                     }
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/playertable/ServerTablePlayersQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/playertable/ServerTablePlayersQuery.java
@@ -91,6 +91,13 @@ public List<TablePlayer> executeQuery(SQLDB db) {
                 WHERE + "p." + PingTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID +
                 GROUP_BY + "p." + PingTable.USER_ID;
 
+        String selectNicknames = SELECT +
+                "un." + UsersTable.ID + ',' +
+                "GROUP_CONCAT(DISTINCT " + "n." + NicknamesTable.NICKNAME + ",',') as nicknames" +
+                FROM + NicknamesTable.TABLE_NAME + " n" +
+                INNER_JOIN + UsersTable.TABLE_NAME + " un ON n." + NicknamesTable.USER_UUID + "=un." + UsersTable.USER_UUID +
+                GROUP_BY + "un." + UsersTable.ID;
+
         String selectBaseUsers = SELECT +
                 "u." + UsersTable.USER_UUID + ',' +
                 "u." + UsersTable.USER_NAME + ',' +
@@ -103,13 +110,15 @@ public List<TablePlayer> executeQuery(SQLDB db) {
                 "act.activity_index," +
                 "pi.min_ping," +
                 "pi.max_ping," +
-                "pi.avg_ping" +
+                "pi.avg_ping," +
+                "ni.nicknames" +
                 FROM + UsersTable.TABLE_NAME + " u" +
                 INNER_JOIN + UserInfoTable.TABLE_NAME + " on u." + UsersTable.ID + "=" + UserInfoTable.TABLE_NAME + '.' + UserInfoTable.USER_ID +
                 LEFT_JOIN + '(' + selectLatestGeolocations + ") geo on geo." + GeoInfoTable.USER_ID + "=u." + UsersTable.ID +
                 LEFT_JOIN + '(' + selectSessionData + ") ses on ses." + SessionsTable.USER_ID + "=u." + UsersTable.ID +
                 LEFT_JOIN + '(' + ActivityIndexQueries.selectActivityIndexSQL() + ") act on u." + UsersTable.ID + "=act." + UserInfoTable.USER_ID +
                 LEFT_JOIN + '(' + selectPingData + ") pi on pi." + PingTable.USER_ID + "=u." + UsersTable.ID +
+                LEFT_JOIN + '(' + selectNicknames + ") ni on ni." + UsersTable.ID + "=u." + UsersTable.ID +
                 WHERE + UserInfoTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID +
                 ORDER_BY + "ses.last_seen DESC LIMIT ?";
 
@@ -139,7 +148,8 @@ public List<TablePlayer> processResults(ResultSet set) throws SQLException {
                             .ping(new Ping(0L, serverUUID,
                                     set.getInt(PingTable.MIN_PING),
                                     set.getInt(PingTable.MAX_PING),
-                                    set.getDouble(PingTable.AVG_PING)));
+                                    set.getDouble(PingTable.AVG_PING)))
+                            .nicknames(set.getString("nicknames"));
                     if (set.getBoolean(UserInfoTable.BANNED)) {
                         player.banned();
                     }
diff --git a/Plan/react/dashboard/src/components/table/PlayerTable.jsx b/Plan/react/dashboard/src/components/table/PlayerTable.jsx
@@ -104,7 +104,8 @@ const PlayerTable = ({data, orderBy}) => {
                 pingMax: player.pingMax,
                 pingMaxFormatted: localeService.localizePing(player.pingMax),
                 pingMin: player.pingMin,
-                pingMinFormatted: localeService.localizePing(player.pingMin)
+                pingMinFormatted: localeService.localizePing(player.pingMin),
+                nicknames: player.nicknames,
             };
             data.extensionDescriptors.forEach(descriptor => {
                 row[descriptor.name] = <ExtensionValueTableCell data={player.extensionValues[descriptor.name]}/>;

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,7 @@ private List<TablePlayerDto> toPlayers() {`
`143`	`143`	`.withCountry(player.getGeolocation().orElse(null))`
`144`	`144`	`.withExtensionValues(mapToExtensionValues(extensionData.get(player.getPlayerUUID())))`
`145`	`145`	`.withPing(player.getPing())`
	`146`	`+ .withNicknames(player.getNicknames())`
`146`	`147`	`.build()`
`147`	`148`	`).collect(Collectors.toList());`
`148`	`149`	`}`