From 014cd3844d69c3da823e74dd1102c36c5fef3cdc Mon Sep 17 00:00:00 2001 From: heavyrian2012 Date: Tue, 9 Aug 2022 15:39:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=91=E9=81=93=E5=8F=AA=E6=9C=89auto?= =?UTF-8?q?=E4=B8=BA1=E6=97=B6=E6=89=8D=E4=BC=9A=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=92=8C=E8=AE=A2=E9=98=85=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E3=80=82=E9=A2=91=E9=81=93=E5=8F=AA=E5=9B=9E=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=8F=91=E9=80=81=E7=9A=84=E6=B6=88=E6=81=AF=EF=BC=8C?= =?UTF-8?q?=E8=87=AA=E5=B7=B1=E5=8F=91=E9=80=81=E7=9A=84=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E4=B8=8D=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/moquette/spi/impl/MessagesPublisher.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java b/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java index 46607d83..7944fe9e 100755 --- a/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java +++ b/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java @@ -604,7 +604,7 @@ public class MessagesPublisher { public void publish2Receivers(WFCMessage.Message message, Set receivers, String exceptClientId, int pullType) { if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Channel) { WFCMessage.ChannelInfo channelInfo = m_messagesStore.getChannelInfo(message.getConversation().getTarget()); - if (channelInfo != null && !StringUtil.isNullOrEmpty(channelInfo.getCallback())) { + if (channelInfo != null && !StringUtil.isNullOrEmpty(channelInfo.getCallback()) && channelInfo.getAutomatic() == 1 && !message.getFromUser().equals(channelInfo.getOwner())) { OutputClient outputClient = null; if(m_messagesStore.isChannelCallbackWithClientInfo() && !StringUtil.isNullOrEmpty(exceptClientId)) { Session session = m_sessionsStore.getSession(exceptClientId); @@ -701,7 +701,7 @@ public class MessagesPublisher { } public void notifyChannelListenStatusChanged(WFCMessage.ChannelInfo channelInfo, String user, boolean listen) { - if (channelInfo == null || StringUtil.isNullOrEmpty(channelInfo.getCallback())) { + if (channelInfo == null || StringUtil.isNullOrEmpty(channelInfo.getCallback()) || channelInfo.getAutomatic() == 0) { return; }