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:
heavyrian2012
2023-10-10 21:53:03 +08:00
parent c17a5be171
commit 8e3100e5b7
4 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/io/moquette/BrokerConstants.java
+2
View File
@@ -173,6 +173,8 @@ public final class BrokerConstants {
public static final String CHATROOM_Create_When_Not_Exist = "chatroom.create_when_not_exist";
public static final String GROUP_Allow_Owner_Recall_Self_Msg = "group.allow_owner_recall_self_msg";
public static final String GROUP_Allow_Manager_Recall_Self_Msg = "group.allow_manager_recall_self_msg";
public static final String GROUP_Allow_Client_Custom_Operation_Notification = "group.allow_client_custom_operation_notification";
public static final String GROUP_Allow_Robot_Custom_Operation_Notification = "group.allow_robot_custom_operation_notificatio";
broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
+35 -1
View File
@@ -180,6 +180,8 @@ public class MemoryMessagesStore implements IMessagesStore {
private String mChannelInfoUpdateCallback;
private String mChatroomInfoUpdateCallback;
private String mChatroomMemberUpdateCallback;
private boolean mGroupAllowOwnerRecallSelfMsg = false;
private boolean mGroupAllowManagerRecallSelfMsg = false;
private boolean mGroupAllowClientCustomOperationNotification;
private boolean mGroupAllowRobotCustomOperationNotification;
private int mGroupVisibleQuitKickoffNotification;
@@ -468,6 +470,17 @@ public class MemoryMessagesStore implements IMessagesStore {
}
try {
mGroupAllowOwnerRecallSelfMsg = Boolean.parseBoolean(server.getConfig().getProperty(GROUP_Allow_Owner_Recall_Self_Msg, "true"));
} catch (Exception e) {
}
try {
mGroupAllowManagerRecallSelfMsg = Boolean.parseBoolean(server.getConfig().getProperty(GROUP_Allow_Manager_Recall_Self_Msg, "false"));
} catch (Exception e) {
}
try {
mGroupAllowClientCustomOperationNotification = Boolean.parseBoolean(server.getConfig().getProperty(GROUP_Allow_Client_Custom_Operation_Notification));
} catch (Exception e) {
@@ -2232,7 +2245,28 @@ public class MemoryMessagesStore implements IMessagesStore {
return ErrorCode.ERROR_CODE_RECALL_TIME_EXPIRED;
}
if (operatorId.equals(groupInfo.getOwner())) {
canRecall = true;
if(operatorId.equals(message.getFromUser())) {
if(mGroupAllowOwnerRecallSelfMsg) {
canRecall = true;
}
} else {
canRecall = true;
}
} else {
if(message.getFromUser().equals(operatorId) && mGroupAllowManagerRecallSelfMsg) {
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.getMemberId().equals(operatorId)) {
if (member.getType() == GroupMemberType_Manager || member.getType() == ProtoConstants.GroupMemberType.GroupMemberType_Owner) {
canRecall = true;
}
}
}
}
}
if(!canRecall && !message.getFromUser().equals(operatorId)) {