添加配置,可以在会话静音/全局静音/PC在线时静音时强制推送。
(cherry picked from commit 1f4cf54990831d4bcc4fcec2fa5479036a581e58)
This commit is contained in:
@@ -21,7 +21,6 @@ import cn.wildfirechat.pojos.OutputMessageData;
|
||||
import cn.wildfirechat.proto.ProtoConstants;
|
||||
import cn.wildfirechat.proto.WFCMessage;
|
||||
import cn.wildfirechat.push.PushServer;
|
||||
import com.google.gson.Gson;
|
||||
import com.hazelcast.core.HazelcastInstance;
|
||||
import com.hazelcast.util.StringUtil;
|
||||
import cn.wildfirechat.pojos.OutputNotifyChannelSubscribeStatus;
|
||||
@@ -271,6 +270,7 @@ public class MessagesPublisher {
|
||||
boolean isVoipSilent;
|
||||
boolean isNoDisturb;
|
||||
boolean isConvSilent = false;
|
||||
boolean isForcePush = false;
|
||||
if (pullType == ProtoConstants.PullType.Pull_ChatRoom) {
|
||||
isSilent = true;
|
||||
isConvSilent = true;
|
||||
@@ -289,6 +289,11 @@ public class MessagesPublisher {
|
||||
conversation = WFCMessage.Conversation.newBuilder().setType(conversationType).setLine(line).setTarget(target).build();
|
||||
}
|
||||
|
||||
if(m_messagesStore.getForcePushTypes().contains(messageContentType)) {
|
||||
LOG.info("The message type {} force push", messageContentType);
|
||||
isForcePush = true;
|
||||
}
|
||||
|
||||
if (m_messagesStore.getUserConversationSilent(user, conversation)) {
|
||||
LOG.info("The conversation {}-{}-{} is slient", conversation.getType(), conversation.getTarget(), conversation.getLine());
|
||||
isConvSilent = true;
|
||||
@@ -369,17 +374,17 @@ public class MessagesPublisher {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (isConvSilent && !isVoip) {
|
||||
if (isConvSilent && !isVoip && !isForcePush) {
|
||||
LOG.info("Silent of user or conversation");
|
||||
continue;
|
||||
}
|
||||
|
||||
if (isSilent && !isVoip) {
|
||||
if (isSilent && !isVoip && !isForcePush) {
|
||||
LOG.info("Silent of user");
|
||||
continue;
|
||||
}
|
||||
|
||||
if(isVoip && isVoipSilent) {
|
||||
if(isVoip && isVoipSilent && !isForcePush) {
|
||||
LOG.info("voip silent of user");
|
||||
continue;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user