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
2019-04-02 22:55:29 +08:00
parent f9781363ff
commit 0f15a3840e
4 changed files with 91 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java
+13 -9
View File
@@ -194,6 +194,7 @@ public class MessagesPublisher {
targetClients = m_messagesStore.getChatroomMemberClient(user);
}
for (Session targetSession : sessions) {
//超过7天不活跃的用户忽略
if(System.currentTimeMillis() - targetSession.getLastActiveTime() > 7 * 24 * 60 * 60 * 1000) {
continue;
}
@@ -201,9 +202,11 @@ public class MessagesPublisher {
if (exceptClientId != null && exceptClientId.equals(targetSession.getClientSession().clientID)) {
continue;
}
if (targetSession.getClientID() == null) {
continue;
}
if (pullType == ProtoConstants.PullType.Pull_ChatRoom && !targetClients.contains(targetSession.getClientID())) {
continue;
}
@@ -220,24 +223,24 @@ public class MessagesPublisher {
}
boolean isSlient;
String slientKey = null;
if (pullType == ProtoConstants.PullType.Pull_ChatRoom) {
isSlient = true;
} else {
isSlient = false;
WFCMessage.Conversation conversation;
if (conversationType == ProtoConstants.ConversationType.ConversationType_Private) {
slientKey = conversationType + "-" + line + "-" + sender;
conversation = WFCMessage.Conversation.newBuilder().setType(conversationType).setLine(line).setTarget(sender).build();
} else {
slientKey = conversationType + "-" + line + "-" + target;
conversation = WFCMessage.Conversation.newBuilder().setType(conversationType).setLine(line).setTarget(target).build();
}
if (targetSession.getSlientConvs().containsKey(slientKey)) {
LOG.info("The conversation {} is slient", slientKey);
if (m_messagesStore.getUserConversationSlient(user, conversation)) {
LOG.info("The conversation {}-{}-{} is slient", conversation.getType(), conversation.getTarget(), conversation.getLine());
isSlient = true;
}
if (targetSession.isGlobalSlient()) {
LOG.info("The user is global sliented");
if (m_messagesStore.getUserGlobalSlient(user)) {
LOG.info("The user {} is global sliented", user);
isSlient = true;
}
@@ -301,10 +304,11 @@ public class MessagesPublisher {
}
if (isSlient) {
LOG.info("The conversation {} is slient", slientKey);
LOG.info("The conversation is slient");
continue;
}
boolean isHiddenDetail = targetSession.isHiddenNotifyDetail();
boolean isHiddenDetail = m_messagesStore.getUserPushHiddenDetail(user);
if(!nameLoaded) {
senderName = getUserDisplayName(sender);