Merge branch 'release/0.4.1'

FAForever · Jul 12, 2018 · f08f5b9 · f08f5b9
2 parents 73b3af8 + a002634
commit f08f5b9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.faforever</groupId>
     <artifactId>faf-moderator-client</artifactId>
-    <version>0.4.0</version>
+    <version>0.4.1</version>
     <packaging>jar</packaging>
 
     <name>faf-moderator-client</name>

diff --git a/src/main/java/com/faforever/moderatorclient/api/domain/AvatarService.java b/src/main/java/com/faforever/moderatorclient/api/domain/AvatarService.java
@@ -63,11 +63,12 @@ public List<Avatar> findAvatarsByTooltip(@NotNull String pattern) {
 
     public List<Avatar> findAvatarsByAssignedUser(@NotNull String pattern) {
         log.debug("Searching for avatars by assigned player with pattern: {}", pattern);
+        boolean isNumeric = pattern.matches("^[0-9]+$");
+
         ElideRouteBuilder<Avatar> routeBuilder = ElideRouteBuilder.of(Avatar.class)
                 .addInclude("assignments")
                 .addInclude("assignments.player")
-                .filter(ElideRouteBuilder.qBuilder().string("assignments.player.id").eq(pattern)
-                        .or().string("assignments.player.login").eq(pattern));
+                .filter(ElideRouteBuilder.qBuilder().string(isNumeric ? "assignments.player.id" : "assignments.player.login").eq(pattern));
 
         List<Avatar> result = fafApi.getAll(routeBuilder);
         log.trace("found {} avatars", result.size());