update insertMessage

wildfirechat · Mar 30, 2021 · 6412b07 · 6412b07
1 parent 18b58da
commit 6412b07
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/client/src/main/java/cn/wildfirechat/remote/ChatManager.java b/client/src/main/java/cn/wildfirechat/remote/ChatManager.java
@@ -1424,14 +1424,20 @@ public Message insertMessage(Conversation conversation, String sender, long mess
         Message message = new Message();
         message.conversation = conversation;
         message.content = content;
-        message.sender = sender;
         message.status = status;
         message.messageUid = messageUid;
         message.serverTime = serverTime;
-        if (this.userId.equals(sender)) {
-            message.direction = MessageDirection.Send;
-        } else {
+
+        message.direction = MessageDirection.Send;
+        if(status.value() >= MessageStatus.Mentioned.value()){
             message.direction = MessageDirection.Receive;
+            if(conversation.type == Conversation.ConversationType.Single){
+                message.sender = conversation.target;
+            }else {
+                message.sender = sender;
+            }
+        }else {
+            message.sender = getUserId();
         }
 
         try {