Show selected avatar via player.currentAvatar instead of the selected flag

The API now tracks a player's worn avatar via login.avatar_id (exposed as the
player.currentAvatar relationship) and no longer maintains the legacy
AvatarAssignment.selected flag, so the "Selected" columns always showed false.

Derive the column from currentAvatar instead: include currentAvatar in the
player/avatar queries, map it onto PlayerFX, and compute "Selected" as
player.currentAvatar.id == assignment.avatar.id. Bumps commons to the release
that adds Player.currentAvatar.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: Brutus5000

build.gradle

@@ -39,7 +39,7 @@ println "Platform is: ${javafxPlatform}"
 dependencies {
     def springBootVersion = "3.5.6"
     def mapStructVersion = "1.6.3"
-    def commonsVersion = "20251008-e3f795c"
+    def commonsVersion = "20260626-2e8a5a8"
 
     annotationProcessor(platform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}"))
     implementation(platform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}"))

src/main/java/com/faforever/moderatorclient/api/domain/AvatarService.java

@@ -39,7 +39,8 @@ public List<Avatar> getAll() {
         List<Avatar> result = fafApi.getAll(Avatar.class, ElideNavigator.of(Avatar.class)
                 .collection()
                 .addInclude("assignments")
-                .addInclude("assignments.player"));
+                .addInclude("assignments.player")
+                .addInclude("assignments.player.currentAvatar"));
         log.trace("found {} avatars", result.size());
         return result;
     }
