发送好友请求之后5分钟之内可以再次发送

2023-09-06 19:47:24 +08:00
parent a2ee6c87eb
commit ad5d4991c8
1 changed files with 6 additions and 2 deletions
@@ -3103,14 +3103,18 @@ public class MemoryMessagesStore implements IMessagesStore {
            }
        }

+        boolean alreadyExist = false;
        if (existRequest != null && existRequest.getStatus() != ProtoConstants.FriendRequestStatus.RequestStatus_Accepted && !isAdmin) {
+            alreadyExist = true;
            if (mFriendRequestDuration > 0 && System.currentTimeMillis() - existRequest.getUpdateDt() > mFriendRequestDuration) {
                if (existRequest.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Rejected
                    && System.currentTimeMillis() - existRequest.getUpdateDt() < mFriendRejectDuration) {
                    return ErrorCode.ERROR_CODE_FRIEND_REQUEST_BLOCKED;
                }
            } else {
-                return ErrorCode.ERROR_CODE_FRIEND_ALREADY_REQUEST;
+                if(System.currentTimeMillis() - existRequest.getUpdateDt() > 5 * 60 * 1000) {
+                    return ErrorCode.ERROR_CODE_FRIEND_ALREADY_REQUEST;
+                }
            }
        }

@@ -3132,7 +3136,7 @@ public class MemoryMessagesStore implements IMessagesStore {
            .setExtra(request.getExtra())
            .setStatus(ProtoConstants.FriendRequestStatus.RequestStatus_Sent)
            .setToReadStatus(false)
-            .setUpdateDt(System.currentTimeMillis())
+            .setUpdateDt(alreadyExist ? existRequest.getUpdateDt() : System.currentTimeMillis())
            .build();

        databaseStore.persistOrUpdateFriendRequest(newRequest);