修复聊天时发送消息时，消息状态可能不对

wildfirechat · Oct 22, 2024 · c6d047f · c6d047f
1 parent 3ab0b4d
commit c6d047f
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/wfc/proto/proto.min.js b/src/wfc/proto/proto.min.js
@@ -2044,7 +2044,9 @@ class WfcImpl {
                 progressCB && progressCB(uploaded, total, insertedMsg.messageId);
             }, (remoteUrl) => {
                 insertedMsg.messageContent.remotePath = remoteUrl;
-                this.updateMessageContent(insertedMsg.messageId, insertedMsg.messageContent);
+                if (insertedMsg.messageId > 0) {
+                    this.updateMessageContent(insertedMsg.messageId, insertedMsg.messageContent);
+                }
                 protoProxy.invokeAsync('sendSavedMessage', insertedMsg.messageId, 0, (messageUid, timestamp) => {
                     messageUid = Long.fromValue(messageUid);
                     insertedMsg.messageUid = messageUid;
@@ -2104,12 +2106,12 @@ class WfcImpl {
                 message.timestamp = Long.fromValue(timestamp).toNumber();
                 // update remote url
                 if (message.messageContent instanceof MediaMessageContent) {
-                    let msg = self.getMessageById(message.messageId);
-                    message.messageContent = msg.messageContent;
-                }
-                if (message.conversation.type !== ConversationType.ChatRoom) {
-                    this.eventEmitter.emit(EventType.MessageStatusUpdate, message);
+                    if (message.messageId > 0) {
+                        let msg = self.getMessageById(message.messageId);
+                        message.messageContent = msg.messageContent;
+                    }
                 }
+                this.eventEmitter.emit(EventType.MessageStatusUpdate, message);
 
                 if (typeof successCB === 'function') {
                     successCB(Long.fromValue(messageUid), Long.fromValue(timestamp).toNumber());