Add reaction and reply capability to chat messages (#3111)

FAForever · Jan 10, 2024 · dc1c11a · dc1c11a
1 parent e9285eb
commit dc1c11a
Show file tree

Hide file tree

Showing 64 changed files with 1,738 additions and 543 deletions.
diff --git a/src/main/java/com/faforever/client/chat/ChannelTabController.java b/src/main/java/com/faforever/client/chat/ChannelTabController.java
@@ -26,7 +26,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import static com.faforever.client.fx.PlatformService.URL_REGEX_PATTERN;
+import static com.faforever.client.fx.PlatformService.STRICT_URL_REGEX_PATTERN;
 
 @Slf4j
 @Component
@@ -116,7 +116,7 @@ private void setChannelTopic(String content) {
     boolean notBlank = StringUtils.isNotBlank(content);
     if (notBlank) {
       Arrays.stream(content.split("\\s")).forEach(word -> {
-        if (URL_REGEX_PATTERN.matcher(word).matches()) {
+        if (STRICT_URL_REGEX_PATTERN.matcher(word).matches()) {
           Hyperlink link = new Hyperlink(word);
           link.setOnAction(event -> platformService.showDocument(word));
           children.add(link);

diff --git a/src/main/java/com/faforever/client/chat/ChatChannel.java b/src/main/java/com/faforever/client/chat/ChatChannel.java
@@ -1,6 +1,7 @@
 package com.faforever.client.chat;
 
 import com.faforever.client.chat.ChatMessage.Type;
+import com.faforever.client.chat.emoticons.Reaction;
 import com.faforever.client.fx.JavaFxUtil;
 import com.google.common.annotations.VisibleForTesting;
 import javafx.beans.Observable;
@@ -21,7 +22,9 @@
 
 import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
 
 @EqualsAndHashCode(onlyExplicitlyIncluded = true)
@@ -48,6 +51,7 @@ public class ChatChannel {
   private final ObjectProperty<ChannelTopic> topic = new SimpleObjectProperty<>(new ChannelTopic(null, ""));
   private final ObservableMap<String, ChatMessage> messagesById = FXCollections.synchronizedObservableMap(
       FXCollections.observableHashMap());
+  private final Map<String, Reaction> reactionsById = new ConcurrentHashMap<>();
   private final ObservableList<ChatMessage> rawMessages = JavaFxUtil.attachListToMap(
       FXCollections.synchronizedObservableList(FXCollections.observableArrayList()), messagesById);
   private final ObservableList<ChatMessage> messages = FXCollections.synchronizedObservableList(
@@ -145,6 +149,24 @@ public Optional<ChatChannelUser> getUser(String username) {
     return Optional.ofNullable(usernameToChatUser.get(username));
   }
 
+  public Optional<ChatMessage> getMessage(String id) {
+    return Optional.ofNullable(messagesById.get(id));
+  }
+
+  public void removeMessage(String messageId) {
+    messagesById.remove(messageId);
+    Reaction removedReaction = reactionsById.remove(messageId);
+    if (removedReaction == null) {
+      return;
+    }
+    ChatMessage reactedToMessage = messagesById.get(removedReaction.targetMessageId());
+    if (reactedToMessage == null) {
+      return;
+    }
+
+    reactedToMessage.removeReaction(removedReaction);
+  }
+
   public void removePendingMessage(String messageId) {
     messagesById.computeIfPresent(messageId,
                                   (ignored, chatMessage) -> chatMessage.getType() == Type.PENDING ? null : chatMessage);
@@ -155,6 +177,16 @@ public void addMessage(ChatMessage message) {
     pruneMessages();
   }
 
+  public void addReaction(Reaction reaction) {
+    ChatMessage targetMessage = messagesById.get(reaction.targetMessageId());
+    if (targetMessage == null) {
+      return;
+    }
+
+    targetMessage.addReaction(reaction);
+    reactionsById.put(reaction.messageId(), reaction);
+  }
+
   public ObservableList<ChatMessage> getMessages() {
     return messages;
   }

diff --git a/src/main/java/com/faforever/client/chat/ChatMessage.java b/src/main/java/com/faforever/client/chat/ChatMessage.java
@@ -1,5 +1,11 @@
 package com.faforever.client.chat;
 
+import com.faforever.client.chat.emoticons.Emoticon;
+import com.faforever.client.chat.emoticons.Reaction;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableMap;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -8,15 +14,58 @@
 
 @RequiredArgsConstructor
 @EqualsAndHashCode(onlyExplicitlyIncluded = true)
-@Getter
 public class ChatMessage {
 
   @EqualsAndHashCode.Include
+  @Getter
   private final String id;
+  @Getter
   private final Instant time;
+  @Getter
   private final ChatChannelUser sender;
+  @Getter
   private final String content;
+  @Getter
   private final Type type;
+  @Getter
+  private final ChatMessage targetMessage;
+
+  private final BooleanProperty open = new SimpleBooleanProperty();
+  private final ObservableMap<Emoticon, ObservableMap<String, String>> reactions = FXCollections.synchronizedObservableMap(
+      FXCollections.observableHashMap());
+  private final ObservableMap<Emoticon, ObservableMap<String, String>> unmodifiableReactions = FXCollections.unmodifiableObservableMap(
+      reactions);
+
+  public ObservableMap<Emoticon, ObservableMap<String, String>> getReactions() {
+    return unmodifiableReactions;
+  }
+
+  public void addReaction(Reaction reaction) {
+    reactions.computeIfAbsent(reaction.emoticon(),
+                              ignored -> FXCollections.synchronizedObservableMap(FXCollections.observableHashMap()))
+             .put(reaction.reactorName(), reaction.messageId());
+  }
+
+  public void removeReaction(Reaction reaction) {
+    ObservableMap<String, String> reactors = reactions.getOrDefault(reaction.emoticon(),
+                                                                    FXCollections.emptyObservableMap());
+    reactors.remove(reaction.reactorName());
+    if (reactors.isEmpty()) {
+      reactions.remove(reaction.emoticon());
+    }
+  }
+
+  public boolean isOpen() {
+    return open.get();
+  }
+
+  public BooleanProperty openProperty() {
+    return open;
+  }
+
+  public void setOpen(boolean open) {
+    this.open.set(open);
+  }
 
   public enum Type {
     MESSAGE, ACTION, PENDING