From cbb89bbfb5b2c3699103982194683ca4afd70097 Mon Sep 17 00:00:00 2001 From: heavyrian2012 Date: Sat, 7 May 2022 09:16:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=88=A0=E9=99=A4=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=97=B6=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AE=A2=E9=98=85=E9=80=9A=E7=9F=A5=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 --- .../main/java/io/moquette/imhandler/ChannelListenMember.java | 2 -- .../java/io/moquette/persistence/MemoryMessagesStore.java | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/broker/src/main/java/io/moquette/imhandler/ChannelListenMember.java b/broker/src/main/java/io/moquette/imhandler/ChannelListenMember.java index bb64745d..2fba0d46 100644 --- a/broker/src/main/java/io/moquette/imhandler/ChannelListenMember.java +++ b/broker/src/main/java/io/moquette/imhandler/ChannelListenMember.java @@ -27,8 +27,6 @@ public class ChannelListenMember extends IMHandler { if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) { WFCMessage.ModifyUserSettingReq modifyUserSettingReq = WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingListenedChannels).setKey(request.getChannelId()).setValue(request.getListen() > 0 ? "1" : "0").build(); mServer.onApiMessage(fromUser, null, modifyUserSettingReq.toByteArray(), 0, fromUser, PutUserSettingTopic, requestSourceType); - - publisher.notifyChannelListenStatusChanged(m_messagesStore.getChannelInfo(request.getChannelId()), fromUser, request.getListen() > 0); } return errorCode; } diff --git a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java index bc43440f..341d4a62 100755 --- a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java +++ b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java @@ -3813,7 +3813,7 @@ public class MemoryMessagesStore implements IMessagesStore { IMap mIMap = hzInstance.getMap(CHANNELS); WFCMessage.ChannelInfo channelInfo = mIMap.get(channelId); if(channelInfo != null && (channelInfo.getStatus() & ProtoConstants.ChannelState.Channel_State_Mask_Private) > 0) { - return ErrorCode.ERROR_CODE_NOT_RIGHT; + return ErrorCode.ERROR_CODE_NOT_EXIST; } try { @@ -3823,7 +3823,8 @@ public class MemoryMessagesStore implements IMessagesStore { } finally { mWriteLock.unlock(); } - + + IMHandler.getPublisher().notifyChannelListenStatusChanged(channelInfo, operator, listen); return ErrorCode.ERROR_CODE_SUCCESS; }