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

1, 修改本地运行时version检查错误。2，修改好友被删除后再次添加好友。3，优化部分流程

Browse Source
This commit is contained in:
heavyrain.lee
2019-04-12 14:37:52 +08:00
parent 24ebe429cc
commit 9560b9c202
3 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/com/xiaoleilu/loServer/action/VersionAction.java
+1 -1
View File
@@ -41,7 +41,7 @@ public class VersionAction extends Action {
response.setContent(new Gson().toJson(GitRepositoryState.getGitRepositoryState()));
} catch (IOException e) {
e.printStackTrace();
response.setContent("No version info!");
response.setContent("{\"version\":\"unknown\"}");
}
}
}
broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
+2 -1
View File
@@ -1481,7 +1481,7 @@ public class MemoryMessagesStore implements IMessagesStore {
}
if (existRequest != null) {
if (System.currentTimeMillis() - existRequest.getUpdateDt() > 7 * 24 * 60 * 60 * 1000) {
if (existRequest.getStatus() != ProtoConstants.FriendRequestStatus.RequestStatus_Accepted && System.currentTimeMillis() - existRequest.getUpdateDt() > 7 * 24 * 60 * 60 * 1000) {
if (existRequest.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Rejected) {
return ErrorCode.ERROR_CODE_FRIEND_REQUEST_BLOCKED;
}
@@ -1761,6 +1761,7 @@ public class MemoryMessagesStore implements IMessagesStore {
userSettingMap.put(userId, settingEntry);
userGlobalSlientMap.remove(userId);
userConvSlientMap.remove(userId);
userPushHiddenDetail.remove(userId);
return updateDt;
}
broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java
+17 -13
View File
@@ -227,21 +227,25 @@ public class MessagesPublisher {
isSlient = true;
} else {
isSlient = false;
WFCMessage.Conversation conversation;
if (conversationType == ProtoConstants.ConversationType.ConversationType_Private) {
conversation = WFCMessage.Conversation.newBuilder().setType(conversationType).setLine(line).setTarget(sender).build();
} else {
conversation = WFCMessage.Conversation.newBuilder().setType(conversationType).setLine(line).setTarget(target).build();
}
if (m_messagesStore.getUserConversationSlient(user, conversation)) {
LOG.info("The conversation {}-{}-{} is slient", conversation.getType(), conversation.getTarget(), conversation.getLine());
isSlient = true;
}
if (!user.equals(sender)) {
WFCMessage.Conversation conversation;
if (conversationType == ProtoConstants.ConversationType.ConversationType_Private) {
conversation = WFCMessage.Conversation.newBuilder().setType(conversationType).setLine(line).setTarget(sender).build();
} else {
conversation = WFCMessage.Conversation.newBuilder().setType(conversationType).setLine(line).setTarget(target).build();
}
if (m_messagesStore.getUserGlobalSlient(user)) {
LOG.info("The user {} is global sliented", user);
isSlient = true;
if (m_messagesStore.getUserConversationSlient(user, conversation)) {
LOG.info("The conversation {}-{}-{} is slient", conversation.getType(), conversation.getTarget(), conversation.getLine());
isSlient = true;
}
if (m_messagesStore.getUserGlobalSlient(user)) {
LOG.info("The user {} is global sliented", user);
isSlient = true;
}
}
if (!StringUtil.isNullOrEmpty(pushContent) || messageContentType == 400 || messageContentType == 402) {