From c3bc62f1e1edcfe7b095492e38993a49a2a4cce3 Mon Sep 17 00:00:00 2001 From: heavyrian2012 Date: Fri, 10 Mar 2023 10:48:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E8=81=8A=E4=BC=9A=E8=AF=9D=E5=8F=91?= =?UTF-8?q?=E9=80=81=E5=AE=9A=E5=90=91=E6=B6=88=E6=81=AF=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=88=86=E5=8F=91=E7=9B=AE=E6=A0=87=E9=9C=80=E8=A6=81=E5=8C=85?= =?UTF-8?q?=E6=8B=AC=E8=87=AA=E5=B7=B1=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/moquette/persistence/MemoryMessagesStore.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java index f74d3bfe..bf826d5d 100755 --- a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java +++ b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java @@ -585,21 +585,17 @@ public class MemoryMessagesStore implements IMessagesStore { int pullType = ProtoConstants.PullType.Pull_Normal; if (type == ProtoConstants.ConversationType.ConversationType_Private) { + notifyReceivers.add(fromUser); if(message.getToCount() > 0) { - if(message.getToList().contains(fromUser)) { - notifyReceivers.add(fromUser); - } if(message.getToList().contains(message.getConversation().getTarget())) { notifyReceivers.add(message.getConversation().getTarget()); } } else { - notifyReceivers.add(fromUser); notifyReceivers.add(message.getConversation().getTarget()); } pullType = ProtoConstants.PullType.Pull_Normal; } else if (type == ProtoConstants.ConversationType.ConversationType_Group) { notifyReceivers.add(fromUser); - if (!StringUtil.isNullOrEmpty(message.getToUser())) { notifyReceivers.add(message.getToUser()); } else if(message.getToList()!=null && !message.getToList().isEmpty()) { @@ -625,9 +621,6 @@ public class MemoryMessagesStore implements IMessagesStore { } } } - - //如果是群助手的消息，返回pull type group，否则返回normal - //群助手还没有实现 pullType = ProtoConstants.PullType.Pull_Normal; } else if (type == ProtoConstants.ConversationType.ConversationType_ChatRoom) { boolean isDirect = !StringUtil.isNullOrEmpty(message.getToUser());