From dd5b9b184729a6f69bd843f1d6de68e292236cbd Mon Sep 17 00:00:00 2001 From: heavyrian2012 Date: Fri, 29 Sep 2023 10:45:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=A5=BD=E5=8F=8B=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E8=A2=AB=E6=8B=92=E7=BB=9D=E5=90=8E=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E8=BF=98=E8=83=BD=E5=86=8D=E6=AC=A1=E8=AF=B7=E6=B1=82=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/moquette/persistence/MemoryMessagesStore.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java index 87ae2929..22f158a5 100755 --- a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java +++ b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java @@ -3112,12 +3112,12 @@ public class MemoryMessagesStore implements IMessagesStore { } if (existRequest != null && existRequest.getStatus() != ProtoConstants.FriendRequestStatus.RequestStatus_Accepted && !isAdmin) { - 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 { + if (existRequest.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Rejected + && System.currentTimeMillis() - existRequest.getUpdateDt() < mFriendRejectDuration) { + return ErrorCode.ERROR_CODE_FRIEND_REQUEST_BLOCKED; + } + + if (!(mFriendRequestDuration > 0 && System.currentTimeMillis() - existRequest.getUpdateDt() > mFriendRequestDuration)) { if(System.currentTimeMillis() - existRequest.getUpdateDt() > 5 * 60 * 1000) { return ErrorCode.ERROR_CODE_FRIEND_ALREADY_REQUEST; }