Only notify friend joined on addition to game

FAForever · Mar 5, 2023 · 1c672a6 · 1c672a6
1 parent 31a49ad
commit 1c672a6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 22 deletions.
diff --git a/src/main/java/com/faforever/client/domain/GameBean.java b/src/main/java/com/faforever/client/domain/GameBean.java
@@ -86,13 +86,6 @@ public class GameBean {
 
   Set<ChangeListener<Set<Integer>>> playerChangeListeners = new HashSet<>();
 
-  ChangeListener<Set<PlayerBean>> playerChangeListener = (observable, oldValue, newValue) -> {
-    Set<PlayerBean> playersToRemove = oldValue.stream().filter(player -> !newValue.contains(player)).collect(Collectors.toSet());
-    Set<PlayerBean> playersToAdd = newValue.stream().filter(player -> !oldValue.contains(player)).collect(Collectors.toSet());
-    playersToRemove.stream().filter(player -> equals(player.getGame())).forEach(player -> player.setGame(null));
-    playersToAdd.forEach(player -> player.setGame(this));
-  };
-
   public String getHost() {
     return host.get();
   }

diff --git a/src/main/java/com/faforever/client/game/GameService.java b/src/main/java/com/faforever/client/game/GameService.java
@@ -48,7 +48,6 @@
 import com.faforever.client.util.MaskPatternLayout;
 import com.faforever.commons.lobby.GameInfo;
 import com.faforever.commons.lobby.GameStatus;
-import com.faforever.commons.lobby.GameType;
 import com.faforever.commons.lobby.GameVisibility;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.eventbus.EventBus;
@@ -228,8 +227,6 @@ public void afterPropertiesSet() {
             .switchIfEmpty(initializeGameBean(gameInfo))))
         .publishOn(javaFxService.getFxApplicationScheduler())
         .map(TupleUtils.function(gameMapper::update))
-        .publishOn(javaFxService.getSingleScheduler())
-        .doOnNext(this::notifyIfFriendJoinedGame)
         .doOnError(throwable -> log.error("Error processing game", throwable))
         .retry()
         .share();
@@ -284,21 +281,15 @@ private ChangeListener<Set<Integer>> generatePlayerChangeListener(GameBean newGa
           .filter(player -> !oldValue.contains(player))
           .map(playerService::getPlayerByIdIfOnline)
           .flatMap(Optional::stream)
-          .forEach(player -> player.setGame(newGame));
+          .forEach(player -> {
+            player.setGame(newGame);
+            if (player.getSocialStatus() == SocialStatus.FRIEND) {
+              eventBus.post(new FriendJoinedGameEvent(player, newGame));
+            }
+          });
     };
   }
 
-  private void notifyIfFriendJoinedGame(GameBean game) {
-    if (game.getStatus() == GameStatus.OPEN && game.getGameType() != GameType.MATCHMAKER) {
-      game.getAllPlayersInGame()
-          .stream()
-          .map(playerService::getPlayerByIdIfOnline)
-          .flatMap(Optional::stream)
-          .filter(player -> player.getSocialStatus() == SocialStatus.FRIEND)
-          .forEach(player -> eventBus.post(new FriendJoinedGameEvent(player, game)));
-    }
-  }
-
   private InvalidationListener generateNumberOfPlayersChangeListener(GameBean game) {
     return new InvalidationListener() {
       @Override