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

解决grouptype为0时被删除用户还能修改群名称的问题

Browse Source
This commit is contained in:
heavyrian2012
2023-04-03 16:54:36 +08:00
parent b93c76c6c7
commit d40835aa18
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
+7 -4
View File
@@ -1632,13 +1632,17 @@ public class MemoryMessagesStore implements IMessagesStore {
return ErrorCode.ERROR_CODE_NOT_RIGHT;
}
WFCMessage.GroupMember gm = getGroupMember(groupId, operator);
if (gm == null || gm.getType() == GroupMemberType_Removed) {
return ErrorCode.ERROR_CODE_NOT_IN_GROUP;
}
if (oldInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted || oldInfo.getType() == ProtoConstants.GroupType.GroupType_Organization) {
boolean isAllow = false;
if ((oldInfo.getOwner() != null && oldInfo.getOwner().equals(operator))) {
isAllow = true;
} else {
WFCMessage.GroupMember gm = getGroupMember(groupId, operator);
if (gm != null && gm.getType() == GroupMemberType_Manager) {
if (gm.getType() == GroupMemberType_Manager) {
isAllow = true;
}
}
@@ -1649,9 +1653,8 @@ public class MemoryMessagesStore implements IMessagesStore {
if (oldInfo.getType() == ProtoConstants.GroupType.GroupType_Normal) {
if (!operator.equals(oldInfo.getOwner())) {
WFCMessage.GroupMember gm = getGroupMember(groupId, operator);
boolean isManager = false;
if (gm != null && gm.getType() == GroupMemberType_Manager) {
if (gm.getType() == GroupMemberType_Manager) {
isManager = true;
}
if (!isManager && modifyType != Modify_Group_Name && modifyType != Modify_Group_Portrait && modifyType != Modify_Group_Extra) {