use player info instead of chat user to display player info

Author: Marc-Spector

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

@@ -3,23 +3,27 @@
 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;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.Tab;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.Region;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
+@Slf4j
 @Component
 @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class PrivateChatTabController extends AbstractChatTabController {
 
   private final AvatarService avatarService;
+  private final PlayerService playerService;
 
   public Tab privateChatTabRoot;
   public ImageView avatarImageView;
@@ -29,9 +33,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 +51,10 @@ 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> playerProperty = channelName.map(playerName -> playerService.getPlayerByNameIfOnline(playerName).orElse(null));
+    privatePlayerInfoController.getPlayerProperty().bind(playerProperty.when(showing));
 
-    avatarImageView.imageProperty().bind(chatUser
-                                             .flatMap(ChatChannelUser::playerProperty)
-                                             .flatMap(PlayerInfo::avatarProperty)
-                                             .map(avatarService::loadAvatar).when(showing));
+    avatarImageView.imageProperty().bind(playerProperty.flatMap(PlayerInfo::avatarProperty).map(avatarService::loadAvatar).when(showing));
   }
 
   @Override

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;
@@ -25,6 +24,7 @@
 import javafx.scene.control.Separator;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.Pane;
+import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -63,7 +63,8 @@ public class PrivatePlayerInfoController extends NodeController<Node> {
   public Label unlockedAchievementsLabel;
   public Separator separator;
 
-  private final ObjectProperty<ChatChannelUser> chatUser = new SimpleObjectProperty<>();
+  @Getter
+  private final ObjectProperty<PlayerInfo> playerProperty = new SimpleObjectProperty<>();
 
   private final ChangeListener<PlayerInfo> playerChangeListener = (observable, oldValue, newValue) -> {
     if (newValue != null && !Objects.equals(oldValue, newValue)) {
@@ -85,8 +86,7 @@ protected void onInitialize() {
     gameDetailController.setPlaytimeVisible(true);
     gameDetailWrapper.setVisible(false);
 
-    ObservableValue<Boolean> playerExistsProperty = chatUser.flatMap(user -> user.playerProperty().isNotNull())
-                                                            .when(showing);
+    ObservableValue<Boolean> playerExistsProperty = playerProperty.isNotNull().when(showing);
     userImageView.visibleProperty().bind(playerExistsProperty);
     country.visibleProperty().bind(playerExistsProperty);
     ratingsLabels.visibleProperty().bind(playerExistsProperty);
@@ -96,36 +96,21 @@ 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(playerProperty.flatMap(PlayerInfo::numberOfGamesProperty).map(i18n::number).when(showing));
 
-    username.textProperty().bind(chatUser.map(ChatChannelUser::getUsername).when(showing));
+    username.textProperty().bind(playerProperty.map(PlayerInfo::getUsername).when(showing));
     country.textProperty()
-           .bind(
-               playerObservable.flatMap(PlayerInfo::countryProperty).map(i18n::getCountryNameLocalized).when(showing));
+           .bind(playerProperty.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(playerProperty.map(PlayerInfo::getId).map(IdenticonUtil::createIdenticon).when(showing));
+    ObservableValue<GameInfo> gameObservable = playerProperty.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();
-  }
-
-  public ObjectProperty<ChatChannelUser> chatUserProperty() {
-    return chatUser;
+    playerProperty.addListener(playerChangeListener);
   }
 
   private void populateUnlockedAchievementsLabel(PlayerInfo player) {