From b2bc616e18e0ec829fcdc90987ef318de6eecada Mon Sep 17 00:00:00 2001 From: "heavyrain.lee" Date: Sat, 11 May 2019 20:56:20 +0800 Subject: [PATCH] add groupid in group notification --- .../pojos/GroupNotificationBinaryContent.java | 21 +++++++++++++++++-- .../io/moquette/imhandler/AddGroupMember.java | 2 +- .../imhandler/CreateGroupHandler.java | 2 +- .../imhandler/DismissGroupHandler.java | 2 +- .../imhandler/KickoffGroupMember.java | 2 +- .../imhandler/ModifyGroupAliasHandler.java | 2 +- .../imhandler/ModifyGroupInfoHandler.java | 4 ++-- .../moquette/imhandler/QuitGroupHandler.java | 2 +- .../imhandler/TransferGroupHandler.java | 2 +- 9 files changed, 28 insertions(+), 11 deletions(-) diff --git a/broker/src/main/java/com/xiaoleilu/loServer/pojos/GroupNotificationBinaryContent.java b/broker/src/main/java/com/xiaoleilu/loServer/pojos/GroupNotificationBinaryContent.java index 20a83edb..e027a8eb 100644 --- a/broker/src/main/java/com/xiaoleilu/loServer/pojos/GroupNotificationBinaryContent.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/pojos/GroupNotificationBinaryContent.java @@ -16,6 +16,9 @@ import io.moquette.BrokerConstants; import java.util.List; public class GroupNotificationBinaryContent { + //groupId + private String g; + //operator private String o; @@ -28,19 +31,33 @@ public class GroupNotificationBinaryContent { //members private String m; - public GroupNotificationBinaryContent(String o, String n, String m) { + public GroupNotificationBinaryContent(String g, String o, String n, String m) { this.o = o; this.n = n; this.m = m; } - public GroupNotificationBinaryContent(String operator, String name, List members) { + public GroupNotificationBinaryContent(String g, String operator, String name, List members) { this.o = operator; this.n = name; this.ms = members; } + public String getG() { + return g; + } + public void setG(String g) { + this.g = g; + } + + public String getM() { + return m; + } + + public void setM(String m) { + this.m = m; + } public String getO() { return o; diff --git a/broker/src/main/java/io/moquette/imhandler/AddGroupMember.java b/broker/src/main/java/io/moquette/imhandler/AddGroupMember.java index b406d3c3..18921229 100644 --- a/broker/src/main/java/io/moquette/imhandler/AddGroupMember.java +++ b/broker/src/main/java/io/moquette/imhandler/AddGroupMember.java @@ -28,7 +28,7 @@ public class AddGroupMember extends GroupHandler 0) { sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent()); } else { - WFCMessage.MessageContent content = new GroupNotificationBinaryContent(fromUser, null, getMemberIdList(request.getAddedMemberList())).getAddGroupNotifyContent(); + WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, getMemberIdList(request.getAddedMemberList())).getAddGroupNotifyContent(); sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content); } } diff --git a/broker/src/main/java/io/moquette/imhandler/CreateGroupHandler.java b/broker/src/main/java/io/moquette/imhandler/CreateGroupHandler.java index 11819303..f84b8b51 100644 --- a/broker/src/main/java/io/moquette/imhandler/CreateGroupHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/CreateGroupHandler.java @@ -27,7 +27,7 @@ public class CreateGroupHandler extends GroupHandler 0) { sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), request.getNotifyContent()); } else { - WFCMessage.MessageContent content = new GroupNotificationBinaryContent(fromUser, groupInfo.getName(), "").getCreateGroupNotifyContent(); + WFCMessage.MessageContent content = new GroupNotificationBinaryContent(groupInfo.getTargetId(), fromUser, groupInfo.getName(), "").getCreateGroupNotifyContent(); sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), content); } } diff --git a/broker/src/main/java/io/moquette/imhandler/DismissGroupHandler.java b/broker/src/main/java/io/moquette/imhandler/DismissGroupHandler.java index 435c7e70..dda3cd80 100644 --- a/broker/src/main/java/io/moquette/imhandler/DismissGroupHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/DismissGroupHandler.java @@ -33,7 +33,7 @@ public class DismissGroupHandler extends GroupHandler 0) { sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), request.getNotifyContent()); } else { - WFCMessage.MessageContent content = new GroupNotificationBinaryContent(fromUser, null, "").getDismissGroupNotifyContent(); + WFCMessage.MessageContent content = new GroupNotificationBinaryContent(groupInfo.getTargetId(), fromUser, null, "").getDismissGroupNotifyContent(); sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content); } errorCode = m_messagesStore.dismissGroup(fromUser, request.getGroupId()); diff --git a/broker/src/main/java/io/moquette/imhandler/KickoffGroupMember.java b/broker/src/main/java/io/moquette/imhandler/KickoffGroupMember.java index 0f66d738..05a6436e 100644 --- a/broker/src/main/java/io/moquette/imhandler/KickoffGroupMember.java +++ b/broker/src/main/java/io/moquette/imhandler/KickoffGroupMember.java @@ -32,7 +32,7 @@ public class KickoffGroupMember extends GroupHandler 0) { sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), request.getNotifyContent()); } else { - WFCMessage.MessageContent content = new GroupNotificationBinaryContent(fromUser, null, request.getRemovedMemberList()).getKickokfMemberGroupNotifyContent(); + WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, request.getRemovedMemberList()).getKickokfMemberGroupNotifyContent(); sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content); } errorCode = m_messagesStore.kickoffGroupMembers(fromUser, request.getGroupId(), request.getRemovedMemberList()); diff --git a/broker/src/main/java/io/moquette/imhandler/ModifyGroupAliasHandler.java b/broker/src/main/java/io/moquette/imhandler/ModifyGroupAliasHandler.java index 775e76e4..1a182ca5 100644 --- a/broker/src/main/java/io/moquette/imhandler/ModifyGroupAliasHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/ModifyGroupAliasHandler.java @@ -26,7 +26,7 @@ public class ModifyGroupAliasHandler extends GroupHandler 0) { sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent()); } else { - WFCMessage.MessageContent content = new GroupNotificationBinaryContent(fromUser, request.getAlias(), "").getModifyGroupMemberAliasNotifyContent(); + WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getAlias(), "").getModifyGroupMemberAliasNotifyContent(); sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content); } } diff --git a/broker/src/main/java/io/moquette/imhandler/ModifyGroupInfoHandler.java b/broker/src/main/java/io/moquette/imhandler/ModifyGroupInfoHandler.java index e68d0eea..24359303 100644 --- a/broker/src/main/java/io/moquette/imhandler/ModifyGroupInfoHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/ModifyGroupInfoHandler.java @@ -30,9 +30,9 @@ public class ModifyGroupInfoHandler extends GroupHandler if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) { sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), request.getNotifyContent()); } else { - WFCMessage.MessageContent content = new GroupNotificationBinaryContent(fromUser, null, "").getQuitGroupNotifyContent(); + WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, "").getQuitGroupNotifyContent(); sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content); } errorCode = m_messagesStore.quitGroup(fromUser, request.getGroupId()); diff --git a/broker/src/main/java/io/moquette/imhandler/TransferGroupHandler.java b/broker/src/main/java/io/moquette/imhandler/TransferGroupHandler.java index 5a5bb6a3..7b934256 100644 --- a/broker/src/main/java/io/moquette/imhandler/TransferGroupHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/TransferGroupHandler.java @@ -26,7 +26,7 @@ public class TransferGroupHandler extends GroupHandler 0) { sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent()); } else { - WFCMessage.MessageContent content = new GroupNotificationBinaryContent(fromUser, null, request.getNewOwner()).getTransferGroupNotifyContent(); + WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, request.getNewOwner()).getTransferGroupNotifyContent(); sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content); } }