version to 0.58

broker/config/wildfirechat.conf

@@ -81,6 +81,15 @@ message.recall_time_limit 120
 ## 一般用于重要类型消息，比如交易、充值等，禁止客户端发送，仅限于服务器发送，提高安全性。
 message.forbidden_client_send_types 3999,4000,4001
 
+## 当禁止发送消息时，允许例外发送的消息。这种一般用户需要被动回应的消息。比如群中被禁言的用户，他无法主动发起音视频，但可以接听未被禁言用户的音视频
+## 因为音视频使用了消息作为信令，所以就需要允许发送音视频信令。如果开发了其它场景也需要被动回应消息，可以加在这里。
+## 黑名单时允许发送的消息类型
+message.blacklist_exception_types 401,402,403,404,405,407,408,410,411
+## 群禁言或者聊天室或者频道禁言时允许发送的消息类型
+message.group_mute_exception_types 401,402,403,404,405,407,408,410,411
+## 用户被全局禁言时允许发送的消息类型
+message.global_mute_exception_types 401,402,403,404,405,407,408,410,411
+
 ##禁止搜索用户
 friend.disable_search false
 

broker/pom.xml

@@ -5,7 +5,7 @@
         <relativePath>../</relativePath>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.54</version>
+        <version>0.58</version>
     </parent>
 
     <artifactId>moquette-broker</artifactId>

broker/src/main/java/cn/wildfirechat/push/PushMessage.java

@@ -43,7 +43,7 @@ public class PushMessage {
         this.cntType = messageContentType;
         this.serverTime = serverTime;
         this.unReceivedMsg = unReceivedMsg;
-        if (cntType == 400) {
+        if (cntType == 400 || cntType == 406) {
             this.pushMessageType = PushServer.PushMessageType.PUSH_MESSAGE_TYPE_VOIP_INVITE;
         } else if(cntType == 402) {
             this.pushMessageType = PushServer.PushMessageType.PUSH_MESSAGE_TYPE_VOIP_BYE;

broker/src/main/java/com/xiaoleilu/loServer/action/admin/UpdateUserAction.java

@@ -0,0 +1,65 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.common.IMExceptionEvent;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.InputUpdateUserInfo;
+import cn.wildfirechat.pojos.OutputCreateUser;
+import cn.wildfirechat.proto.ProtoConstants;
+import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.internal.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import win.liyufan.im.UUIDGenerator;
+import win.liyufan.im.Utility;
+
+@Route(APIPath.Update_User)
+@HttpMethod("POST")
+public class UpdateUserAction extends AdminAction {
+    private static final Logger LOG = LoggerFactory.getLogger(UpdateUserAction.class);
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputUpdateUserInfo inputCreateUser = getRequestBody(request.getNettyRequest(), InputUpdateUserInfo.class);
+            if (inputCreateUser != null
+                && inputCreateUser.userInfo != null
+                && !StringUtil.isNullOrEmpty(inputCreateUser.userInfo.getUserId())
+                && inputCreateUser.flag > 0) {
+
+                ErrorCode errorCode = messagesStore.updateUserInfo(inputCreateUser.userInfo, inputCreateUser.flag);
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(errorCode);
+                response.setContent(new Gson().toJson(result));
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+
+        }
+        return true;
+    }
+}

broker/src/main/java/com/xiaoleilu/loServer/action/channel/GetChannelAction.java

@@ -0,0 +1,41 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.channel;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputGetUserInfo;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.OutputGetChannelInfo;
+import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.internal.StringUtil;
+
+@Route(APIPath.Channel_Get_Profile)
+@HttpMethod("POST")
+public class GetChannelAction extends ChannelAction {
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            response.setStatus(HttpResponseStatus.OK);
+            RestResult result = RestResult.ok(OutputGetChannelInfo.fromPbInfo(channelInfo));
+
+            response.setContent(new Gson().toJson(result));
+        }
+        return true;
+    }
+}

broker/src/main/java/com/xiaoleilu/loServer/action/channel/GetChannelSubscribersAction.java

@@ -0,0 +1,46 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.channel;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputGetUserInfo;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.OutputStringList;
+import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.internal.StringUtil;
+
+import java.util.ArrayList;
+
+@Route(APIPath.Channel_Subscriber_List)
+@HttpMethod("POST")
+public class GetChannelSubscribersAction extends ChannelAction {
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            OutputStringList outputStringList = new OutputStringList();
+            outputStringList.setList(new ArrayList<>());
+            outputStringList.getList().addAll(messagesStore.getChannelSubscriber(channelInfo.getTargetId()));
+
+            response.setStatus(HttpResponseStatus.OK);
+            RestResult result = RestResult.ok(outputStringList);
+            response.setContent(new Gson().toJson(result));
+        }
+        return true;
+    }
+}

