Fix the delivery date of forwarded messages should be the server time #…

…1591 + Return an error instead of ok if the message for forwarding was not found
turms-im · Dec 12, 2024 · 4d52252 · 4d52252
1 parent 1cd1745
commit 4d52252
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 17 deletions.
diff --git a/...rms/service/domain/message/access/servicerequest/controller/MessageServiceController.java b/...rms/service/domain/message/access/servicerequest/controller/MessageServiceController.java
@@ -142,8 +142,6 @@ public ClientRequestHandler handleCreateMessageRequest() {
                         clientRequest.userId(),
                         clientRequest.clientIp(),
                         request.getMessageId(),
-                        isGroupMessage,
-                        false,
                         targetId);
             } else {
                 List<byte[]> records = null;

diff --git a/turms-service/src/main/java/im/turms/service/domain/message/service/MessageService.java b/turms-service/src/main/java/im/turms/service/domain/message/service/MessageService.java
@@ -127,6 +127,9 @@ public class MessageService extends BaseService {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(MessageService.class);
 
+    private static final Mono<MessageAndRecipientIds> ERROR_NOT_MESSAGE_RECIPIENT_OR_SENDER_TO_FORWARD_MESSAGE =
+            Mono.error(ResponseException.get(NOT_MESSAGE_RECIPIENT_OR_SENDER_TO_FORWARD_MESSAGE));
+
     private static final Method GET_MESSAGES_TO_DELETE_METHOD;
 
     private final MessageRepository messageRepository;
@@ -1260,32 +1263,32 @@ public Mono<MessageAndRecipientIds> authAndCloneAndSaveMessage(
             @NotNull Long requesterId,
             @Nullable byte[] requesterIp,
             @NotNull Long referenceId,
-            @NotNull Boolean isGroupMessage,
-            @NotNull Boolean isSystemMessage,
             @NotNull Long targetId) {
         return queryMessage(referenceId).flatMap(message -> isMessageRecipientOrSender(requesterId,
                 message.getIsGroupMessage(),
                 message.getTargetId(),
                 message.getSenderId()).flatMap(isMessageRecipientOrSender -> {
                     if (!isMessageRecipientOrSender) {
-                        return Mono.error(ResponseException
-                                .get(NOT_MESSAGE_RECIPIENT_OR_SENDER_TO_FORWARD_MESSAGE));
+                        return ERROR_NOT_MESSAGE_RECIPIENT_OR_SENDER_TO_FORWARD_MESSAGE;
                     }
                     return authAndSaveMessage(queryRecipientIds,
                             null,
                             node.nextLargeGapId(ServiceType.MESSAGE),
                             requesterId,
                             requesterIp,
                             targetId,
-                            isGroupMessage,
-                            isSystemMessage,
+                            message.getIsGroupMessage(),
+                            message.getIsSystemMessage(),
                             message.getText(),
                             message.getRecords(),
                             message.getBurnAfter(),
-                            message.getDeliveryDate(),
+                            null,
                             referenceId,
                             null);
-                }));
+                }))
+                // We should not tell the client that the message was not found.
+                // Otherwise, the user can check if any message exists or not.
+                .switchIfEmpty(ERROR_NOT_MESSAGE_RECIPIENT_OR_SENDER_TO_FORWARD_MESSAGE);
     }
 
     public Mono<MessageAndRecipientIds> cloneAndSaveMessage(
@@ -1429,13 +1432,7 @@ private Mono<Void> saveAndSendMessage0(
                             deliveryDate,
                             null,
                             preMessageId)
-                    : authAndCloneAndSaveMessage(send,
-                            senderId,
-                            senderIp,
-                            referenceId,
-                            isGroupMessage,
-                            isSystemMessage,
-                            targetId);
+                    : authAndCloneAndSaveMessage(send, senderId, senderIp, referenceId, targetId);
         } else {
             saveMono = referenceId == null
                     ? saveMessage(send,