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:
heavyrain2012
2020-08-08 09:39:15 +08:00
parent a40950fb8c
commit b9b1a76d71
5 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/io/moquette/BrokerConstants.java
+2
View File
@@ -142,6 +142,8 @@ public final class BrokerConstants {
public static final String MESSAGES_DISABLE_REMOTE_SEARCH = "message.disable_remote_search";
public static final String MESSAGES_RECALL_TIME_LIMIT = "message.recall_time_limit";
private BrokerConstants() {
}
}
broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
+14 -5
View File
@@ -136,6 +136,8 @@ public class MemoryMessagesStore implements IMessagesStore {
private long mChatroomParticipantIdleTime = 900000;
private boolean mChatroomRejoinWhenActive = true;
private long mRecallTimeLimit = 300;
MemoryMessagesStore(Server server, DatabaseStore databaseStore) {
m_Server = server;
this.databaseStore = databaseStore;
@@ -236,6 +238,11 @@ public class MemoryMessagesStore implements IMessagesStore {
databaseStore.setDisableRemoteMessageSearch(disableRemoteMessageSearch);
} catch (Exception e) {
}
try {
mRecallTimeLimit = Long.parseLong(m_Server.getConfig().getProperty(BrokerConstants.MESSAGES_RECALL_TIME_LIMIT));
} catch (Exception e) {
}
}
private void printMissConfigLog(String config, String defaultValue) {
@@ -1436,6 +1443,7 @@ public class MemoryMessagesStore implements IMessagesStore {
IMap<Long, MessageBundle> mIMap = hzInstance.getMap(MESSAGES_MAP);
MessageBundle messageBundle = mIMap.get(messageUid);
long now = System.currentTimeMillis();
if (messageBundle != null) {
WFCMessage.Message message = messageBundle.getMessage();
boolean canRecall = false;
@@ -1443,7 +1451,11 @@ public class MemoryMessagesStore implements IMessagesStore {
canRecall = true;
}
if (!isAdmin && message.getFromUser().equals(operatorId)) {
canRecall = true;
if (now - message.getServerTimestamp() > mRecallTimeLimit * 1000) {
return ErrorCode.ERROR_CODE_RECALL_TIME_EXPIRED;
} else {
canRecall = true;
}
}
if (!canRecall && message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group) {
@@ -1451,7 +1463,7 @@ public class MemoryMessagesStore implements IMessagesStore {
WFCMessage.GroupInfo groupInfo = groupMap.get(message.getConversation().getTarget());
if (groupInfo == null) {
return ErrorCode.ERROR_CODE_NOT_EXIST;
return ErrorCode.ERROR_CODE_RECALL_TIME_EXPIRED;
}
if (operatorId.equals(groupInfo.getOwner())) {
canRecall = true;
@@ -1482,9 +1494,6 @@ public class MemoryMessagesStore implements IMessagesStore {
return ErrorCode.ERROR_CODE_NOT_RIGHT;
}
String searchContent = message.getContent().getSearchableContent() == null ? "" : message.getContent().getSearchableContent();
String cont = message.getContent().getContent() == null ? "" : message.getContent().getContent().replace("\"", "\\\"");
String extra = message.getContent().getExtra() == null ? "" : message.getContent().getExtra().replace("\"", "\\\"");
JSONObject json = new JSONObject();
json.put("s", message.getFromUser());
json.put("ts", message.getServerTimestamp());