broker/src/main/java/com/xiaoleilu/loServer/action/channel/GetUserAction.java

@@ -0,0 +1,83 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.channel;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputGetUserInfo;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.proto.ProtoConstants;
+import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.action.admin.AdminAction;
+import com.xiaoleilu.loServer.action.robot.RobotAction;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.internal.StringUtil;
+
+@Route(APIPath.Channel_User_Info)
+@HttpMethod("POST")
+public class GetUserAction extends ChannelAction {
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputGetUserInfo inputUserId = getRequestBody(request.getNettyRequest(), InputGetUserInfo.class);
+            if (inputUserId != null
+                && (!StringUtil.isNullOrEmpty(inputUserId.getUserId()) || !StringUtil.isNullOrEmpty(inputUserId.getName()) || !StringUtil.isNullOrEmpty(inputUserId.getMobile()))) {
+
+                WFCMessage.User user = null;
+                if(!StringUtil.isNullOrEmpty(inputUserId.getUserId())) {
+                    user = messagesStore.getUserInfo(inputUserId.getUserId());
+                } else if(!StringUtil.isNullOrEmpty(inputUserId.getName())) {
+                    user = messagesStore.getUserInfoByName(inputUserId.getName());
+                } else if(!StringUtil.isNullOrEmpty(inputUserId.getMobile())) {
+                    user = messagesStore.getUserInfoByMobile(inputUserId.getMobile());
+                }
+
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result;
+
+                if (user == null || StringUtil.isNullOrEmpty(user.getName())) {
+                    result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
+                } else {
+                    if (channelInfo.getOwner().equals(inputUserId.getUserId()) ||
+                            messagesStore.checkUserInChannel(user.getUid(), channelInfo.getTargetId())) {
+                        if((channelInfo.getStatus() & ProtoConstants.ChannelState.Channel_State_Mask_FullInfo) > 0) {
+                            result = RestResult.ok(InputOutputUserInfo.fromPbUser(user));
+                        } else {
+                            WFCMessage.User outUser = WFCMessage.User.newBuilder().setUid(user.getUid()).setName(user.getName()).setPortrait(user.getPortrait()).setDisplayName(user.getDisplayName()).build();
+                            result = RestResult.ok(InputOutputUserInfo.fromPbUser(outUser));
+                        }
+                    } else {
+                        if((channelInfo.getStatus() & ProtoConstants.ChannelState.Channel_State_Mask_Unsubscribed_User_Access) > 0) {
+                            WFCMessage.User outUser = WFCMessage.User.newBuilder().setUid(user.getUid()).setName(user.getName()).setPortrait(user.getPortrait()).setDisplayName(user.getDisplayName()).build();
+                            result = RestResult.ok(InputOutputUserInfo.fromPbUser(outUser));
+                        } else {
+                            result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_RIGHT);
+                        }
+                    }
+                }
+
+                response.setContent(new Gson().toJson(result));
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+
+        }
+        return true;
+    }
+}

broker/src/main/java/com/xiaoleilu/loServer/action/channel/ModifyChannelProfileAction.java

@@ -0,0 +1,84 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.channel;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputGetUserInfo;
+import cn.wildfirechat.pojos.InputModifyChannelInfo;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.SendMessageResult;
+import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.moquette.persistence.RPCCenter;
+import io.moquette.persistence.TargetEntry;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.internal.StringUtil;
+import win.liyufan.im.IMTopic;
+
+import java.util.concurrent.Executor;
+
+@Route(APIPath.Channel_Update_Profile)
+@HttpMethod("POST")
+public class ModifyChannelProfileAction extends ChannelAction {
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputModifyChannelInfo input = getRequestBody(request.getNettyRequest(), InputModifyChannelInfo.class);
+            if (input != null) {
+                WFCMessage.ModifyChannelInfo modifyChannelInfo = WFCMessage.ModifyChannelInfo.newBuilder().setChannelId(channelInfo.getTargetId()).setType(input.getType()).setValue(input.getValue()).build();
+                RPCCenter.getInstance().sendRequest(channelInfo.getOwner(), null, IMTopic.ModifyChannelInfoTopic, modifyChannelInfo.toByteArray(), channelInfo.getOwner(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                    @Override
+                    public void onSuccess(byte[] result) {
+                        ByteBuf byteBuf = Unpooled.buffer();
+                        byteBuf.writeBytes(result);
+                        ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                        if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
+                            sendResponse(response, null, null);
+                        } else {
+                            sendResponse(response, errorCode, null);
+                        }
+                    }
+
+                    @Override
+                    public void onError(ErrorCode errorCode) {
+                        sendResponse(response, errorCode, null);
+                    }
+
+                    @Override
+                    public void onTimeout() {
+                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
+                    }
+
+                    @Override
+                    public Executor getResponseExecutor() {
+                        return command -> {
+                            ctx.executor().execute(command);
+                        };
+                    }
+                }, false);
+                return false;
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+
+        }
+        return true;
+    }
+}

