单聊会话发送定向消息时,分发目标需要包括自己。
This commit is contained in:
@@ -585,21 +585,17 @@ public class MemoryMessagesStore implements IMessagesStore {
|
|||||||
int pullType = ProtoConstants.PullType.Pull_Normal;
|
int pullType = ProtoConstants.PullType.Pull_Normal;
|
||||||
|
|
||||||
if (type == ProtoConstants.ConversationType.ConversationType_Private) {
|
if (type == ProtoConstants.ConversationType.ConversationType_Private) {
|
||||||
|
notifyReceivers.add(fromUser);
|
||||||
if(message.getToCount() > 0) {
|
if(message.getToCount() > 0) {
|
||||||
if(message.getToList().contains(fromUser)) {
|
|
||||||
notifyReceivers.add(fromUser);
|
|
||||||
}
|
|
||||||
if(message.getToList().contains(message.getConversation().getTarget())) {
|
if(message.getToList().contains(message.getConversation().getTarget())) {
|
||||||
notifyReceivers.add(message.getConversation().getTarget());
|
notifyReceivers.add(message.getConversation().getTarget());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
notifyReceivers.add(fromUser);
|
|
||||||
notifyReceivers.add(message.getConversation().getTarget());
|
notifyReceivers.add(message.getConversation().getTarget());
|
||||||
}
|
}
|
||||||
pullType = ProtoConstants.PullType.Pull_Normal;
|
pullType = ProtoConstants.PullType.Pull_Normal;
|
||||||
} else if (type == ProtoConstants.ConversationType.ConversationType_Group) {
|
} else if (type == ProtoConstants.ConversationType.ConversationType_Group) {
|
||||||
notifyReceivers.add(fromUser);
|
notifyReceivers.add(fromUser);
|
||||||
|
|
||||||
if (!StringUtil.isNullOrEmpty(message.getToUser())) {
|
if (!StringUtil.isNullOrEmpty(message.getToUser())) {
|
||||||
notifyReceivers.add(message.getToUser());
|
notifyReceivers.add(message.getToUser());
|
||||||
} else if(message.getToList()!=null && !message.getToList().isEmpty()) {
|
} 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;
|
pullType = ProtoConstants.PullType.Pull_Normal;
|
||||||
} else if (type == ProtoConstants.ConversationType.ConversationType_ChatRoom) {
|
} else if (type == ProtoConstants.ConversationType.ConversationType_ChatRoom) {
|
||||||
boolean isDirect = !StringUtil.isNullOrEmpty(message.getToUser());
|
boolean isDirect = !StringUtil.isNullOrEmpty(message.getToUser());
|
||||||
|
|||||||
Reference in New Issue
Block a user