修正发送消息给指定频道目标错误问题
This commit is contained in:
@@ -10,6 +10,7 @@ package com.xiaoleilu.loServer.action.channel;
|
|||||||
|
|
||||||
|
|
||||||
import cn.wildfirechat.common.APIPath;
|
import cn.wildfirechat.common.APIPath;
|
||||||
|
import cn.wildfirechat.pojos.SendChannelMessageData;
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
import com.xiaoleilu.loServer.RestResult;
|
import com.xiaoleilu.loServer.RestResult;
|
||||||
import com.xiaoleilu.loServer.annotation.HttpMethod;
|
import com.xiaoleilu.loServer.annotation.HttpMethod;
|
||||||
@@ -44,11 +45,15 @@ public class SendMessageAction extends ChannelAction {
|
|||||||
@Override
|
@Override
|
||||||
public boolean action(Request request, Response response) {
|
public boolean action(Request request, Response response) {
|
||||||
if (request.getNettyRequest() instanceof FullHttpRequest) {
|
if (request.getNettyRequest() instanceof FullHttpRequest) {
|
||||||
SendMessageData sendMessageData = getRequestBody(request.getNettyRequest(), SendMessageData.class);
|
SendChannelMessageData sendChannelMessageData = getRequestBody(request.getNettyRequest(), SendChannelMessageData.class);
|
||||||
|
SendMessageData sendMessageData = new SendMessageData();
|
||||||
sendMessageData.setConv(new Conversation());
|
sendMessageData.setConv(new Conversation());
|
||||||
sendMessageData.getConv().setType(ConversationType_Channel);
|
sendMessageData.getConv().setType(ConversationType_Channel);
|
||||||
sendMessageData.getConv().setTarget(channelInfo.getTargetId());
|
sendMessageData.getConv().setTarget(channelInfo.getTargetId());
|
||||||
|
sendMessageData.getConv().setLine(sendChannelMessageData.getLine());
|
||||||
sendMessageData.setSender(channelInfo.getOwner());
|
sendMessageData.setSender(channelInfo.getOwner());
|
||||||
|
sendMessageData.setPayload(sendChannelMessageData.getPayload());
|
||||||
|
sendMessageData.setToUsers(sendChannelMessageData.getTargets());
|
||||||
if (SendMessageData.isValide(sendMessageData)) {
|
if (SendMessageData.isValide(sendMessageData)) {
|
||||||
RPCCenter.getInstance().sendRequest(sendMessageData.getSender(), null, IMTopic.SendMessageTopic, sendMessageData.toProtoMessage().toByteArray(), sendMessageData.getSender(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
|
RPCCenter.getInstance().sendRequest(sendMessageData.getSender(), null, IMTopic.SendMessageTopic, sendMessageData.toProtoMessage().toByteArray(), sendMessageData.getSender(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -258,8 +258,17 @@ public class MemoryMessagesStore implements IMessagesStore {
|
|||||||
|
|
||||||
if (!StringUtil.isNullOrEmpty(message.getToUser())) {
|
if (!StringUtil.isNullOrEmpty(message.getToUser())) {
|
||||||
notifyReceivers.add(message.getToUser());
|
notifyReceivers.add(message.getToUser());
|
||||||
} else if(!message.getToList().isEmpty()) {
|
} else if(message.getToList()!=null && !message.getToList().isEmpty()) {
|
||||||
notifyReceivers.addAll(message.getToList());
|
MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
|
||||||
|
Collection<WFCMessage.GroupMember> members = groupMembers.get(message.getConversation().getTarget());
|
||||||
|
if (members == null || members.size() == 0) {
|
||||||
|
members = loadGroupMemberFromDB(hzInstance, message.getConversation().getTarget());
|
||||||
|
}
|
||||||
|
for (WFCMessage.GroupMember member : members) {
|
||||||
|
if (member.getType() != GroupMemberType_Removed && message.getToList().contains(member.getMemberId())) {
|
||||||
|
notifyReceivers.add(member.getMemberId());
|
||||||
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
|
MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
|
||||||
Collection<WFCMessage.GroupMember> members = groupMembers.get(message.getConversation().getTarget());
|
Collection<WFCMessage.GroupMember> members = groupMembers.get(message.getConversation().getTarget());
|
||||||
@@ -296,14 +305,20 @@ public class MemoryMessagesStore implements IMessagesStore {
|
|||||||
if (channelInfo != null) {
|
if (channelInfo != null) {
|
||||||
notifyReceivers.add(fromUser);
|
notifyReceivers.add(fromUser);
|
||||||
if (channelInfo.getOwner().equals(fromUser)) {
|
if (channelInfo.getOwner().equals(fromUser)) {
|
||||||
|
MultiMap<String, String> listeners = hzInstance.getMultiMap(CHANNEL_LISTENERS);
|
||||||
if (StringUtil.isNullOrEmpty(message.getToUser())) {
|
if (StringUtil.isNullOrEmpty(message.getToUser())) {
|
||||||
MultiMap<String, String> listeners = hzInstance.getMultiMap(CHANNEL_LISTENERS);
|
|
||||||
notifyReceivers.addAll(listeners.get(message.getConversation().getTarget()));
|
|
||||||
} else {
|
|
||||||
MultiMap<String, String> listeners = hzInstance.getMultiMap(CHANNEL_LISTENERS);
|
|
||||||
if (listeners.values().contains(message.getToUser())) {
|
if (listeners.values().contains(message.getToUser())) {
|
||||||
notifyReceivers.add(message.getToUser());
|
notifyReceivers.add(message.getToUser());
|
||||||
}
|
}
|
||||||
|
} else if(message.getToList() != null && !message.getToList().isEmpty()) {
|
||||||
|
Collection<String> ls = listeners.get(message.getConversation().getTarget());
|
||||||
|
for (String to:message.getToList()) {
|
||||||
|
if (ls.contains(to)) {
|
||||||
|
notifyReceivers.add(to);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
notifyReceivers.addAll(listeners.get(message.getConversation().getTarget()));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (StringUtil.isNullOrEmpty(channelInfo.getCallback()) || channelInfo.getAutomatic() == 0) {
|
if (StringUtil.isNullOrEmpty(channelInfo.getCallback()) || channelInfo.getAutomatic() == 0) {
|
||||||
|
|||||||
@@ -12,10 +12,13 @@ import cn.wildfirechat.proto.ProtoConstants;
|
|||||||
import cn.wildfirechat.proto.WFCMessage;
|
import cn.wildfirechat.proto.WFCMessage;
|
||||||
import io.netty.util.internal.StringUtil;
|
import io.netty.util.internal.StringUtil;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public class SendMessageData {
|
public class SendMessageData {
|
||||||
private String sender;
|
private String sender;
|
||||||
private Conversation conv;
|
private Conversation conv;
|
||||||
private MessagePayload payload;
|
private MessagePayload payload;
|
||||||
|
private List<String> toUsers;
|
||||||
|
|
||||||
public String getSender() {
|
public String getSender() {
|
||||||
return sender;
|
return sender;
|
||||||
@@ -41,6 +44,14 @@ public class SendMessageData {
|
|||||||
this.payload = payload;
|
this.payload = payload;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<String> getToUsers() {
|
||||||
|
return toUsers;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setToUsers(List<String> toUsers) {
|
||||||
|
this.toUsers = toUsers;
|
||||||
|
}
|
||||||
|
|
||||||
public static boolean isValide(SendMessageData sendMessageData) {
|
public static boolean isValide(SendMessageData sendMessageData) {
|
||||||
if(sendMessageData == null ||
|
if(sendMessageData == null ||
|
||||||
sendMessageData.getConv() == null ||
|
sendMessageData.getConv() == null ||
|
||||||
@@ -55,10 +66,18 @@ public class SendMessageData {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public WFCMessage.Message toProtoMessage() {
|
public WFCMessage.Message toProtoMessage() {
|
||||||
return WFCMessage.Message.newBuilder().setFromUser(sender)
|
if (toUsers != null && toUsers.size() > 0) {
|
||||||
.setConversation(WFCMessage.Conversation.newBuilder().setType(conv.getType()).setTarget(conv.getTarget()).setLine(conv.getLine()))
|
return WFCMessage.Message.newBuilder().setFromUser(sender)
|
||||||
.setContent(payload.toProtoMessageContent())
|
.setConversation(WFCMessage.Conversation.newBuilder().setType(conv.getType()).setTarget(conv.getTarget()).setLine(conv.getLine()))
|
||||||
.build();
|
.setContent(payload.toProtoMessageContent())
|
||||||
|
.addAllTo(toUsers)
|
||||||
|
.build();
|
||||||
|
} else {
|
||||||
|
return WFCMessage.Message.newBuilder().setFromUser(sender)
|
||||||
|
.setConversation(WFCMessage.Conversation.newBuilder().setType(conv.getType()).setTarget(conv.getTarget()).setLine(conv.getLine()))
|
||||||
|
.setContent(payload.toProtoMessageContent())
|
||||||
|
.build();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static SendMessageData fromProtoMessage(WFCMessage.Message protoMessage) {
|
public static SendMessageData fromProtoMessage(WFCMessage.Message protoMessage) {
|
||||||
|
|||||||
Reference in New Issue
Block a user