broker/src/main/java/com/xiaoleilu/loServer/action/channel/SubscriberChannelAction.java

@@ -0,0 +1,90 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.channel;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputChannelSubscribe;
+import cn.wildfirechat.pojos.InputModifyChannelInfo;
+import cn.wildfirechat.proto.ProtoConstants;
+import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
+import com.hazelcast.util.StringUtil;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.moquette.persistence.RPCCenter;
+import io.moquette.persistence.TargetEntry;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import win.liyufan.im.IMTopic;
+
+import java.util.concurrent.Executor;
+
+@Route(APIPath.Channel_Subscribe)
+@HttpMethod("POST")
+public class SubscriberChannelAction extends ChannelAction {
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputChannelSubscribe input = getRequestBody(request.getNettyRequest(), InputChannelSubscribe.class);
+            if (input != null && !StringUtil.isNullOrEmpty(input.getTarget())) {
+                if(input.getSubscribe() > 0 && (channelInfo.getStatus() & ProtoConstants.ChannelState.Channel_State_Mask_Active_Subscribe) == 0) {
+                    response.setStatus(HttpResponseStatus.OK);
+                    RestResult result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_RIGHT);
+                    response.setContent(new Gson().toJson(result));
+                    return true;
+                }
+                WFCMessage.ListenChannel listenChannel = WFCMessage.ListenChannel.newBuilder().setChannelId(channelInfo.getTargetId()).setListen(input.getSubscribe()).build();
+                RPCCenter.getInstance().sendRequest(input.getTarget(), null, IMTopic.ChannelListenTopic, listenChannel.toByteArray(), input.getTarget(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                    @Override
+                    public void onSuccess(byte[] result) {
+                        ByteBuf byteBuf = Unpooled.buffer();
+                        byteBuf.writeBytes(result);
+                        ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                        if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
+                            sendResponse(response, null, null);
+                        } else {
+                            sendResponse(response, errorCode, null);
+                        }
+                    }
+
+                    @Override
+                    public void onError(ErrorCode errorCode) {
+                        sendResponse(response, errorCode, null);
+                    }
+
+                    @Override
+                    public void onTimeout() {
+                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
+                    }
+
+                    @Override
+                    public Executor getResponseExecutor() {
+                        return command -> {
+                            ctx.executor().execute(command);
+                        };
+                    }
+                }, true);
+                return false;
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+
+        }
+        return true;
+    }
+}

broker/src/main/java/io/moquette/BrokerConstants.java