@@ -50,6 +51,7 @@ private List<Avatar> findAvatarsByAttribute(@NotNull String attribute, @NotNull
                 .collection()
                 .addInclude("assignments")
                 .addInclude("assignments.player")
+                .addInclude("assignments.player.currentAvatar")
                 .setFilter(ElideNavigator.qBuilder().string(attribute).eq(pattern));
 
         List<Avatar> result = fafApi.getAll(Avatar.class, navigator);
@@ -73,6 +75,7 @@ public List<Avatar> findAvatarsByAssignedUser(@NotNull String pattern) {
                 .collection()
                 .addInclude("assignments")
                 .addInclude("assignments.player")
+                .addInclude("assignments.player.currentAvatar")
                 .setFilter(ElideNavigator.qBuilder().string(isNumeric ? "assignments.player.id" : "assignments.player.login").eq(pattern));
 
         List<Avatar> result = fafApi.getAll(Avatar.class, navigator);
@@ -115,7 +118,8 @@ public List<Avatar> getAllAvatarsWithPlayerAssignments() {
         return fafApi.getAll(Avatar.class, ElideNavigator.of(Avatar.class)
                 .collection()
                 .addInclude("assignments")
-                .addInclude("assignments.player"));
+                .addInclude("assignments.player")
+                .addInclude("assignments.player.currentAvatar"));
     }
 
     public void updateAvatarMetadata(String avatarId, String name, String description) {

src/main/java/com/faforever/moderatorclient/api/domain/UserService.java

@@ -58,6 +58,7 @@ private <T extends ElideEntity> ElideNavigatorOnCollection<T> addModeratorInclud
                 .addInclude(variablePrefix + "names")
                 .addInclude(variablePrefix + "avatarAssignments")
                 .addInclude(variablePrefix + "avatarAssignments.avatar")
+                .addInclude(variablePrefix + "currentAvatar")
                 .addInclude(variablePrefix + "uniqueIdAssignments")
                 .addInclude(variablePrefix + "uniqueIdAssignments.uniqueId")
                 .addInclude(variablePrefix + "accountLinks")

src/main/java/com/faforever/moderatorclient/mapstruct/PlayerMapper.java

@@ -7,7 +7,7 @@
 import java.util.List;
 import java.util.Set;
 
-@Mapper(componentModel = "spring", uses = {JavaFXMapper.class, UniqueIdAssignmentMapper.class, NameRecordMapper.class, BanInfoMapper.class, AvatarAssignmentMapper.class, AccountLinkMapper.class, CycleAvoidingMappingContext.class})
+@Mapper(componentModel = "spring", uses = {JavaFXMapper.class, UniqueIdAssignmentMapper.class, NameRecordMapper.class, BanInfoMapper.class, AvatarAssignmentMapper.class, AvatarMapper.class, AccountLinkMapper.class, CycleAvoidingMappingContext.class})
 public abstract class PlayerMapper {
     public abstract PlayerFX map(Player dto);
 

src/main/java/com/faforever/moderatorclient/ui/ViewHelper.java

@@ -42,6 +42,7 @@
 import com.faforever.moderatorclient.ui.domain.VotingQuestionFX;
 import com.faforever.moderatorclient.ui.domain.VotingSubjectFX;
 import javafx.beans.binding.Bindings;
+import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -101,6 +102,7 @@
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.TimeZone;
@@ -228,6 +230,21 @@ public static void bindMapTreeViewToImageView(TreeTableView<MapTableItemAdapter>
         });
     }
 
+    /**
+     * Whether this assignment's avatar is the player's currently worn avatar, i.e. the one referenced
+     * by {@code login.avatar_id} (exposed as {@link PlayerFX#getCurrentAvatar()}). Replaces the legacy
+     * {@code AvatarAssignment.selected} flag, which the API no longer maintains.
+     */
+    private static boolean isCurrentAvatar(AvatarAssignmentFX avatarAssignment) {
+        if (avatarAssignment == null) {
+            return false;
+        }
+        PlayerFX player = avatarAssignment.getPlayer();
+        AvatarFX avatar = avatarAssignment.getAvatar();
+        return player != null && avatar != null && player.getCurrentAvatar() != null
+                && Objects.equals(player.getCurrentAvatar().getId(), avatar.getId());
+    }
+
     public static void buildAvatarAssignmentTableView(TableView<AvatarAssignmentFX> tableView, ObservableList<AvatarAssignmentFX> data, @Nullable Consumer<AvatarAssignmentFX> onRemove) {
         tableView.setItems(data);
         HashMap<TableColumn<AvatarAssignmentFX, ?>, Function<AvatarAssignmentFX, ?>> extractors = new HashMap<>();
@@ -257,7 +274,7 @@ public static void buildAvatarAssignmentTableView(TableView<AvatarAssignmentFX>
         extractors.put(userNameColumn, avatarAssignmentFX -> avatarAssignmentFX.getPlayer().getLogin());
 
         TableColumn<AvatarAssignmentFX, Boolean> selectedColumn = new TableColumn<>("Selected");
-        selectedColumn.setCellValueFactory(o -> o.getValue().selectedProperty());
+        selectedColumn.setCellValueFactory(o -> new SimpleBooleanProperty(isCurrentAvatar(o.getValue())));
         selectedColumn.setMinWidth(50);
         tableView.getColumns().add(selectedColumn);
 
@@ -892,7 +909,7 @@ public static void buildUserAvatarsTableView(TableView<AvatarAssignmentFX> table
         extractors.put(descriptionColumn, avatarAssignmentFX -> avatarAssignmentFX.getAvatar().getDescription());
 
         TableColumn<AvatarAssignmentFX, Boolean> selectedColumn = new TableColumn<>("Selected");
-        selectedColumn.setCellValueFactory(o -> o.getValue().selectedProperty());
+        selectedColumn.setCellValueFactory(o -> new SimpleBooleanProperty(isCurrentAvatar(o.getValue())));
         selectedColumn.setCellFactory(CheckBoxTableCell.forTableColumn(selectedColumn));
         selectedColumn.setMinWidth(50);
         tableView.getColumns().add(selectedColumn);

src/main/java/com/faforever/moderatorclient/ui/domain/PlayerFX.java

@@ -25,8 +25,10 @@ public class PlayerFX extends AbstractEntityFX {
     private final ObservableList<NameRecordFX> names;
     private final ObservableList<BanInfoFX> bans;
     private final ObservableList<AvatarAssignmentFX> avatarAssignments;
+    private final ObjectProperty<AvatarFX> currentAvatar;
 
     public PlayerFX() {
+        currentAvatar = new SimpleObjectProperty<>();
         login = new SimpleStringProperty();
         email = new SimpleStringProperty();
         userAgent = new SimpleStringProperty();
@@ -158,6 +160,18 @@ public void setAvatarAssignments(ObservableList<AvatarAssignmentFX> avatarAssign
         }
     }
 
+    public AvatarFX getCurrentAvatar() {
+        return currentAvatar.get();
+    }
+
+    public void setCurrentAvatar(AvatarFX currentAvatar) {
+        this.currentAvatar.set(currentAvatar);
+    }
+
+    public ObjectProperty<AvatarFX> currentAvatarProperty() {
+        return currentAvatar;
+    }
+
     public boolean isBannedGlobally() {
         return !bans.filtered(banInfoFX -> banInfoFX.getBanStatus() == BanStatus.BANNED && banInfoFX.getLevel() == BanLevel.GLOBAL).isEmpty();
     }