当禁止陌生人聊天时，添加例外允许用户id，用于比如管理员、文件助手等场景

2022-11-14 15:23:03 +08:00
parent 0b6612eacc
commit 88199189a2
4 changed files with 25 additions and 0 deletions
@@ -142,6 +142,7 @@ public class MemoryMessagesStore implements IMessagesStore {
    private boolean mMultiPlatformNotification = false;
    private boolean mMobileDefaultSilentWhenPCOnline = true;
    private boolean mDisableStrangerChat = false;
+    private Set<String> mAllowStrangerChatSet = new HashSet<>();

    private long mChatroomParticipantIdleTime = 900000;
    private boolean mChatroomRejoinWhenActive = true;
@@ -195,6 +196,18 @@ public class MemoryMessagesStore implements IMessagesStore {
            printMissConfigLog(MESSAGE_Disable_Stranger_Chat, mDisableStrangerChat + "");
        }

+        try {
+            String allowStrangerList = m_Server.getConfig().getProperty(BrokerConstants.MESSAGE_Allow_Stranger_Chat_List);
+            if(!StringUtil.isNullOrEmptyAfterTrim(allowStrangerList)) {
+                allowStrangerList = allowStrangerList.replace("，", ",");
+                for (String s : allowStrangerList.split(",")) {
+                    mAllowStrangerChatSet.add(s.trim());
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
        try {
            mMultiPlatformNotification = Boolean.parseBoolean(m_Server.getConfig().getProperty(BrokerConstants.SERVER_MULTI_PLATFROM_NOTIFICATION, "false"));
        } catch (Exception e) {
@@ -2800,6 +2813,11 @@ public class MemoryMessagesStore implements IMessagesStore {


        if (mDisableStrangerChat) {
+            //在禁止私聊时，是否是允许私聊的用户id
+            if(mAllowStrangerChatSet.contains(targetUser)) {
+                return ErrorCode.ERROR_CODE_SUCCESS;
+            }
+
            //在禁止私聊时，允许机器人，物联网设备及管理员进行私聊。
            IMap<String, WFCMessage.User> mUserMap = hzInstance.getMap(USERS);
            WFCMessage.User target = mUserMap.get(targetUser);