anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改群管理逻辑错误

Browse Source
This commit is contained in:
heavyrain lee
2019-07-13 18:31:08 +08:00
parent 503a7ae18f
commit 5e13419c28
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
+6 -3
View File
@@ -637,13 +637,16 @@ public class MemoryMessagesStore implements IMessagesStore {
boolean isManager = false;
WFCMessage.GroupMember gm = getGroupMember(groupId, operator);
if (gm != null) {
if (gm.getType() == GroupMemberType_Removed) {
if (gm.getType() == GroupMemberType_Removed && !(memberList.size() == 1 && operator.equals(memberList.get(0).getMemberId()))) {
return ErrorCode.ERROR_CODE_NOT_IN_GROUP;
} else if (gm.getType() == GroupMemberType_Silent) {
return ErrorCode.ERROR_CODE_NOT_RIGHT;
}
isManager = (gm.getType() == GroupMemberType_Manager || gm.getType() == GroupMemberType_Owner);
isMember = true;
if (gm.getType() != GroupMemberType_Removed) {
isMember = true;
}
}
if (groupInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted && ((groupInfo.getOwner() == null || !groupInfo.getOwner().equals(operator)) && !isManager)) {
@@ -655,7 +658,7 @@ public class MemoryMessagesStore implements IMessagesStore {
}
}
if (!isMember) {
if (!isMember && !(memberList.size() == 1 && operator.equals(memberList.get(0).getMemberId()))) {
return ErrorCode.ERROR_CODE_NOT_IN_GROUP;
}
}