From fbc2351d82327f92c8cac9385173644f5a9af971 Mon Sep 17 00:00:00 2001 From: heavyrian2012 Date: Wed, 2 Oct 2024 20:07:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8F=AF=E4=BB=A5=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E7=A6=81=E6=AD=A2=E6=B7=BB=E5=8A=A0=E5=A5=BD=E5=8F=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/moquette/persistence/MemoryMessagesStore.java | 9 +++++++-- .../src/main/java/win/liyufan/im/UserSettingScope.java | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java index 88e56d1a..2a3091a6 100755 --- a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java +++ b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java @@ -75,7 +75,7 @@ import static io.moquette.BrokerConstants.*; import static io.moquette.server.Constants.MAX_CHATROOM_MESSAGE_QUEUE; import static io.moquette.server.Constants.MAX_MESSAGE_QUEUE; import static cn.wildfirechat.pojos.MyInfoType.*; -import static win.liyufan.im.UserSettingScope.kUserSettingAddFriendNoVerify; +import static win.liyufan.im.UserSettingScope.kUserSettingAddFriendStrategy; import static win.liyufan.im.UserSettingScope.kUserSettingPCOnline; public class MemoryMessagesStore implements IMessagesStore { @@ -3400,8 +3400,13 @@ public class MemoryMessagesStore implements IMessagesStore { HazelcastInstance hzInstance = m_Server.getHazelcastInstance(); MultiMap requestMap = hzInstance.getMultiMap(USER_FRIENDS_REQUEST); - WFCMessage.UserSettingEntry userSettingData = getUserSetting(request.getTargetUid(), kUserSettingAddFriendNoVerify, ""); + WFCMessage.UserSettingEntry userSettingData = getUserSetting(request.getTargetUid(), kUserSettingAddFriendStrategy, ""); boolean noVerify = userSettingData != null && "1".equals(userSettingData.getValue()); + boolean noAllow = userSettingData != null && "2".equals(userSettingData.getValue()); + + if(noAllow) { + return ErrorCode.ERROR_CODE_NOT_RIGHT; + } Collection requests = requestMap.get(userId); if (requests == null || requests.size() == 0) { diff --git a/broker/src/main/java/win/liyufan/im/UserSettingScope.java b/broker/src/main/java/win/liyufan/im/UserSettingScope.java index ffd26a36..7ab18494 100644 --- a/broker/src/main/java/win/liyufan/im/UserSettingScope.java +++ b/broker/src/main/java/win/liyufan/im/UserSettingScope.java @@ -20,5 +20,5 @@ public interface UserSettingScope { int kUserSettingPttSilent = 25; int kUserSettingGroupRemark = 26; int kUserSettingPrivacySearchable = 27; - int kUserSettingAddFriendNoVerify = 28; + int kUserSettingAddFriendStrategy = 28; }