@@ -157,6 +157,9 @@ public final class BrokerConstants {
     public static final String USER_HIDE_PROPERTIES = "user.hide_properties";
 
     public static final String MESSAGES_FORBIDDEN_CLIENT_SEND_TYPES = "message.forbidden_client_send_types";
+    public static final String MESSAGES_BLACKLIST_EXCEPTION_TYPES = "message.blacklist_exception_types";
+    public static final String MESSAGES_GROUP_MUTE_EXCEPTION_TYPES = "message.group_mute_exception_types";
+    public static final String MESSAGES_GLOBAL_MUTE_EXCEPTION_TYPES = "message.global_mute_exception_types";
 
     public static final String MESSAGES_DISABLE_REMOTE_SEARCH = "message.disable_remote_search";
 

broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java

@@ -105,17 +105,21 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
 
                 int userStatus = m_messagesStore.getUserStatus(fromUser);
                 if (userStatus == ProtoConstants.UserStatus.Muted || userStatus == ProtoConstants.UserStatus.Forbidden) {
-                    return ErrorCode.ERROR_CODE_FORBIDDEN_SEND_MSG;
+                    if(!m_messagesStore.getGlobalMuteExceptionTypes().contains(message.getContent().getType())) {
+                        return ErrorCode.ERROR_CODE_FORBIDDEN_SEND_MSG;
+                    }
                 }
 
                 if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Private) {
-                    errorCode = m_messagesStore.isAllowUserMessage(message.getConversation().getTarget(), fromUser);
-                    if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
-                        if (errorCode == ErrorCode.ERROR_CODE_IN_BLACK_LIST && mBlacklistStrategy != ProtoConstants.BlacklistStrategy.Message_Reject) {
-                            ignoreMsg = true;
-                            errorCode = ErrorCode.ERROR_CODE_SUCCESS;
-                        } else {
-                            return errorCode;
+                    if(!m_messagesStore.getBlackListExceptionTypes().contains(message.getContent().getType())) {
+                        errorCode = m_messagesStore.isAllowUserMessage(message.getConversation().getTarget(), fromUser);
+                        if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
+                            if (errorCode == ErrorCode.ERROR_CODE_IN_BLACK_LIST && mBlacklistStrategy != ProtoConstants.BlacklistStrategy.Message_Reject) {
+                                ignoreMsg = true;
+                                errorCode = ErrorCode.ERROR_CODE_SUCCESS;
+                            } else {
+                                return errorCode;
+                            }
                         }
                     }
 
@@ -126,17 +130,23 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
                 }
 
                 if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group ) {
-                    errorCode = m_messagesStore.canSendMessageInGroup(fromUser, message.getConversation().getTarget());
-                    if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
-                        return errorCode;
+                    if(!m_messagesStore.getGroupMuteExceptionTypes().contains(message.getContent().getType())) {
+                        errorCode = m_messagesStore.canSendMessageInGroup(fromUser, message.getConversation().getTarget());
+                        if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
+                            return errorCode;
+                        }
                     }
                 } else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_ChatRoom) {
-                    if(!m_messagesStore.checkUserClientInChatroom(fromUser, clientID, message.getConversation().getTarget())) {
-                        return ErrorCode.ERROR_CODE_NOT_IN_CHATROOM;
+                    if(!m_messagesStore.getGroupMuteExceptionTypes().contains(message.getContent().getType())) {
+                        if (!m_messagesStore.checkUserClientInChatroom(fromUser, clientID, message.getConversation().getTarget())) {
+                            return ErrorCode.ERROR_CODE_NOT_IN_CHATROOM;
+                        }
                     }
                 } else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Channel) {
-                    if(!m_messagesStore.checkUserInChannel(fromUser, message.getConversation().getTarget())) {
-                        return ErrorCode.ERROR_CODE_NOT_IN_CHANNEL;
+                    if(!m_messagesStore.getGroupMuteExceptionTypes().contains(message.getContent().getType())) {
+                        if (!m_messagesStore.checkUserInChannel(fromUser, message.getConversation().getTarget())) {
+                            return ErrorCode.ERROR_CODE_NOT_IN_CHANNEL;
+                        }
                     }
                 }
             }

broker/src/main/java/io/moquette/persistence/DatabaseStore.java

@@ -1555,6 +1555,35 @@ public class DatabaseStore {
         }
     }
 
