Merge branch 'development' into feature/coopTabUpdates

# Conflicts:
#	src/main/resources/theme/icons.css

Author: JJ173

build.gradle

@@ -2,7 +2,7 @@ import com.install4j.gradle.Install4jTask
 import org.gradle.internal.os.OperatingSystem
 
 plugins {
-    id("org.springframework.boot") version "3.5.6"
+    id("org.springframework.boot") version "3.5.7"
     id("io.spring.dependency-management") version "1.1.7"
     id("com.install4j.gradle") version "11.0.1"
     id("de.undercouch.download") version "5.6.0"
@@ -256,7 +256,7 @@ dependencies {
     implementation("io.projectreactor.addons:reactor-extra")
     implementation("io.projectreactor:reactor-tools")
 
-  def commonsVersion = "20250913-317e19f"
+    def commonsVersion = "20251112-0a26247"
 
     implementation("com.faforever.commons:data:${commonsVersion}") {
         exclude module: 'guava'
@@ -296,14 +296,14 @@ dependencies {
     implementation("org.fxmisc.flowless:flowless:0.7.4")
 
     implementation("org.javassist:javassist:3.30.2-GA")
-    implementation("org.checkerframework:checker-qual:3.51.1")
+    implementation("org.checkerframework:checker-qual:3.52.0")
 
     implementation("io.github.sheikah45.fx2j:fx2j-api:0.1.0")
     implementation("com.install4j:install4j-runtime:11.0.1")
 
     testImplementation("org.instancio:instancio-junit:5.5.1")
-    testImplementation("com.squareup.okhttp3:okhttp:5.2.1")
-    testImplementation("com.squareup.okhttp3:mockwebserver:5.2.1")
+    testImplementation("com.squareup.okhttp3:okhttp:5.3.0")
+    testImplementation("com.squareup.okhttp3:mockwebserver:5.3.0")
     testImplementation("io.projectreactor:reactor-test")
     testImplementation("org.testfx:testfx-core:4.0.18") {
         exclude module: 'guava'

readme.md

@@ -10,12 +10,6 @@
 
 The official client for [Forged Alliance Forever (FAF)](https://www.faforever.com/)
 
-## Support Development
-
-Post a bounty on Issue Hunt. You can reward and financially help developers that solve the issue. For new features, it can be helpful to first ask whether other people also see your change as an improvement. This helps avoid feature requests that will not be accepted.
-
-[![Issue hunt](https://github.com/BoostIO/issuehunt-materials/raw/master/v1/issuehunt-button-v1.svg?sanitize=true)](https://issuehunt.io/r/FAForever/downlords-faf-client)
-
 ## How To Run
 1. Use [Temurin](https://adoptium.net/) 25 or Oracle JDK 25 (others might not work)
 1. Clone the project with Git

src/main/java/com/faforever/client/chat/PrivateChatTabController.java

@@ -3,6 +3,7 @@
 import com.faforever.client.avatar.AvatarService;
 import com.faforever.client.domain.server.PlayerInfo;
 import com.faforever.client.fx.JavaFxUtil;
+import com.faforever.client.player.PlayerService;
 import com.faforever.client.player.PrivatePlayerInfoController;
 import javafx.beans.value.ObservableValue;
 import javafx.scene.Node;
@@ -20,6 +21,7 @@
 public class PrivateChatTabController extends AbstractChatTabController {
 
   private final AvatarService avatarService;
+  private final PlayerService playerService;
 
   public Tab privateChatTabRoot;
   public ImageView avatarImageView;
@@ -29,9 +31,10 @@ public class PrivateChatTabController extends AbstractChatTabController {
   public ScrollPane gameDetailScrollPane;
 
   @Autowired
-  public PrivateChatTabController(ChatService chatService, AvatarService avatarService) {
+  public PrivateChatTabController(ChatService chatService, AvatarService avatarService, PlayerService playerService) {
     super(chatService);
     this.avatarService = avatarService;
+    this.playerService = playerService;
   }
 
   @Override
@@ -46,14 +49,12 @@ protected void onInitialize() {
 
     privateChatTabRoot.textProperty().bind(channelName.when(attached));
 
-    ObservableValue<ChatChannelUser> chatUser = chatChannel.flatMap(
-        channel -> channelName.map(chanName -> channel.getUser(chanName).orElse(null)));
-    privatePlayerInfoController.chatUserProperty().bind(chatUser.when(showing));
+    ObservableValue<PlayerInfo> player = channelName.map(
+        playerName -> playerService.getPlayerByNameIfOnline(playerName).orElse(null));
+    privatePlayerInfoController.playerProperty().bind(player.when(showing));
 
-    avatarImageView.imageProperty().bind(chatUser
-                                             .flatMap(ChatChannelUser::playerProperty)
-                                             .flatMap(PlayerInfo::avatarProperty)
-                                             .map(avatarService::loadAvatar).when(showing));
+    avatarImageView.imageProperty()
+                   .bind(player.flatMap(PlayerInfo::avatarProperty).map(avatarService::loadAvatar).when(showing));
   }
 
   @Override

src/main/java/com/faforever/client/config/PreferencesConfig.java

@@ -19,6 +19,7 @@
 import com.faforever.client.preferences.ReplayHistoryPrefs;
 import com.faforever.client.preferences.UserPrefs;
 import com.faforever.client.preferences.VaultPrefs;
+import com.faforever.client.preferences.VetoKey;
 import com.faforever.client.preferences.WindowPrefs;
 import com.faforever.client.serialization.ColorMixin;
 import com.faforever.client.serialization.FactionMixin;
@@ -27,6 +28,8 @@
 import com.faforever.client.serialization.SimpleListPropertyInstantiator;
 import com.faforever.client.serialization.SimpleMapPropertyInstantiator;
 import com.faforever.client.serialization.SimpleSetPropertyInstantiator;
+import com.faforever.client.serialization.VetoKeyDeserializer;
+import com.faforever.client.serialization.VetoKeySerializer;
 import com.faforever.commons.api.dto.Faction;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.databind.DeserializationFeature;
@@ -185,6 +188,8 @@ private ObjectMapper configureObjectMapper(ObjectMapper objectMapper) {
 
     Module preferencesModule = new SimpleModule().addSerializer(Path.class, new PathSerializer())
         .addDeserializer(Path.class, new PathDeserializer())
+        .addKeySerializer(VetoKey.class, new VetoKeySerializer())
+        .addKeyDeserializer(VetoKey.class, new VetoKeyDeserializer())
         .addValueInstantiator(SimpleMapProperty.class, new SimpleMapPropertyInstantiator(configuredObjectMapper.getDeserializationConfig(), typeFactory.constructType(SimpleMapProperty.class)))
         .addValueInstantiator(SimpleListProperty.class, new SimpleListPropertyInstantiator(configuredObjectMapper.getDeserializationConfig(), typeFactory.constructType(SimpleListProperty.class)))
         .addValueInstantiator(SimpleSetProperty.class, new SimpleSetPropertyInstantiator(configuredObjectMapper.getDeserializationConfig(), typeFactory.constructType(SimpleSetProperty.class)))

src/main/java/com/faforever/client/domain/api/MatchmakerQueueMapPool.java

@@ -5,5 +5,8 @@
 public record MatchmakerQueueMapPool(
     Integer id,
     Double minRating,
-    Double maxRating, MatchmakerQueueInfo matchmakerQueue
+    Double maxRating, MatchmakerQueueInfo matchmakerQueue,
+    Integer vetoTokensPerPlayer,
+    Integer maxTokensPerMap,
+    Float minimalMapsAllowed
 ) {}

src/main/java/com/faforever/client/game/GameRunner.java

@@ -38,6 +38,7 @@
 import com.faforever.client.preferences.PreferencesService;
 import com.faforever.client.remote.FafServerAccessor;
 import com.faforever.client.replay.ReplayServer;
+import com.faforever.client.task.TaskService;
 import com.faforever.client.theme.UiService;
 import com.faforever.client.ui.StageHolder;
 import com.faforever.client.util.ConcurrentUtil;
@@ -118,6 +119,7 @@ public class GameRunner implements InitializingBean {
   private final NotificationPrefs notificationPrefs;
   private final FxApplicationThreadExecutor fxApplicationThreadExecutor;
   private final LogAnalyzerService logAnalyzerService;
+  private final TaskService taskService;
 
   private final MaskPatternLayout logMasker = new MaskPatternLayout();
   private final SimpleObjectProperty<Integer> runningGameId = new SimpleObjectProperty<>();
@@ -148,7 +150,7 @@ public void afterPropertiesSet() {
 
     fafServerAccessor.getEvents(NoticeInfo.class)
                      .filter(notice -> Objects.equals(notice.getStyle(), "kill"))
-                     .doOnNext(notice -> {
+                     .doOnNext(_ -> {
                        log.info("Game close requested by server");
                        String linksRules = clientProperties.getLinks().get("linksRules");
                        ImmediateNotification notification = new ImmediateNotification(i18n.get("game.kicked.title"),
@@ -163,8 +165,8 @@ public void afterPropertiesSet() {
                      .subscribe();
 
 
-    fafServerAccessor.connectionStateProperty().addListener((observable, oldValue, newValue) -> {
-      if (isRunning() && newValue == ConnectionState.CONNECTED && oldValue != ConnectionState.CONNECTED) {
+    fafServerAccessor.connectionStateProperty().subscribe((oldState, newState) -> {
+      if (isRunning() && newState == ConnectionState.CONNECTED && oldState != ConnectionState.CONNECTED) {
         fafServerAccessor.restoreGameSession(runningGameId.get());
       }
     });
@@ -183,16 +185,16 @@ CompletableFuture<Void> startOnlineGame(GameLaunchResponse gameLaunchResponse) {
     String mapFolderName = gameLaunchResponse.getMapName();
     CompletableFuture<Void> downloadMapFuture = mapFolderName == null ? completedFuture(
         null) : mapService.downloadIfNecessary(mapFolderName).toFuture();
-    CompletableFuture<League> leagueFuture = hasLeague ? completedFuture(null) : getDivisionInfo(
-        leaderboard).toFuture();
-    CompletableFuture<Integer> startReplayServerFuture = replayServer.start(uid);
-    CompletableFuture<Integer> startIceAdapterFuture = startIceAdapter(uid);
-
-    return CompletableFuture.allOf(downloadMapFuture, leagueFuture, startIceAdapterFuture, startReplayServerFuture)
-                            .thenApply(_ -> gameMapper.map(gameLaunchResponse, leagueFuture.join()))
-                            .thenApply(parameters -> launchOnlineGame(parameters, startIceAdapterFuture.join(),
-                                                                      startReplayServerFuture.join()))
-                            .whenCompleteAsync((process, throwable) -> {
+
+    CompletableFuture<League> loadLeagueInfoFuture = hasLeague ? completedFuture(null) : taskService.submitFutureTask("league.loadInfo", () -> getDivisionInfo(leaderboard).toFuture());
+    CompletableFuture<Integer> runReplayServerFuture = taskService.submitFutureTask("replayServer.connecting", () -> replayServer.start(uid));
+    CompletableFuture<Integer> runIceAdapterFuture = taskService.submitFutureTask("iceAdapter.connecting", () -> startIceAdapter(uid));
+
+    return CompletableFuture.allOf(downloadMapFuture, loadLeagueInfoFuture, runReplayServerFuture, runIceAdapterFuture)
+                            .thenApply(_ -> gameMapper.map(gameLaunchResponse, loadLeagueInfoFuture.join()))
+                            .thenApply(parameters -> launchOnlineGame(parameters, runIceAdapterFuture.join(),
+                                                                      runReplayServerFuture.join()))
+                            .whenCompleteAsync((process, _) -> {
                               if (process != null) {
                                 this.process.set(process);
                                 runningGameId.set(uid);
@@ -483,7 +485,7 @@ private Optional<Parent> getAnalysisButtonIfNecessary(Optional<String> logFileCo
         infoIcon.getStyleClass().add("info-icon");
         final Button showAnalysisBtn = new Button(i18n.get("game.log.analysis.solutionBtn"), infoIcon);
         showAnalysisBtn.setDefaultButton(true);
-        showAnalysisBtn.setOnAction(event -> notificationService.addNotification(
+        showAnalysisBtn.setOnAction(_ -> notificationService.addNotification(
             new ImmediateNotification(i18n.get("game.log.analysis"), message.toString(), WARN, actions)));
 
         return showAnalysisBtn;
@@ -509,7 +511,7 @@ public void launchTutorial(MapVersion mapVersion, String technicalMapName) {
     }
 
     if (!preferencesService.hasValidGamePath()) {
-      gamePathHandler.chooseAndValidateGameDirectory().thenAccept(path -> launchTutorial(mapVersion, technicalMapName));
+      gamePathHandler.chooseAndValidateGameDirectory().thenAccept(_ -> launchTutorial(mapVersion, technicalMapName));
       return;
     }
 
@@ -547,12 +549,12 @@ public void startOffline() {
     }
 
     if (!preferencesService.hasValidGamePath()) {
-      gamePathHandler.chooseAndValidateGameDirectory().thenAccept(path -> startOffline());
+      gamePathHandler.chooseAndValidateGameDirectory().thenAccept(_ -> startOffline());
       return;
     }
 
     CompletableFuture.supplyAsync(() -> forgedAllianceLaunchService.launchOfflineGame(null))
-                     .whenCompleteAsync((process, throwable) -> {
+                     .whenCompleteAsync((process, _) -> {
                        if (process != null) {
                          this.process.set(process);
                        }

src/main/java/com/faforever/client/map/MapService.java

@@ -632,17 +632,14 @@ public Mono<Void> downloadAllMatchmakerMaps(MatchmakerQueueInfo matchmakerQueue)
   }
 
   @Cacheable(value = CacheNames.MATCHMAKER_POOLS, sync = true)
-  public Mono <java.util.Map<MatchmakerQueueMapPool, List<MapVersion>>> getMatchmakerBrackets(MatchmakerQueueInfo matchmakerQueue) {
+  public Mono <java.util.Map<MatchmakerQueueMapPool, List<com.faforever.client.domain.api.MapPoolAssignment>>> getMatchmakerBrackets(MatchmakerQueueInfo matchmakerQueue) {
     ElideNavigatorOnCollection<MapPoolAssignment> navigator = ElideNavigator
         .of(MapPoolAssignment.class).collection()
         .setFilter(qBuilder().intNum("mapPool.matchmakerQueueMapPool.matchmakerQueue.id").eq(matchmakerQueue.getId()));
 
     return fafApiAccessor.getMany(navigator)
                          .map(matchmakerMapper::map)
-                         .collect(Collectors.groupingBy(assignment -> assignment.mapPool().mapPool(),
-                                                        Collectors.mapping(
-                                                            com.faforever.client.domain.api.MapPoolAssignment::mapVersion,
-                                                            Collectors.toList())));
+                         .collect(Collectors.groupingBy(assignment -> assignment.mapPool().mapPool()));
 
   }
 

src/main/java/com/faforever/client/player/PrivatePlayerInfoController.java

@@ -1,7 +1,6 @@
 package com.faforever.client.player;
 
 import com.faforever.client.achievements.AchievementService;
-import com.faforever.client.chat.ChatChannelUser;
 import com.faforever.client.domain.api.Leaderboard;
 import com.faforever.client.domain.server.GameInfo;
 import com.faforever.client.domain.server.PlayerInfo;
@@ -18,7 +17,6 @@
 import com.faforever.commons.lobby.GameStatus;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
@@ -34,7 +32,6 @@
 import reactor.core.publisher.Mono;
 import reactor.function.TupleUtils;
 
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Component
@@ -63,14 +60,7 @@ public class PrivatePlayerInfoController extends NodeController<Node> {
   public Label unlockedAchievementsLabel;
   public Separator separator;
 
-  private final ObjectProperty<ChatChannelUser> chatUser = new SimpleObjectProperty<>();
-
-  private final ChangeListener<PlayerInfo> playerChangeListener = (observable, oldValue, newValue) -> {
-    if (newValue != null && !Objects.equals(oldValue, newValue)) {
-      loadReceiverRatingInformation(newValue);
-      populateUnlockedAchievementsLabel(newValue);
-    }
-  };
+  private final ObjectProperty<PlayerInfo> player = new SimpleObjectProperty<>();
 
   @Override
   public Node getRoot() {
@@ -85,8 +75,7 @@ protected void onInitialize() {
     gameDetailController.setPlaytimeVisible(true);
     gameDetailWrapper.setVisible(false);
 
-    ObservableValue<Boolean> playerExistsProperty = chatUser.flatMap(user -> user.playerProperty().isNotNull())
-                                                            .when(showing);
+    ObservableValue<Boolean> playerExistsProperty = player.isNotNull().when(showing);
     userImageView.visibleProperty().bind(playerExistsProperty);
     country.visibleProperty().bind(playerExistsProperty);
     ratingsLabels.visibleProperty().bind(playerExistsProperty);
@@ -96,36 +85,30 @@ protected void onInitialize() {
     unlockedAchievements.visibleProperty().bind(playerExistsProperty);
     unlockedAchievementsLabel.visibleProperty().bind(playerExistsProperty);
 
-    ObservableValue<PlayerInfo> playerObservable = chatUser.flatMap(ChatChannelUser::playerProperty);
-
     gamesPlayed.textProperty()
-               .bind(playerObservable.flatMap(PlayerInfo::numberOfGamesProperty).map(i18n::number).when(showing));
+               .bind(player.flatMap(PlayerInfo::numberOfGamesProperty).map(i18n::number).when(showing));
 
-    username.textProperty().bind(chatUser.map(ChatChannelUser::getUsername).when(showing));
+    username.textProperty().bind(player.map(PlayerInfo::getUsername).when(showing));
     country.textProperty()
-           .bind(
-               playerObservable.flatMap(PlayerInfo::countryProperty).map(i18n::getCountryNameLocalized).when(showing));
+           .bind(player.flatMap(PlayerInfo::countryProperty).map(i18n::getCountryNameLocalized).when(showing));
     userImageView.imageProperty()
-                 .bind(playerObservable.map(PlayerInfo::getId).map(IdenticonUtil::createIdenticon).when(showing));
-    ObservableValue<GameInfo> gameObservable = playerObservable.flatMap(PlayerInfo::gameProperty);
+                 .bind(player.map(PlayerInfo::getId).map(IdenticonUtil::createIdenticon).when(showing));
+    ObservableValue<GameInfo> gameObservable = player.flatMap(PlayerInfo::gameProperty);
     gameDetailController.gameProperty().bind(gameObservable.when(showing));
     gameDetailWrapper.visibleProperty().bind(gameObservable.flatMap(GameInfo::statusProperty)
                                          .map(status -> status == GameStatus.OPEN || status == GameStatus.PLAYING)
                                          .orElse(false)
                                          .when(showing));
-    chatUser.flatMap(ChatChannelUser::playerProperty).addListener(playerChangeListener);
-  }
-
-  public void setChatUser(ChatChannelUser chatUser) {
-    this.chatUser.set(chatUser);
-  }
-
-  public ChatChannelUser getChatUser() {
-    return chatUser.get();
+    player.when(showing).subscribe((playerInfo) -> {
+        if (playerInfo != null) {
+          loadReceiverRatingInformation(playerInfo);
+          populateUnlockedAchievementsLabel(playerInfo);
+        }
+    });
   }
 
-  public ObjectProperty<ChatChannelUser> chatUserProperty() {
-    return chatUser;
+  public ObjectProperty<PlayerInfo> playerProperty() {
+    return player;
   }
 
   private void populateUnlockedAchievementsLabel(PlayerInfo player) {

src/main/java/com/faforever/client/preferences/MatchmakerPrefs.java

@@ -2,9 +2,11 @@
 
 import com.faforever.commons.lobby.Faction;
 import javafx.collections.ObservableList;
+import javafx.collections.ObservableMap;
 import javafx.collections.ObservableSet;
 
 import static javafx.collections.FXCollections.observableArrayList;
+import static javafx.collections.FXCollections.observableHashMap;
 import static javafx.collections.FXCollections.observableSet;
 
 
@@ -13,11 +15,18 @@ public class MatchmakerPrefs {
                                                                        Faction.SERAPHIM);
   private final ObservableSet<Integer> unselectedQueueIds = observableSet();
 
+  private final ObservableMap<VetoKey, Integer> appliedVetoes = observableHashMap();
+
   public ObservableList<Faction> getFactions() {
     return factions;
   }
 
   public ObservableSet<Integer> getUnselectedQueueIds() {
     return unselectedQueueIds;
   }
+
+  public ObservableMap<VetoKey, Integer> getAppliedVetoes() {
+    return appliedVetoes;
+  }
+
 }

src/main/java/com/faforever/client/preferences/VetoKey.java

@@ -0,0 +1,14 @@
+package com.faforever.client.preferences;
+
+import com.faforever.client.domain.api.MapPoolAssignment;
+
+public record VetoKey(
+    int matchmakerQueueMapPoolId,
+    int mapPoolMapVersionId
+) {
+
+  public static VetoKey of(MapPoolAssignment assignment) {
+    return new VetoKey(assignment.mapPool().mapPool().id(), assignment.id());
+  }
+
+}