+    void clearMultiUser(String uid, String clientId) {
+        long start = System.currentTimeMillis();
+        LOG.info("clearMultiUser {}, {}", uid, clientId);
+        Connection connection = null;
+        PreparedStatement statement = null;
+        try {
+            connection = DBUtil.getConnection();
+            String sql = "update t_user_session set _deleted = ?, _token = ?, _voip_token = ?, _dt = ?  where _cid = ? and _uid <> ? and _deleted = 0";
+
+            statement = connection.prepareStatement(sql);
+            int index = 1;
+            statement.setInt(index++, 1);
+            statement.setString(index++, "");
+            statement.setString(index++, "");
+            statement.setLong(index++, System.currentTimeMillis());
+
+            statement.setString(index++, clientId);
+            statement.setString(index++, uid);
+            int count = statement.executeUpdate();
+            LOG.info("Update rows {}", count);
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            Utility.printExecption(LOG, e, RDBS_Exception);
+        } finally {
+            DBUtil.closeDB(connection, statement);
+        }
+    }
+
     MemorySessionStore.Session createSession(String uid, String clientId, ClientSession clientSession, int platform) {
         Connection connection = null;
         PreparedStatement statement = null;

broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java

@@ -59,6 +59,7 @@ import static cn.wildfirechat.proto.ProtoConstants.ModifyChannelInfoType.*;
 import static cn.wildfirechat.proto.ProtoConstants.ModifyGroupInfoType.*;
 import static cn.wildfirechat.proto.ProtoConstants.PersistFlag.Transparent;
 import static cn.wildfirechat.proto.ProtoConstants.Platform.*;
+import static cn.wildfirechat.proto.ProtoConstants.UpdateUserInfoMask.*;
 import static io.moquette.BrokerConstants.*;
 import static io.moquette.server.Constants.MAX_CHATROOM_MESSAGE_QUEUE;
 import static io.moquette.server.Constants.MAX_MESSAGE_QUEUE;
@@ -138,6 +139,9 @@ public class MemoryMessagesStore implements IMessagesStore {
     private boolean mChatroomRejoinWhenActive = true;
 
     private List<Integer> mForbiddenClientSendTypes = new ArrayList<>();
+    private List<Integer> mBlackListExceptionTypes = new ArrayList<>();
+    private List<Integer> mGroupMuteExceptionTypes = new ArrayList<>();
+    private List<Integer> mGlobalMuteExceptionTypes = new ArrayList<>();
 
     private long mRecallTimeLimit = 300;
 
@@ -274,7 +278,48 @@ public class MemoryMessagesStore implements IMessagesStore {
         } catch (Exception e) {
         }
 
+        try {
+            String strTypes = m_Server.getConfig().getProperty(BrokerConstants.MESSAGES_BLACKLIST_EXCEPTION_TYPES);
+            if(!StringUtil.isNullOrEmpty(strTypes)) {
+                for (String strType:strTypes.split(",")) {
+                    try {
+                        int type = Integer.parseInt(strType);
+                        mBlackListExceptionTypes.add(type);
+                    } catch (NumberFormatException e) {
 
+                    }
+                }
+            }
+        } catch (Exception e) {
+        }
+        try {
+            String strTypes = m_Server.getConfig().getProperty(BrokerConstants.MESSAGES_GROUP_MUTE_EXCEPTION_TYPES);
+            if(!StringUtil.isNullOrEmpty(strTypes)) {
+                for (String strType:strTypes.split(",")) {
+                    try {
+                        int type = Integer.parseInt(strType);
+                        mGroupMuteExceptionTypes.add(type);
+                    } catch (NumberFormatException e) {
+
+                    }
+                }
+            }
+        } catch (Exception e) {
+        }
+        try {
+            String strTypes = m_Server.getConfig().getProperty(BrokerConstants.MESSAGES_GLOBAL_MUTE_EXCEPTION_TYPES);
+            if(!StringUtil.isNullOrEmpty(strTypes)) {
+                for (String strType:strTypes.split(",")) {
+                    try {
+                        int type = Integer.parseInt(strType);
+                        mGlobalMuteExceptionTypes.add(type);
+                    } catch (NumberFormatException e) {
+
+                    }
+                }
+            }
+        } catch (Exception e) {
+        }
 
         try {
             mGroupInfoUpdateCallback = server.getConfig().getProperty(GROUP_INFO_UPDATE_CALLBACK);
@@ -1534,8 +1579,6 @@ public class MemoryMessagesStore implements IMessagesStore {
         WFCMessage.GroupInfo groupInfo = mIMap.get(groupId);
         if (groupInfo == null) {
             return ErrorCode.ERROR_CODE_NOT_EXIST;
-        } else if (groupInfo.getMemberUpdateDt() <= maxDt) {
-            return ErrorCode.ERROR_CODE_NOT_MODIFIED;
         }
 
         MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
@@ -2127,6 +2170,56 @@ public class MemoryMessagesStore implements IMessagesStore {
         return out;
     }
 
+    @Override
+    public ErrorCode updateUserInfo(InputOutputUserInfo userInfo, int flag) {
+        HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
+        IMap<String, WFCMessage.User> mUserMap = hzInstance.getMap(USERS);
+        WFCMessage.User user = mUserMap.get(userInfo.getUserId());
+        if(user == null) {
+            return ErrorCode.ERROR_CODE_NOT_EXIST;
+        }
+        WFCMessage.User.Builder builder = user.toBuilder();
+        if((flag & Update_User_DisplayName) > 0) {
+            builder.setDisplayName(userInfo.getDisplayName());
+        }
+        if((flag & Update_User_Portrait) > 0) {
+            builder.setPortrait(userInfo.getPortrait());
+        }
+        if((flag & Update_User_Gender) > 0) {
+            builder.setGender(userInfo.getGender());
+        }
+        if((flag & Update_User_Mobile) > 0) {
+            builder.setMobile(userInfo.getMobile());
+        }
+        if((flag & Update_User_Email) > 0) {
+            builder.setEmail(userInfo.getEmail());
+        }
+        if((flag & Update_User_Address) > 0) {
+            builder.setAddress(userInfo.getAddress());
+        }
+        if((flag & Update_User_Company) > 0) {
+            builder.setCompany(userInfo.getCompany());
+        }
+        if((flag & Update_User_Social) > 0) {
+            builder.setSocial(userInfo.getSocial());
+        }
+        if((flag & Update_User_Extra) > 0) {
+            builder.setExtra(userInfo.getExtra());
+        }
+        builder.setUpdateDt(System.currentTimeMillis());
+        user = builder.build();
+        try {
+            databaseStore.updateUser(user);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ErrorCode.ERROR_CODE_SERVER_ERROR;
+        }
+
+        mUserMap.put(user.getUid(), user);
+        callbackUserInfoEvent(user);
+        return ErrorCode.ERROR_CODE_SUCCESS;
+    }
+
     @Override
     public void addUserInfo(WFCMessage.User user, String password) throws Exception {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
@@ -3418,6 +3511,21 @@ public class MemoryMessagesStore implements IMessagesStore {
         return mForbiddenClientSendTypes;
     }
 
+    @Override
+    public List<Integer> getBlackListExceptionTypes() {
+        return mBlackListExceptionTypes;
+    }
+
+    @Override
+    public List<Integer> getGroupMuteExceptionTypes() {
+        return mGroupMuteExceptionTypes;
+    }
+
+    @Override
+    public List<Integer> getGlobalMuteExceptionTypes() {
+        return mGlobalMuteExceptionTypes;
+    }
+
     @Override
     public long getMessageHead(String user) {
         TreeMap<Long, Long> maps = userMessages.get(user);

broker/src/main/java/io/moquette/persistence/MemorySessionStore.java

@@ -375,7 +375,7 @@ public class MemorySessionStore implements ISessionsStore {
             session.setPlatform(platform);
             databaseStore.updateSessionPlatform(username, clientID, platform);
         }
-
+        databaseStore.clearMultiUser(username, clientID);
 
         if (!supportMultiEndpoint && platform > 0) {
             databaseStore.clearMultiEndpoint(username, clientID, platform);

broker/src/main/java/io/moquette/spi/IMessagesStore.java

@@ -16,6 +16,7 @@
 
 package io.moquette.spi;
 
+import cn.wildfirechat.pojos.InputOutputUserInfo;
 import cn.wildfirechat.pojos.SystemSettingPojo;
 import cn.wildfirechat.proto.WFCMessage;
 import com.xiaoleilu.loServer.model.FriendData;
@@ -142,6 +143,7 @@ public interface IMessagesStore {
     int getUserStatus(String userId);
     List<InputOutputUserBlockStatus> getUserStatusList();
 
+    ErrorCode updateUserInfo(InputOutputUserInfo userInfo, int flag);
     void addUserInfo(WFCMessage.User user, String password) throws Exception;
     void destoryUser(String userId);
     void updateUserInfo(WFCMessage.User user) throws Exception;
@@ -218,6 +220,9 @@ public interface IMessagesStore {
     int getVisibleQuitKickoffNotification();
 
     List<Integer> getClientForbiddenSendTypes();
+    List<Integer> getBlackListExceptionTypes();
+    List<Integer> getGroupMuteExceptionTypes();
+    List<Integer> getGlobalMuteExceptionTypes();
 
     long getMessageHead(String user);
     long getFriendHead(String user);

broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java

@@ -332,7 +332,7 @@ public class MessagesPublisher {
                         }
                     }
 
-                    if ((StringUtil.isNullOrEmpty(pushContent) && messageContentType != 402 && messageContentType != 400 && messageContentType != 401)) {
+                    if ((StringUtil.isNullOrEmpty(pushContent) && messageContentType != 402 && messageContentType != 400 && messageContentType != 401 && messageContentType != 406)) {
                         LOG.info("push content is empty and contenttype is {}", messageContentType);
                         continue;
                     }

common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.54</version>
+        <version>0.58</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

common/src/main/java/cn/wildfirechat/common/APIPath.java

@@ -17,6 +17,7 @@ public interface APIPath {
     String Sensitive_Query = "/admin/sensitive/query";
 
     String Create_User = "/admin/user/create";
+    String Update_User = "/admin/user/update";
     String Destroy_User = "/admin/user/destroy";
     String Create_Robot = "/admin/robot/create";
     String CreateOrUpdate_Device = "/admin/device/create";

common/src/main/java/cn/wildfirechat/pojos/InputUpdateUserInfo.java

@@ -0,0 +1,18 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.pojos;
+
+
+import cn.wildfirechat.proto.WFCMessage;
+
+public class InputUpdateUserInfo {
+    //UpdateUserInfoMask
+    public int flag;
+    public InputOutputUserInfo userInfo;
+}

common/src/main/java/cn/wildfirechat/proto/ProtoConstants.java

@@ -201,6 +201,19 @@ public class ProtoConstants {
         int Chatroom_Member_Event_Unmute = 4;
     }
 
+    public interface UpdateUserInfoMask {
+        int Update_User_DisplayName = 0x01;
+        int Update_User_Portrait = 0x02;
+        int Update_User_Gender = 0x04;
+        int Update_User_Mobile = 0x08;
+        int Update_User_Email = 0x10;
+        int Update_User_Address = 0x20;
+        int Update_User_Company = 0x40;
+        int Update_User_Social = 0x80;
+        int Update_User_Extra = 0x100;
+    }
+
+
     public static final int MESSAGE_CONTENT_TYPE_CREATE_GROUP = 104;
     public static final int MESSAGE_CONTENT_TYPE_ADD_GROUP_MEMBER = 105;
     public static final int MESSAGE_CONTENT_TYPE_KICKOF_GROUP_MEMBER = 106;

distribution/pom.xml

@@ -6,7 +6,7 @@
         <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.54</version>
+        <version>0.58</version>
     </parent>
 
     <artifactId>distribution</artifactId>

distribution/src/main/resources/wildfirechat.conf

@@ -76,6 +76,14 @@ message.recall_time_limit 120
 ## 一般用于重要类型消息，比如交易、充值等，禁止客户端发送，仅限于服务器发送，提高安全性。
 message.forbidden_client_send_types 3999,4000,4001
 
+## 当禁止发送消息时，允许例外发送的消息。这种一般用户需要被动回应的消息。比如群中被禁言的用户，他无法主动发起音视频，但可以接听未被禁言用户的音视频
+## 因为音视频使用了消息作为信令，所以就需要允许发送音视频信令。如果开发了其它场景也需要被动回应消息，可以加在这里。
+## 黑名单时允许发送的消息类型
+message.blacklist_exception_types 401,402,403,404,405,407,408,410,411
+## 群禁言或者聊天室或者频道禁言时允许发送的消息类型
+message.group_mute_exception_types 401,402,403,404,405,407,408,410,411
+## 用户被全局禁言时允许发送的消息类型
+message.global_mute_exception_types 401,402,403,404,405,407,408,410,411
 ##禁止搜索用户
 friend.disable_search false
 

distribution/src/main/scripts/wildfirechat.bat

@@ -1,12 +1,11 @@
 @ECHO OFF
 
 set "CURRENT_DIR=%cd%"
-if not "%WILDFIRECHAT_HOME%" == "" goto gotHome
 set "WILDFIRECHAT_HOME=%CURRENT_DIR%"
 if exist "%WILDFIRECHAT_HOME%\bin\wildfirechat.bat" goto okHome
 cd ..
 set "WILDFIRECHAT_HOME=%cd%"
-cd "%CURRENT_DIR%"
+set "CURRENT_DIR=%cd%"
 :gotHome
 if exist "%WILDFIRECHAT_HOME%\bin\wildfirechat.bat" goto okHome
     echo The WILDFIRECHAT_HOME environment variable is not defined correctly

distribution/src/main/scripts/wildfirechat.sh

@@ -11,11 +11,14 @@ while [ -h "$PRG" ]; do
   if expr "$link" : '/.*' > /dev/null; then
     PRG="$link"
   else
-    PRG=`dirname "$PRG"`/"$link"
+    PRGDIR=`dirname "$PRG"`
+    cd $PRGDIR
+    PRG="`pwd`"/"$link"
   fi
 done
 
 PRGDIR=`dirname "$PRG"`
+cd $PRGDIR
 cd ..
 WILDFIRECHAT_HOME=`pwd`
 

pom.xml

@@ -12,7 +12,7 @@
     <artifactId>wildfirechat-parent</artifactId>
 
     <packaging>pom</packaging>
-    <version>0.54</version>
+    <version>0.58</version>
     <name>Wildfire Chat</name>
     <description>Wildfire Chat Server</description>
     <inceptionYear>2019</inceptionYear>

sdk/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.54</version>
+        <version>0.58</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

sdk/src/main/java/cn/wildfirechat/sdk/Main.java

@@ -134,6 +134,43 @@ public class Main {
             System.exit(-1);
         }
 
+        InputOutputUserInfo updateUserInfo = new InputOutputUserInfo();
+        updateUserInfo.setUserId(System.currentTimeMillis()+"");
+        updateUserInfo.setDisplayName("updatedUserName");
+        updateUserInfo.setPortrait("updatedUserPortrait");
+        int updateUserFlag = ProtoConstants.UpdateUserInfoMask.Update_User_DisplayName | ProtoConstants.UpdateUserInfoMask.Update_User_Portrait;
+        IMResult<Void> result = UserAdmin.updateUserInfo(updateUserInfo, updateUserFlag);
+        if(result != null && result.getErrorCode() == ErrorCode.ERROR_CODE_NOT_EXIST) {
+            System.out.println("updateUserInfo success");
+        } else {
+            System.out.println("updateUserInfo failure");
+            System.exit(-1);
+        }
+
+        updateUserInfo.setUserId(userInfo.getUserId());
+        result = UserAdmin.updateUserInfo(updateUserInfo, updateUserFlag);
+        if(result != null && result.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("updateUserInfo success");
+        } else {
+            System.out.println("updateUserInfo failure");
+            System.exit(-1);
+        }
+
+        IMResult<InputOutputUserInfo> resultGetUserInfo4 = UserAdmin.getUserByUserId(userInfo.getUserId());
+        if (resultGetUserInfo4 != null && resultGetUserInfo4.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            if (userInfo.getUserId().equals(resultGetUserInfo4.getResult().getUserId())
+                && updateUserInfo.getDisplayName().equals(resultGetUserInfo4.getResult().getDisplayName())
+                && updateUserInfo.getPortrait().equals(resultGetUserInfo4.getResult().getPortrait())) {
+                System.out.println("get user info success");
+            } else {
+                System.out.println("get user info by userId failure");
+                System.exit(-1);
+            }
+        } else {
+            System.out.println("get user info by userId failure");
+            System.exit(-1);
+        }
+
         IMResult<OutputGetIMTokenData> resultGetToken = UserAdmin.getUserToken(userInfo.getUserId(), "client111", ProtoConstants.Platform.Platform_Android);
         if (resultGetToken != null && resultGetToken.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("get token success: " + resultGetToken.getResult().getToken());
@@ -255,7 +292,7 @@ public class Main {
             System.exit(-1);
         }
 
-        IMResult<Void> result = RelationAdmin.sendFrienRequest("ff1", "ff2", "hello", true);
+        IMResult<Void> result = RelationAdmin.sendFriendRequest("ff1", "ff2", "hello", true);
         if (result != null && result.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("send friend request success");
         } else {
@@ -263,7 +300,7 @@ public class Main {
             System.exit(-1);
         }
 
-        result = RelationAdmin.sendFrienRequest("ff1", "ff2", "hello2", false);
+        result = RelationAdmin.sendFriendRequest("ff1", "ff2", "hello2", false);
         if (result != null && result.getErrorCode() != ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("success");
         } else {
@@ -271,7 +308,7 @@ public class Main {
             System.exit(-1);
         }
 
-        result = RelationAdmin.sendFrienRequest("ff1", "ff2", "hello3", true);
+        result = RelationAdmin.sendFriendRequest("ff1", "ff2", "hello3", true);
         if (result != null && result.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("success");
         } else {
@@ -1147,8 +1184,6 @@ public class Main {
         ChannelServiceApi channelServiceApi = new ChannelServiceApi("http://localhost", resultCreateChannel.getResult().getTargetId(), secret);
 
 
-
-        if (commercialServer) {
             //3. 测试channel api功能
             IMResult<Void> resultVoid = channelServiceApi.subscribe("userId2");
             if (resultVoid != null && resultVoid.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
@@ -1197,7 +1232,7 @@ public class Main {
                 System.out.println("get user info failure");
                 System.exit(-1);
             }
-        }
+
 
 
         MessagePayload payload = new MessagePayload();

sdk/src/main/java/cn/wildfirechat/sdk/RelationAdmin.java

@@ -56,7 +56,7 @@ public class RelationAdmin {
         return AdminHttpUtils.httpJsonPost(path, input, OutputGetAlias.class);
     }
 
-    public static IMResult<Void> sendFrienRequest(String userId, String targetId, String reason, boolean force) throws Exception {
+    public static IMResult<Void> sendFriendRequest(String userId, String targetId, String reason, boolean force) throws Exception {
         String path = APIPath.Friend_Send_Request;
         InputAddFriendRequest input = new InputAddFriendRequest();
         input.setUserId(userId);

sdk/src/main/java/cn/wildfirechat/sdk/UserAdmin.java

@@ -29,6 +29,14 @@ public class UserAdmin {
         return AdminHttpUtils.httpJsonPost(path, user, OutputCreateUser.class);
     }
 
+    public static IMResult<Void> updateUserInfo(InputOutputUserInfo user, int/*UpdateUserInfoMask*/ flag) throws Exception {
+        String path = APIPath.Update_User;
+        InputUpdateUserInfo updateUserInfo = new InputUpdateUserInfo();
+        updateUserInfo.flag = flag;
+        updateUserInfo.userInfo = user;
+        return AdminHttpUtils.httpJsonPost(path, updateUserInfo, Void.class);
+    }
+
     public static IMResult<OutputCreateRobot> createRobot(InputCreateRobot robot) throws Exception {
         String path = APIPath.Create_Robot;
         return AdminHttpUtils.httpJsonPost(path, robot, OutputCreateRobot.class);