version 0.49->0.50

2，配置当退群或者群踢人时，是否发送visible群通知

README.md

@@ -72,7 +72,7 @@
 
 ## 升级说明
 1. 从0.42 版本增加了群成员数限制，默认为2000。如果您从之前的版本升级到这个版本或以后，需要注意到群成员数的限制。升级之后超出限制的群不受影响，但不能继续加人，如果您想修改默认值，可以在升级版本之后，修改t_setting表，把默认的大小改为您期望的人数。另外修改t_group表，把已经存在的群组max_member_count改成您期望的，然后重启。
-
+2. 0.46和0.47版本升级到0.48及以后版本时，可能会提示flyway migrate 38错误，请执行 [修复脚本](https://github.com/wildfirechat/server/blob/wildfirechat/flyway_repaire_migrate_38.sql) 进行修复。0.46和0.47版本之外的版本不会出现此问题。
 
 ## 特别感谢
 1. [moquette](https://github.com/moquette-io/moquette) 本项目是基于此项目二次开发而来，处理MQTT相关业务。

broker/config/wildfirechat.conf

@@ -78,6 +78,10 @@ message.disable_remote_search  false
 ##允许客户端撤回消息时限，单位是秒。群组管理员或群主撤回群成员消息、server api不受此限制，可以撤回任意时限内的消息
 message.recall_time_limit 120
 
+## 禁止客户端发送消息类型，消息类型以逗号分开，下面3个值为示例，可以删除。
+## 一般用于重要类型消息，比如交易、充值等，禁止客户端发送，仅限于服务器发送，提高安全性。
+message.forbidden_client_send_types 3999,4000,4001
+
 ##禁止搜索用户
 friend.disable_search false
 
@@ -108,6 +112,13 @@ chatroom.participant_idle_time 900000
 ## 用户向聊天室发送消息，自动加入聊天室
 chatroom.rejoin_when_active true
 
+## 是否允许客户端发送操作群的自定义群通知消息
+group.allow_client_custom_operation_notification false
+
+## 当群成员退出或者被移除时，是否同时给管理员和相关人员发送显式通知消息。
+## 0 不发送，1 退群时发送，2 踢人时发送，3 退群和踢人时都发送。
+group.visible_quit_or_kickoff_notification 0
+
 #*********************************************************************
 # hazelcase configuration
 #*********************************************************************

broker/migrate/h2/V33__alter_group_searchable_column.sql

@@ -0,0 +1 @@
+alter table `t_group` modify column `_searchable` int(11) NOT NULL DEFAULT 0;

broker/migrate/h2/V34__create_files_table.sql

@@ -0,0 +1,15 @@
+DROP TABLE IF EXISTS `t_file`;
+CREATE TABLE `t_file` (
+  `_mid` bigint(20) NOT NULL PRIMARY KEY,
+  `_from` varchar(64) NOT NULL,
+  `_type` tinyint NOT NULL DEFAULT 0,
+  `_target` varchar(64) NOT NULL,
+  `_line` int(11) NOT NULL DEFAULT 0,
+  `_name` varchar(128) DEFAULT '',
+  `_url` varchar(1024) NOT NULL DEFAULT '',
+  `_size` int(11) NOT NULL DEFAULT 0,
+  `_download_count` int(11) DEFAULT 0,
+  `_dt` bigint(20) NOT NULL,
+  INDEX `file_conv_index` (`_type`, `_line`, `_target`, `_mid`),
+  INDEX `file_user_index` (`_from`, `_mid`)
+);

broker/migrate/mysql/V38__alter_group_searchable_column.sql

@@ -0,0 +1 @@
+alter table `t_group` modify column `_searchable` int(11) NOT NULL DEFAULT 0;

broker/migrate/mysql/V39__create_files_table.sql

@@ -0,0 +1,18 @@
+DROP TABLE IF EXISTS `t_file`;
+CREATE TABLE `t_file` (
+  `_mid` bigint(20) NOT NULL PRIMARY KEY,
+  `_from` varchar(64) NOT NULL,
+  `_type` tinyint NOT NULL DEFAULT 0,
+  `_target` varchar(64) NOT NULL,
+  `_line` int(11) NOT NULL DEFAULT 0,
+  `_name` varchar(128) DEFAULT '',
+  `_url` varchar(1024) NOT NULL DEFAULT '',
+  `_size` int(11) NOT NULL DEFAULT 0,
+  `_download_count` int(11) DEFAULT 0,
+  `_dt` bigint(20) NOT NULL,
+  INDEX `file_conv_index` (`_type`, `_line`, `_target`, `_mid`),
+  INDEX `file_user_index` (`_from`, `_mid`)
+)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8mb4
+COLLATE = utf8mb4_unicode_ci;

broker/pom.xml

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

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

@@ -15,6 +15,7 @@ public class PushMessage {
     public int convType;
     public String target;
     public String targetName;
+    public String userId;
     public int line;
     public int cntType;
     public long serverTime;

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

@@ -90,6 +90,7 @@ public class PushServer {
         pushMessage.pushContent = pushContent;
         pushMessage.deviceToken = session.getDeviceToken();
         pushMessage.unReceivedMsg = badge;
+        pushMessage.userId = session.getUsername();
         if (session.getPlatform() == ProtoConstants.Platform.Platform_iOS || session.getPlatform() == ProtoConstants.Platform.Platform_Android) {
             String url = androidPushServerUrl;
             if (session.getPlatform() == ProtoConstants.Platform.Platform_iOS) {

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

@@ -0,0 +1,85 @@
+/*
+ * 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.pojos.InputKickoffGroupMember;
+import cn.wildfirechat.pojos.InputSetGroupMemberAlias;
+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 win.liyufan.im.IMTopic;
+
+import java.util.concurrent.Executor;
+
+@Route(APIPath.Group_Set_Member_Alias)
+@HttpMethod("POST")
+public class ModifyGroupMemberAliasAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputSetGroupMemberAlias inputSetGroupMemberAlias = getRequestBody(request.getNettyRequest(), InputSetGroupMemberAlias.class);
+            if (inputSetGroupMemberAlias.isValide()) {
+                RPCCenter.getInstance().sendRequest(inputSetGroupMemberAlias.getOperator(), null, IMTopic.ModifyGroupMemberAliasTopic, inputSetGroupMemberAlias.toProtoGroupRequest().toByteArray(), inputSetGroupMemberAlias.getOperator(), 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/com/xiaoleilu/loServer/action/admin/RecallMultiCastMessageAction.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.admin;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.RecallMessageData;
+import cn.wildfirechat.pojos.RecallMultiCastMessageData;
+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.Msg_RecallMultiCast)
+@HttpMethod("POST")
+public class RecallMultiCastMessageAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            RecallMultiCastMessageData recallMessageData = getRequestBody(request.getNettyRequest(), RecallMultiCastMessageData.class);
+            if (recallMessageData != null && !StringUtil.isNullOrEmpty(recallMessageData.operator)) {
+
+                WFCMessage.RecallMultiCastMessageRequest recallRequest = WFCMessage.RecallMultiCastMessageRequest.newBuilder().setMessageId(recallMessageData.messageUid).addAllReceiver(recallMessageData.receivers).build();
+                RPCCenter.getInstance().sendRequest(recallMessageData.operator, null, IMTopic.RecallMultiCastMessageTopic, recallRequest.toByteArray(), recallMessageData.operator, 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());
+                        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/com/xiaoleilu/loServer/handler/HttpResponseHelper.java

@@ -11,8 +11,6 @@ import io.netty.util.CharsetUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.activation.MimetypesFileTypeMap;
-
 import static io.netty.handler.codec.http.HttpHeaders.Names.ACCESS_CONTROL_ALLOW_ORIGIN;
 import static io.netty.handler.codec.http.HttpHeaders.Names.CONTENT_RANGE;
 import static io.netty.handler.codec.http.HttpHeaders.Names.CONTENT_TYPE;
@@ -22,7 +20,6 @@ import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
 public class HttpResponseHelper {
 
 private static final Logger logger = LoggerFactory.getLogger(HttpResponseHelper.class);
-private static final MimetypesFileTypeMap mimetypesFileTypeMap = new MimetypesFileTypeMap();
 
 /**
  * sendResponse
@@ -149,7 +146,7 @@ public static String getContentType(String fileName) {
     if (fileExtName.equals("png")) { // MimetypesFileTypeMap目前缺少png类型
     return "image/png";
     } else {
-    return mimetypesFileTypeMap.getContentType(fileName);
+    return "application/octet-stream";
     }
     }
 

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

@@ -151,6 +151,12 @@ public final class BrokerConstants {
     public static final String CHATROOM_Participant_Idle_Time = "chatroom.participant_idle_time";
     public static final String CHATROOM_Rejoin_When_Active = "chatroom.rejoin_when_active";
 
+    public static final String GROUP_Allow_Client_Custom_Operation_Notification = "group.allow_client_custom_operation_notification";
+    public static final String GROUP_Visible_Quit_Kickoff_Notification = "group.visible_quit_or_kickoff_notification";
+
+
+    public static final String MESSAGES_FORBIDDEN_CLIENT_SEND_TYPES = "message.forbidden_client_send_types";
+
     public static final String MESSAGES_DISABLE_REMOTE_SEARCH = "message.disable_remote_search";
 
     public static final String MESSAGES_RECALL_TIME_LIMIT = "message.recall_time_limit";

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

@@ -27,9 +27,15 @@ public class CreateGroupHandler extends GroupHandler<WFCMessage.CreateGroupReque
                 return ErrorCode.ERROR_CODE_GROUP_ALREADY_EXIST;
             }
         }
+
+        if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0 && !isAdmin && !m_messagesStore.isAllowClientCustomGroupNotification()) {
+            return ErrorCode.ERROR_CODE_NOT_RIGHT;
+        }
+
         WFCMessage.GroupInfo groupInfo = m_messagesStore.createGroup(fromUser, request.getGroup().getGroupInfo(), request.getGroup().getMembersList(), isAdmin);
+
         if (groupInfo != null) {
-            if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
+            if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0 && (isAdmin || m_messagesStore.isAllowClientCustomGroupNotification())) {
                 sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), request.getNotifyContent());
             } else {
                 WFCMessage.MessageContent content = new GroupNotificationBinaryContent(groupInfo.getTargetId(), fromUser, groupInfo.getName(), "").getCreateGroupNotifyContent();

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

@@ -29,8 +29,12 @@ public class DismissGroupHandler extends GroupHandler<WFCMessage.DismissGroupReq
             } else if (isAdmin || (groupInfo.getType() == ProtoConstants.GroupType.GroupType_Normal || groupInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted)
                 && groupInfo.getOwner() != null && groupInfo.getOwner().equals(fromUser)) {
 
+                if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0 && !isAdmin && !m_messagesStore.isAllowClientCustomGroupNotification()) {
+                    return ErrorCode.ERROR_CODE_NOT_RIGHT;
+                }
+
                 //send notify message first, then dismiss group
-                if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
+                if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0 && (isAdmin || m_messagesStore.isAllowClientCustomGroupNotification())) {
                     sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), request.getNotifyContent());
                 } else {
                     WFCMessage.MessageContent content = new GroupNotificationBinaryContent(groupInfo.getTargetId(), fromUser, null, "").getDismissGroupNotifyContent();

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

@@ -13,10 +13,15 @@ import cn.wildfirechat.proto.WFCMessage;
 import win.liyufan.im.MessageShardingUtil;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 abstract public class GroupHandler<T> extends IMHandler<T> {
     protected void sendGroupNotification(String fromUser, String targetId, List<Integer> lines, WFCMessage.MessageContent content) {
+        sendGroupNotification(fromUser, targetId, lines, content, null);
+    }
+
+    protected void sendGroupNotification(String fromUser, String targetId, List<Integer> lines, WFCMessage.MessageContent content, Collection<String> toUsers) {
         if (lines == null) {
             lines = new ArrayList<>();
         } else {
@@ -32,6 +37,9 @@ abstract public class GroupHandler<T> extends IMHandler<T> {
             WFCMessage.Message.Builder builder = WFCMessage.Message.newBuilder().setContent(content).setServerTimestamp(timestamp);
             builder.setConversation(builder.getConversationBuilder().setType(ProtoConstants.ConversationType.ConversationType_Group).setTarget(targetId).setLine(line));
             builder.setFromUser(fromUser);
+            if(toUsers != null && !toUsers.isEmpty()) {
+                builder.addAllTo(toUsers);
+            }
             try {
                 long messageId = MessageShardingUtil.generateId();
                 builder.setMessageId(messageId);

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

@@ -34,10 +34,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.Set;
+import java.util.*;
 
 import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_OVER_FREQUENCY;
 import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
@@ -268,4 +265,13 @@ abstract public class IMHandler<T> {
         mServer.getImBusinessScheduler().execute(() -> publisher.publish2Receivers(updatedMessage, notifyReceivers, clientID, ProtoConstants.PullType.Pull_Normal));
         return notifyReceivers.size();
     }
+    protected long publishRecallMultiCastMsg(long messageUid, List<String> receivers) {
+        WFCMessage.Message updatedMessage = m_messagesStore.getMessage(messageUid);
+
+        Set<String> notifyReceivers = new HashSet<>(receivers);
+        LOG.info("Multicast recall receiver count: {}", notifyReceivers.size());
+        mServer.getImBusinessScheduler().execute(() -> publisher.publish2Receivers(updatedMessage, notifyReceivers, null, ProtoConstants.PullType.Pull_Normal));
+
+        return notifyReceivers.size();
+    }
 }

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

@@ -14,6 +14,9 @@ import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
 import cn.wildfirechat.common.ErrorCode;
+
+import java.util.Set;
+
 import static win.liyufan.im.IMTopic.KickoffGroupMemberTopic;
 
 @Handler(value = KickoffGroupMemberTopic)
@@ -47,13 +50,24 @@ public class KickoffGroupMember extends GroupHandler<WFCMessage.RemoveGroupMembe
             if (!isAllow && (groupInfo.getType() == ProtoConstants.GroupType.GroupType_Normal || groupInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted)) {
                 errorCode = ErrorCode.ERROR_CODE_NOT_RIGHT;
             } else {
+                if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0 && !isAdmin && !m_messagesStore.isAllowClientCustomGroupNotification()) {
+                    return ErrorCode.ERROR_CODE_NOT_RIGHT;
+                }
+
                 //send notify message first, then kickoff the member
-                if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
+                if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0 && (isAdmin || m_messagesStore.isAllowClientCustomGroupNotification())) {
                     sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), request.getNotifyContent());
                 } else {
                     WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, request.getRemovedMemberList()).getKickokfMemberGroupNotifyContent();
                     sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content);
                 }
+
+                if((m_messagesStore.getVisibleQuitKickoffNotification() & 0x02) > 0) {
+                    Set<String> toUsers = m_messagesStore.getGroupManagers(request.getGroupId(), true);
+                    toUsers.addAll(request.getRemovedMemberList());
+                    WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, request.getRemovedMemberList()).getKickokfMemberVisibleGroupNotifyContent();
+                    sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content, toUsers);
+                }
                 errorCode = m_messagesStore.kickoffGroupMembers(fromUser, isAdmin, request.getGroupId(), request.getRemovedMemberList());
             }
         }

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

@@ -21,9 +21,13 @@ import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
 public class ModifyGroupAliasHandler extends GroupHandler<WFCMessage.ModifyGroupMemberAlias> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ModifyGroupMemberAlias request, Qos1PublishHandler.IMCallback callback) {
+        if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0 && !isAdmin && !m_messagesStore.isAllowClientCustomGroupNotification()) {
+            return ErrorCode.ERROR_CODE_NOT_RIGHT;
+        }
+
         ErrorCode errorCode = m_messagesStore.modifyGroupAlias(fromUser, request.getGroupId(), request.getAlias(), null, isAdmin);
         if (errorCode == ERROR_CODE_SUCCESS && request.hasNotifyContent()) {
-            if (request.hasNotifyContent()&& request.getNotifyContent().getType() > 0) {
+            if (request.hasNotifyContent()&& request.getNotifyContent().getType() > 0 && (isAdmin || m_messagesStore.isAllowClientCustomGroupNotification())) {
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());
             } else {
                 WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getAlias(), "").getModifyGroupMemberAliasNotifyContent();

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

@@ -22,9 +22,13 @@ import static win.liyufan.im.IMTopic.ModifyGroupInfoTopic;
 public class ModifyGroupInfoHandler extends GroupHandler<WFCMessage.ModifyGroupInfoRequest> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ModifyGroupInfoRequest request, Qos1PublishHandler.IMCallback callback) {
+        if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0 && !isAdmin && !m_messagesStore.isAllowClientCustomGroupNotification()) {
+            return ErrorCode.ERROR_CODE_NOT_RIGHT;
+        }
+
         ErrorCode errorCode= m_messagesStore.modifyGroupInfo(fromUser, request.getGroupId(), request.getType(), request.getValue(), isAdmin);
         if (errorCode == ERROR_CODE_SUCCESS) {
-            if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
+            if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0 && (isAdmin || m_messagesStore.isAllowClientCustomGroupNotification())) {
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());
             } else {
                 WFCMessage.MessageContent content = null;

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

@@ -21,9 +21,13 @@ import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
 public class ModifyGroupMemberAliasHandler extends GroupHandler<WFCMessage.ModifyGroupMemberAlias> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ModifyGroupMemberAlias request, Qos1PublishHandler.IMCallback callback) {
+        if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0 && !isAdmin && !m_messagesStore.isAllowClientCustomGroupNotification()) {
+            return ErrorCode.ERROR_CODE_NOT_RIGHT;
+        }
+
         ErrorCode errorCode = m_messagesStore.modifyGroupAlias(fromUser, request.getGroupId(), request.getAlias(), request.getMemberId(), isAdmin);
         if (errorCode == ERROR_CODE_SUCCESS && request.hasNotifyContent()) {
-            if (request.hasNotifyContent()&& request.getNotifyContent().getType() > 0) {
+            if (request.hasNotifyContent()&& request.getNotifyContent().getType() > 0 && (isAdmin || m_messagesStore.isAllowClientCustomGroupNotification())) {
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());
             } else {
                 WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getAlias(), request.getMemberId()).getModifyGroupMemberAliasNotifyContent();

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

@@ -14,20 +14,32 @@ import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
 import cn.wildfirechat.common.ErrorCode;
 
+import java.util.Set;
+
 import static win.liyufan.im.IMTopic.QuitGroupTopic;
 
 @Handler(value = QuitGroupTopic)
 public class QuitGroupHandler extends GroupHandler<WFCMessage.QuitGroupRequest> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.QuitGroupRequest request, Qos1PublishHandler.IMCallback callback) {
+        if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0 && !isAdmin && !m_messagesStore.isAllowClientCustomGroupNotification()) {
+            return ErrorCode.ERROR_CODE_NOT_RIGHT;
+        }
+
         ErrorCode errorCode = m_messagesStore.quitGroup(fromUser, request.getGroupId());
         if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
-            if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
+            if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0 && (isAdmin || m_messagesStore.isAllowClientCustomGroupNotification())) {
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());
             } else {
                 WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, "").getQuitGroupNotifyContent();
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content);
             }
+
+            if((m_messagesStore.getVisibleQuitKickoffNotification() & 0x01) > 0) {
+                Set<String> toUsers = m_messagesStore.getGroupManagers(request.getGroupId(), true);
+                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, "").getQuitVisibleGroupNotifyContent();
+                sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content, toUsers);
+            }
         }
         return errorCode;
     }

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

@@ -0,0 +1,36 @@
+/*
+ * 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 io.moquette.imhandler;
+
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.proto.WFCMessage;
+import io.moquette.spi.impl.Qos1PublishHandler;
+import io.netty.buffer.ByteBuf;
+import win.liyufan.im.IMTopic;
+
+@Handler(value = IMTopic.RecallMultiCastMessageTopic)
+public class RecallMultiCastMessageHandler extends IMHandler<WFCMessage.RecallMultiCastMessageRequest> {
+    @Override
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.RecallMultiCastMessageRequest request, Qos1PublishHandler.IMCallback callback) {
+        if (!isAdmin) {
+            return ErrorCode.ERROR_CODE_NOT_RIGHT;
+        }
+
+        ErrorCode errorCode = m_messagesStore.recallCastMessage(request.getMessageId(), fromUser);
+
+        if(errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
+            return errorCode;
+        }
+
+        publishRecallMultiCastMsg(request.getMessageId(), request.getReceiverList());
+
+        return errorCode;
+    }
+
+}

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

@@ -58,9 +58,14 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
             boolean ignoreMsg = false;
             if (!isAdmin) {  //admin do not check the right
                 // 不能在端上直接发送撤回和群通知
-                if (message.getContent().getType() == 80 || (message.getContent().getType() >= 100 && message.getContent().getType() < 200)) {
+                if (message.getContent().getType() == 80 || message.getContent().getType() == 81 || (message.getContent().getType() >= 100 && message.getContent().getType() < 200)) {
                     return ErrorCode.INVALID_PARAMETER;
                 }
+
+                if(m_messagesStore.getClientForbiddenSendTypes().contains(message.getContent().getType())) {
+                    return ErrorCode.ERROR_CODE_NOT_RIGHT;
+                }
+
                 int userStatus = m_messagesStore.getUserStatus(fromUser);
                 if (userStatus == ProtoConstants.UserStatus.Muted || userStatus == ProtoConstants.UserStatus.Forbidden) {
                     return ErrorCode.ERROR_CODE_FORBIDDEN_SEND_MSG;

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

@@ -21,9 +21,13 @@ import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
 public class SetGroupManagerHandler extends GroupHandler<WFCMessage.SetGroupManagerRequest> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.SetGroupManagerRequest request, Qos1PublishHandler.IMCallback callback) {
+        if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0 && !isAdmin && !m_messagesStore.isAllowClientCustomGroupNotification()) {
+            return ErrorCode.ERROR_CODE_NOT_RIGHT;
+        }
+
         ErrorCode errorCode = m_messagesStore.setGroupManager(fromUser, request.getGroupId(), request.getType(), request.getUserIdList(), isAdmin);
         if (errorCode == ERROR_CODE_SUCCESS) {
-            if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
+            if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0 && (isAdmin || m_messagesStore.isAllowClientCustomGroupNotification())) {
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());
             } else {
                 WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getType() + "", request.getUserIdList()).getSetGroupManagerNotifyContent();

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

@@ -21,9 +21,13 @@ import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
 public class TransferGroupHandler extends GroupHandler<WFCMessage.TransferGroupRequest> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.TransferGroupRequest request, Qos1PublishHandler.IMCallback callback) {
+        if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0 && !isAdmin && !m_messagesStore.isAllowClientCustomGroupNotification()) {
+            return ErrorCode.ERROR_CODE_NOT_RIGHT;
+        }
+
         ErrorCode errorCode = m_messagesStore.transferGroup(fromUser, request.getGroupId(), request.getNewOwner(), isAdmin);
         if (errorCode == ERROR_CODE_SUCCESS) {
-            if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
+            if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0 && (isAdmin || m_messagesStore.isAllowClientCustomGroupNotification())) {
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());
             } else {
                 WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, request.getNewOwner()).getTransferGroupNotifyContent();

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

@@ -203,10 +203,9 @@ public class DatabaseStore {
             }
             
             if (page > 0) {
-                sql += "offset = '" + page * 20 + "'";
+                sql += " offset " + page * 20;
             }
 
-
             statement = connection.prepareStatement(sql);
             int index = 1;
 
@@ -3146,10 +3145,9 @@ public class DatabaseStore {
 
 
             if (page > 0) {
-                sql += "offset = '" + page * 20 + "'";
+                sql += " offset " + page * 20;
             }
 
-
             statement = connection.prepareStatement(sql);
             int index = 1;
             if (buzzy) {

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

@@ -39,11 +39,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import win.liyufan.im.*;
 
-import java.security.MessageDigest;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
@@ -141,6 +136,8 @@ public class MemoryMessagesStore implements IMessagesStore {
     private long mChatroomParticipantIdleTime = 900000;
     private boolean mChatroomRejoinWhenActive = true;
 
+    private List<Integer> mForbiddenClientSendTypes = new ArrayList<>();
+
     private long mRecallTimeLimit = 300;
 
     private String mGroupInfoUpdateCallback;
@@ -150,6 +147,8 @@ public class MemoryMessagesStore implements IMessagesStore {
     private String mChannelInfoUpdateCallback;
     private String mChatroomInfoUpdateCallback;
     private String mChatroomMemberUpdateCallback;
+    private boolean mGroupAllowClientCustomOperationNotification;
+    private int mGroupVisibleQuitKickoffNotification;
 
     MemoryMessagesStore(Server server, DatabaseStore databaseStore) {
         m_Server = server;
@@ -257,6 +256,23 @@ public class MemoryMessagesStore implements IMessagesStore {
         } catch (Exception e) {
         }
 
+        try {
+            String strTypes = m_Server.getConfig().getProperty(BrokerConstants.MESSAGES_FORBIDDEN_CLIENT_SEND_TYPES);
+            if(!StringUtil.isNullOrEmpty(strTypes)) {
+                for (String strType:strTypes.split(",")) {
+                    try {
+                        int type = Integer.parseInt(strType);
+                        mForbiddenClientSendTypes.add(type);
+                    } catch (NumberFormatException e) {
+
+                    }
+                }
+            }
+        } catch (Exception e) {
+        }
+
+
+
         try {
             mGroupInfoUpdateCallback = server.getConfig().getProperty(GROUP_INFO_UPDATE_CALLBACK);
         } catch (Exception e) {
@@ -298,6 +314,20 @@ public class MemoryMessagesStore implements IMessagesStore {
         } catch (Exception e) {
 
         }
+
+        try {
+            mGroupAllowClientCustomOperationNotification = Boolean.parseBoolean(server.getConfig().getProperty(GROUP_Allow_Client_Custom_Operation_Notification));
+        } catch (Exception e) {
+
+        }
+
+        try {
+            mGroupVisibleQuitKickoffNotification = Integer.parseInt(server.getConfig().getProperty(GROUP_Visible_Quit_Kickoff_Notification, "0"));
+        } catch (Exception e) {
+
+        }
+
+
     }
 
     private void printMissConfigLog(String config, String defaultValue) {
@@ -368,9 +398,9 @@ public class MemoryMessagesStore implements IMessagesStore {
                 pullType = ProtoConstants.PullType.Pull_ChatRoom;
             }
 
-            if (message.getContent().getPersistFlag() != Transparent) {
+//            if (message.getContent().getPersistFlag() != Transparent) {
                 notifyReceivers.add(fromUser);
-            }
+//            }
             return pullType;
         }
 
@@ -454,10 +484,10 @@ public class MemoryMessagesStore implements IMessagesStore {
                 LOG.error("Channel not exist");
             }
         }
-
-        if (message.getContent().getPersistFlag() == Transparent) {
-            notifyReceivers.remove(fromUser);
-        }
+//
+//        if (message.getContent().getPersistFlag() == Transparent) {
+//            notifyReceivers.remove(fromUser);
+//        }
 
         return pullType;
     }
@@ -1665,6 +1695,25 @@ public class MemoryMessagesStore implements IMessagesStore {
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
+    @Override
+    public Set<String> getGroupManagers(String groupId, boolean includeOwner) {
+        Set<String> ret = new HashSet<>();
+        HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
+        MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
+
+        Collection<WFCMessage.GroupMember> members = groupMembers.get(groupId);
+        if (members == null || members.size() == 0) {
+            members = loadGroupMemberFromDB(hzInstance, groupId);
+        }
+        for (WFCMessage.GroupMember member : members) {
+            if(member.getType() == GroupMemberType_Manager || (member.getType() == GroupMemberType_Owner && includeOwner)) {
+                ret.add(member.getMemberId());
+            }
+        }
+
+        return ret;
+    }
+
     @Override
     public ErrorCode recallMessage(long messageUid, String operatorId, String clientId, boolean isAdmin) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
@@ -1754,6 +1803,26 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
     }
 
+    public ErrorCode recallCastMessage(long messageUid, String operatorId) {
+        HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
+        IMap<Long, MessageBundle> mIMap = hzInstance.getMap(MESSAGES_MAP);
+
+        MessageBundle messageBundle = mIMap.get(messageUid);
+        if (messageBundle != null) {
+            WFCMessage.Message message = messageBundle.getMessage();
+
+            message = message.toBuilder().setContent(WFCMessage.MessageContent.newBuilder().setContent(operatorId).setType(80).setData(ByteString.copyFrom(String.valueOf(messageUid).getBytes()))).build();
+            messageBundle.setMessage(message);
+            messageBundle.setFromClientId(null);
+
+            databaseStore.deleteMessage(messageUid);
+            mIMap.set(messageUid, messageBundle, 7, TimeUnit.DAYS);
+            return ErrorCode.ERROR_CODE_SUCCESS;
+        } else {
+            return ErrorCode.ERROR_CODE_NOT_EXIST;
+        }
+    }
+
     @Override
     public void clearUserMessages(String userId) {
         mWriteLock.lock();
@@ -2642,7 +2711,9 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
 
         if (friendData == null) {
-            return ErrorCode.ERROR_CODE_NOT_EXIST;
+            friendData = new FriendData();
+            friendData.setUserId(fromUser);
+            friendData.setFriendUid(targetUserId);
         }
 
         friendData.setAlias(alias);
@@ -3235,6 +3306,22 @@ public class MemoryMessagesStore implements IMessagesStore {
         return null;
     }
 
+    @Override
+    public boolean isAllowClientCustomGroupNotification() {
+        return mGroupAllowClientCustomOperationNotification;
+    }
+
+    @Override
+    public int getVisibleQuitKickoffNotification() {
+        return mGroupVisibleQuitKickoffNotification;
+    }
+
+
+    @Override
+    public List<Integer> getClientForbiddenSendTypes() {
+        return mForbiddenClientSendTypes;
+    }
+
     @Override
     public long getMessageHead(String user) {
         TreeMap<Long, Long> maps = userMessages.get(user);

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

@@ -122,8 +122,10 @@ public interface IMessagesStore {
     ErrorCode setGroupManager(String operator, String groupId, int type, List<String> userList, boolean isAdmin);
     boolean isMemberInGroup(String member, String groupId);
     ErrorCode canSendMessageInGroup(String member, String groupId);
+    Set<String> getGroupManagers(String groupId, boolean includeOwner);
 
     ErrorCode recallMessage(long messageUid, String operatorId, String clientId, boolean isAdmin);
+    ErrorCode recallCastMessage(long messageUid, String operatorId);
 
     void clearUserMessages(String userId);
 
@@ -208,6 +210,12 @@ public interface IMessagesStore {
     List<String> getAllSensitiveWords();
 
     WFCMessage.Message getMessage(long messageId);
+
+    boolean isAllowClientCustomGroupNotification();
+    int getVisibleQuitKickoffNotification();
+
+    List<Integer> getClientForbiddenSendTypes();
+
     long getMessageHead(String user);
     long getFriendHead(String user);
     long getFriendRqHead(String user);

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

@@ -161,7 +161,7 @@ public class MessagesPublisher {
 
     private void publish2Receivers(String sender, int conversationType, String target, int line, long messageHead, Collection<String> receivers, String pushContent, String pushData, String exceptClientId, int pullType, int messageContentType, long serverTime, int mentionType, List<String> mentionTargets, int persistFlag) {
         if (persistFlag == Transparent) {
-            publishTransparentMessage2Receivers(messageHead, receivers, pullType);
+            publishTransparentMessage2Receivers(messageHead, receivers, pullType, exceptClientId);
             return;
         }
 
@@ -366,7 +366,7 @@ public class MessagesPublisher {
         }
     }
 
-    private void publishTransparentMessage2Receivers(long messageHead, Collection<String> receivers, int pullType) {
+    private void publishTransparentMessage2Receivers(long messageHead, Collection<String> receivers, int pullType, String exceptClientId) {
         WFCMessage.Message message = m_messagesStore.getMessage(messageHead);
 
         if (message != null) {
@@ -381,6 +381,9 @@ public class MessagesPublisher {
                     if (targetSession.getClientID() == null) {
                         continue;
                     }
+                    if (targetSession.getClientID().equals(exceptClientId)) {
+                        continue;
+                    }
 
                     boolean targetIsActive = this.connectionDescriptors.isConnected(targetSession.getClientSession().clientID);
                     if (targetIsActive) {

broker/src/main/java/win/liyufan/im/IMTopic.java

@@ -12,6 +12,7 @@ public interface IMTopic {
 	String SendMessageTopic = "MS";
     String MultiCastMessageTopic = "MMC";
     String RecallMessageTopic = "MR";
+    String RecallMultiCastMessageTopic = "MRMC";
 	String PullMessageTopic = "MP";
 	String NotifyMessageTopic = "MN";
     String NotifyRecallMessageTopic = "RMN";

common/pom.xml

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

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

@@ -44,6 +44,8 @@ public interface APIPath {
     String Msg_Delete = "/admin/message/delete";
     String Msg_Broadcast = "/admin/message/broadcast";
     String Msg_Multicast = "/admin/message/multicast";
+    String Msg_RecallBroadCast = "/admin/message/recall_broadcast";
+    String Msg_RecallMultiCast = "/admin/message/recall_multicast";
 
     String Create_Group = "/admin/group/create";
     String Group_Dismiss = "/admin/group/del";
@@ -58,7 +60,7 @@ public interface APIPath {
     String Group_Mute_Member = "/admin/group/manager/mute";
     String Group_Allow_Member = "/admin/group/manager/allow";
     String Get_User_Groups = "/admin/group/of_user";
-
+    String Group_Set_Member_Alias = "/admin/group/member/set_alias";
 
     String Create_Channel = "/admin/channel/create";
     String Get_System_Setting = "/admin/system/get_setting";

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

@@ -105,10 +105,18 @@ public class GroupNotificationBinaryContent {
         return getGroupNotifyContent(ProtoConstants.MESSAGE_CONTENT_TYPE_KICKOF_GROUP_MEMBER);
     }
 
+    public WFCMessage.MessageContent getKickokfMemberVisibleGroupNotifyContent() {
+        return getGroupNotifyContent(ProtoConstants.MESSAGE_CONTENT_TYPE_KICKOF_GROUP_MEMBER_VISIBLE);
+    }
+
     public WFCMessage.MessageContent getQuitGroupNotifyContent() {
         return getGroupNotifyContent(ProtoConstants.MESSAGE_CONTENT_TYPE_QUIT_GROUP);
     }
 
+    public WFCMessage.MessageContent getQuitVisibleGroupNotifyContent() {
+        return getGroupNotifyContent(ProtoConstants.MESSAGE_CONTENT_TYPE_QUIT_GROUP_VISIBLE);
+    }
+
     public WFCMessage.MessageContent getTransferGroupNotifyContent() {
         return getGroupNotifyContent(ProtoConstants.MESSAGE_CONTENT_TYPE_TRANSFER_GROUP_OWNER);
     }

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

@@ -0,0 +1,67 @@
+/*
+ * 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;
+import io.netty.util.internal.StringUtil;
+
+import java.util.List;
+
+public class InputSetGroupMemberAlias extends InputGroupBase {
+    private String group_id;
+    private String memberId;
+    private String alias;
+
+    public String getGroup_id() {
+        return group_id;
+    }
+
+    public void setGroup_id(String group_id) {
+        this.group_id = group_id;
+    }
+
+    public boolean isValide() {
+        return true;
+    }
+
+    public WFCMessage.ModifyGroupMemberAlias toProtoGroupRequest() {
+        WFCMessage.ModifyGroupMemberAlias.Builder modifyAliasBuilder = WFCMessage.ModifyGroupMemberAlias.newBuilder();
+        modifyAliasBuilder.setGroupId(group_id);
+        modifyAliasBuilder.setAlias(StringUtil.isNullOrEmpty(alias)?"":alias);
+        modifyAliasBuilder.setMemberId(memberId);
+
+        if (to_lines != null) {
+            for (Integer line : to_lines) {
+                modifyAliasBuilder.addToLine(line);
+            }
+        }
+
+        if (notify_message != null) {
+            modifyAliasBuilder.setNotifyContent(notify_message.toProtoMessageContent());
+        }
+        return modifyAliasBuilder.build();
+    }
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+
+    public String getAlias() {
+        return alias;
+    }
+
+    public void setAlias(String alias) {
+        this.alias = alias;
+    }
+}

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

@@ -0,0 +1,17 @@
+/*
+ * 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 java.util.List;
+
+public class RecallMultiCastMessageData {
+    public String operator;
+    public long messageUid;
+    public List<String> receivers;
+}

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

@@ -219,5 +219,7 @@ public class ProtoConstants {
     public static final int MESSAGE_CONTENT_TYPE_SET_MANAGER = 117;
     public static final int MESSAGE_CONTENT_TYPE_MUTE_MEMBER = 118;
     public static final int MESSAGE_CONTENT_TYPE_ALLOW_MEMBER = 119;
+    public static final int MESSAGE_CONTENT_TYPE_KICKOF_GROUP_MEMBER_VISIBLE = 120;
+    public static final int MESSAGE_CONTENT_TYPE_QUIT_GROUP_VISIBLE = 121;
 }
 

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

@@ -58949,6 +58949,595 @@ public final class WFCMessage {
     // @@protoc_insertion_point(class_scope:MultiCastMessage)
   }
 
+  public interface RecallMultiCastMessageRequestOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
+
+    // required int64 message_id = 1;
+    /**
+     * <code>required int64 message_id = 1;</code>
+     */
+    boolean hasMessageId();
+    /**
+     * <code>required int64 message_id = 1;</code>
+     */
+    long getMessageId();
+
+    // repeated string receiver = 2;
+    /**
+     * <code>repeated string receiver = 2;</code>
+     */
+    java.util.List<java.lang.String>
+    getReceiverList();
+    /**
+     * <code>repeated string receiver = 2;</code>
+     */
+    int getReceiverCount();
+    /**
+     * <code>repeated string receiver = 2;</code>
+     */
+    java.lang.String getReceiver(int index);
+    /**
+     * <code>repeated string receiver = 2;</code>
+     */
+    com.google.protobuf.ByteString
+        getReceiverBytes(int index);
+  }
+  /**
+   * Protobuf type {@code RecallMultiCastMessageRequest}
+   */
+  public static final class RecallMultiCastMessageRequest extends
+      com.google.protobuf.GeneratedMessage
+      implements RecallMultiCastMessageRequestOrBuilder {
+    // Use RecallMultiCastMessageRequest.newBuilder() to construct.
+    private RecallMultiCastMessageRequest(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+      this.unknownFields = builder.getUnknownFields();
+    }
+    private RecallMultiCastMessageRequest(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+    private static final RecallMultiCastMessageRequest defaultInstance;
+    public static RecallMultiCastMessageRequest getDefaultInstance() {
+      return defaultInstance;
+    }
+
+    public RecallMultiCastMessageRequest getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private RecallMultiCastMessageRequest(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      initFields();
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 8: {
+              bitField0_ |= 0x00000001;
+              messageId_ = input.readInt64();
+              break;
+            }
+            case 18: {
+              if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+                receiver_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              receiver_.add(input.readBytes());
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e.getMessage()).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+          receiver_ = new com.google.protobuf.UnmodifiableLazyStringList(receiver_);
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return cn.wildfirechat.proto.WFCMessage.internal_static_RecallMultiCastMessageRequest_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return cn.wildfirechat.proto.WFCMessage.internal_static_RecallMultiCastMessageRequest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest.class, cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<RecallMultiCastMessageRequest> PARSER =
+        new com.google.protobuf.AbstractParser<RecallMultiCastMessageRequest>() {
+      public RecallMultiCastMessageRequest parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new RecallMultiCastMessageRequest(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<RecallMultiCastMessageRequest> getParserForType() {
+      return PARSER;
+    }
+
+    private int bitField0_;
+    // required int64 message_id = 1;
+    public static final int MESSAGE_ID_FIELD_NUMBER = 1;
+    private long messageId_;
+    /**
+     * <code>required int64 message_id = 1;</code>
+     */
+    public boolean hasMessageId() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
+    }
+    /**
+     * <code>required int64 message_id = 1;</code>
+     */
+    public long getMessageId() {
+      return messageId_;
+    }
+
+    // repeated string receiver = 2;
+    public static final int RECEIVER_FIELD_NUMBER = 2;
+    private com.google.protobuf.LazyStringList receiver_;
+    /**
+     * <code>repeated string receiver = 2;</code>
+     */
+    public java.util.List<java.lang.String>
+        getReceiverList() {
+      return receiver_;
+    }
+    /**
+     * <code>repeated string receiver = 2;</code>
+     */
+    public int getReceiverCount() {
+      return receiver_.size();
+    }
+    /**
+     * <code>repeated string receiver = 2;</code>
+     */
+    public java.lang.String getReceiver(int index) {
+      return receiver_.get(index);
+    }
+    /**
+     * <code>repeated string receiver = 2;</code>
+     */
+    public com.google.protobuf.ByteString
+        getReceiverBytes(int index) {
+      return receiver_.getByteString(index);
+    }
+
+    private void initFields() {
+      messageId_ = 0L;
+      receiver_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    }
+    private byte memoizedIsInitialized = -1;
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized != -1) return isInitialized == 1;
+
+      if (!hasMessageId()) {
+        memoizedIsInitialized = 0;
+        return false;
+      }
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      getSerializedSize();
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        output.writeInt64(1, messageId_);
+      }
+      for (int i = 0; i < receiver_.size(); i++) {
+        output.writeBytes(2, receiver_.getByteString(i));
+      }
+      getUnknownFields().writeTo(output);
+    }
+
+    private int memoizedSerializedSize = -1;
+    public int getSerializedSize() {
+      int size = memoizedSerializedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt64Size(1, messageId_);
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < receiver_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeBytesSizeNoTag(receiver_.getByteString(i));
+        }
+        size += dataSize;
+        size += 1 * getReceiverList().size();
+      }
+      size += getUnknownFields().getSerializedSize();
+      memoizedSerializedSize = size;
+      return size;
+    }
+
+    private static final long serialVersionUID = 0L;
+    @java.lang.Override
+    protected java.lang.Object writeReplace()
+        throws java.io.ObjectStreamException {
+      return super.writeReplace();
+    }
+
+    public static cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+    public static cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input);
+    }
+    public static cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+    }
+    public static cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+
+    public static Builder newBuilder() { return Builder.create(); }
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder(cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest prototype) {
+      return newBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() { return newBuilder(this); }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code RecallMultiCastMessageRequest}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequestOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return cn.wildfirechat.proto.WFCMessage.internal_static_RecallMultiCastMessageRequest_descriptor;
+      }
+
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return cn.wildfirechat.proto.WFCMessage.internal_static_RecallMultiCastMessageRequest_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest.class, cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest.Builder.class);
+      }
+
+      // Construct using cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        }
+      }
+      private static Builder create() {
+        return new Builder();
+      }
+
+      public Builder clear() {
+        super.clear();
+        messageId_ = 0L;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        receiver_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        return this;
+      }
+
+      public Builder clone() {
+        return create().mergeFrom(buildPartial());
+      }
+
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return cn.wildfirechat.proto.WFCMessage.internal_static_RecallMultiCastMessageRequest_descriptor;
+      }
+
+      public cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest getDefaultInstanceForType() {
+        return cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest.getDefaultInstance();
+      }
+
+      public cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest build() {
+        cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      public cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest buildPartial() {
+        cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest result = new cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        result.messageId_ = messageId_;
+        if (((bitField0_ & 0x00000002) == 0x00000002)) {
+          receiver_ = new com.google.protobuf.UnmodifiableLazyStringList(
+              receiver_);
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.receiver_ = receiver_;
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest) {
+          return mergeFrom((cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest other) {
+        if (other == cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest.getDefaultInstance()) return this;
+        if (other.hasMessageId()) {
+          setMessageId(other.getMessageId());
+        }
+        if (!other.receiver_.isEmpty()) {
+          if (receiver_.isEmpty()) {
+            receiver_ = other.receiver_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureReceiverIsMutable();
+            receiver_.addAll(other.receiver_);
+          }
+          onChanged();
+        }
+        this.mergeUnknownFields(other.getUnknownFields());
+        return this;
+      }
+
+      public final boolean isInitialized() {
+        if (!hasMessageId()) {
+          
+          return false;
+        }
+        return true;
+      }
+
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (cn.wildfirechat.proto.WFCMessage.RecallMultiCastMessageRequest) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      // required int64 message_id = 1;
+      private long messageId_ ;
+      /**
+       * <code>required int64 message_id = 1;</code>
+       */
+      public boolean hasMessageId() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
+      }
+      /**
+       * <code>required int64 message_id = 1;</code>
+       */
+      public long getMessageId() {
+        return messageId_;
+      }
+      /**
+       * <code>required int64 message_id = 1;</code>
+       */
+      public Builder setMessageId(long value) {
+        bitField0_ |= 0x00000001;
+        messageId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>required int64 message_id = 1;</code>
+       */
+      public Builder clearMessageId() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        messageId_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      // repeated string receiver = 2;
+      private com.google.protobuf.LazyStringList receiver_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      private void ensureReceiverIsMutable() {
+        if (!((bitField0_ & 0x00000002) == 0x00000002)) {
+          receiver_ = new com.google.protobuf.LazyStringArrayList(receiver_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <code>repeated string receiver = 2;</code>
+       */
+      public java.util.List<java.lang.String>
+          getReceiverList() {
+        return java.util.Collections.unmodifiableList(receiver_);
+      }
+      /**
+       * <code>repeated string receiver = 2;</code>
+       */
+      public int getReceiverCount() {
+        return receiver_.size();
+      }
+      /**
+       * <code>repeated string receiver = 2;</code>
+       */
+      public java.lang.String getReceiver(int index) {
+        return receiver_.get(index);
+      }
+      /**
+       * <code>repeated string receiver = 2;</code>
+       */
+      public com.google.protobuf.ByteString
+          getReceiverBytes(int index) {
+        return receiver_.getByteString(index);
+      }
+      /**
+       * <code>repeated string receiver = 2;</code>
+       */
+      public Builder setReceiver(
+          int index, java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureReceiverIsMutable();
+        receiver_.set(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string receiver = 2;</code>
+       */
+      public Builder addReceiver(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureReceiverIsMutable();
+        receiver_.add(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string receiver = 2;</code>
+       */
+      public Builder addAllReceiver(
+          java.lang.Iterable<java.lang.String> values) {
+        ensureReceiverIsMutable();
+        super.addAll(values, receiver_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string receiver = 2;</code>
+       */
+      public Builder clearReceiver() {
+        receiver_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string receiver = 2;</code>
+       */
+      public Builder addReceiverBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureReceiverIsMutable();
+        receiver_.add(value);
+        onChanged();
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:RecallMultiCastMessageRequest)
+    }
+
+    static {
+      defaultInstance = new RecallMultiCastMessageRequest(true);
+      defaultInstance.initFields();
+    }
+
+    // @@protoc_insertion_point(class_scope:RecallMultiCastMessageRequest)
+  }
+
   private static com.google.protobuf.Descriptors.Descriptor
     internal_static_AddFriendRequest_descriptor;
   private static
@@ -59299,6 +59888,11 @@ public final class WFCMessage {
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_MultiCastMessage_fieldAccessorTable;
+  private static com.google.protobuf.Descriptors.Descriptor
+    internal_static_RecallMultiCastMessageRequest_descriptor;
+  private static
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_RecallMultiCastMessageRequest_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -59463,7 +60057,9 @@ public final class WFCMessage {
       "id\030\002 \002(\003\022\r\n\005count\030\003 \002(\005\"a\n\020MultiCastMess" +
       "age\022\021\n\tfrom_user\030\001 \002(\t\022 \n\007content\030\002 \002(\0132" +
       "\017.MessageContent\022\n\n\002to\030\003 \003(\t\022\014\n\004line\030\004 \002" +
-      "(\005B#\n\025cn.wildfirechat.protoB\nWFCMessage"
+      "(\005\"E\n\035RecallMultiCastMessageRequest\022\022\n\nm" +
+      "essage_id\030\001 \002(\003\022\020\n\010receiver\030\002 \003(\tB#\n\025cn." +
+      "wildfirechat.protoB\nWFCMessage"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -59890,6 +60486,12 @@ public final class WFCMessage {
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_MultiCastMessage_descriptor,
               new java.lang.String[] { "FromUser", "Content", "To", "Line", });
+          internal_static_RecallMultiCastMessageRequest_descriptor =
+            getDescriptor().getMessageTypes().get(70);
+          internal_static_RecallMultiCastMessageRequest_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_RecallMultiCastMessageRequest_descriptor,
+              new java.lang.String[] { "MessageId", "Receiver", });
           return null;
         }
       };

distribution/pom.xml

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

distribution/src/main/resources/wildfirechat.conf

@@ -69,6 +69,10 @@ message.disable_remote_search  false
 ##允许客户端撤回消息时限，单位是秒。群组管理员或群主撤回群成员消息、server api不受此限制，可以撤回任意时限内的消息
 message.recall_time_limit 120
 
+## 禁止客户端发送消息类型，消息类型以逗号分开，下面3个值为示例，可以删除。
+## 一般用于重要类型消息，比如交易、充值等，禁止客户端发送，仅限于服务器发送，提高安全性。
+message.forbidden_client_send_types 3999,4000,4001
+
 ##禁止搜索用户
 friend.disable_search false
 
@@ -99,6 +103,14 @@ chatroom.participant_idle_time 900000
 ## 用户向聊天室发送消息，自动加入聊天室
 chatroom.rejoin_when_active true
 
+## 是否允许客户端发送操作群的自定义群通知消息
+group.allow_client_custom_operation_notification false
+
+## 当群成员退出或者被移除时，是否同时给管理员和相关人员发送显式通知消息。
+## 0 不发送，1 退群时发送，2 踢人时发送，3 退群和踢人时都发送。
+## 如果应用需要退群或者踢人不通知普通成员，请设置此参数为3，然后修改客户端踢人或退群消息的flag为not_presist。
+group.visible_quit_or_kickoff_notification 0
+
 #*********************************************************************
 # hazelcase configuration
 #*********************************************************************

flyway_repaire_migrate_38.sql

@@ -0,0 +1,36 @@
+--  IM服务在2020.10.6-2020-11.2号之间的版本升级到最新版本时，可能会提示出现如下的错误：
+--  Exception in thread "main" org.flywaydb.core.api.FlywayException: Validate failed: Detected resolved migration not applied to database: 38
+--      at org.flywaydb.core.Flyway.doValidate(Flyway.java:1482)
+--      at org.flywaydb.core.Flyway.access$100(Flyway.java:85)
+--      at org.flywaydb.core.Flyway$1.execute(Flyway.java:1364)
+--      at org.flywaydb.core.Flyway$1.execute(Flyway.java:1356)
+--      ...
+--
+--  当出现这个问题后，执行这个sql就可以修复了。
+--
+--
+DROP TABLE IF EXISTS `t_file`;
+CREATE TABLE `t_file` (
+  `_mid` bigint(20) NOT NULL PRIMARY KEY,
+  `_from` varchar(64) NOT NULL,
+  `_type` tinyint NOT NULL DEFAULT 0,
+  `_target` varchar(64) NOT NULL,
+  `_line` int(11) NOT NULL DEFAULT 0,
+  `_name` varchar(128) DEFAULT '',
+  `_url` varchar(1024) NOT NULL DEFAULT '',
+  `_size` int(11) NOT NULL DEFAULT 0,
+  `_download_count` int(11) DEFAULT 0,
+  `_dt` bigint(20) NOT NULL,
+  INDEX `file_conv_index` (`_type`, `_line`, `_target`, `_mid`),
+  INDEX `file_user_index` (`_from`, `_mid`)
+)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8mb4
+COLLATE = utf8mb4_unicode_ci;
+
+
+alter table `t_group` modify column `_searchable` int(11) NOT NULL DEFAULT 0;
+
+update flyway_schema_history set installed_rank = 40 where version = 40;
+
+insert into flyway_schema_history values (38,'38','alter group searchable column','SQL','V38__alter_group_searchable_column.sql',-524664704,'root','2020-07-21 14:43:50',1126,1),(39,'39','create files table','SQL','V39__create_files_table.sql',1144437159,'root','2020-08-03 03:15:04',503,1);

pom.xml

@@ -12,7 +12,7 @@
     <artifactId>wildfirechat-parent</artifactId>
 
     <packaging>pom</packaging>
-    <version>0.47</version>
+    <version>0.50</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.47</version>
+        <version>0.50</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -140,6 +140,18 @@ public class GroupAdmin {
         return AdminHttpUtils.httpJsonPost(path, quitGroup, Void.class);
     }
 
+    public static IMResult<Void> setGroupMemberAlias(String operator, String groupId, String memberId, String alias, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
+        String path = APIPath.Group_Set_Member_Alias;
+        InputSetGroupMemberAlias input = new InputSetGroupMemberAlias();
+        input.setGroup_id(groupId);
+        input.setOperator(operator);
+        input.setMemberId(memberId);
+        input.setAlias(alias);
+        input.setTo_lines(to_lines);
+        input.setNotify_message(notify_message);
+        return AdminHttpUtils.httpJsonPost(path, input, Void.class);
+    }
+
     public static IMResult<OutputGroupIds> getUserGroups(String user) throws Exception {
         String path = APIPath.Get_User_Groups;
         InputUserId inputUserId = new InputUserId();

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

@@ -434,7 +434,7 @@ public class Main {
         PojoGroupMember m = new PojoGroupMember();
         m.setMember_id("user1");
         m.setAlias("hello user1");
-        
+
         voidIMResult = GroupAdmin.addGroupMembers("user1", groupInfo.getTarget_id(), Arrays.asList(m), null, null);
         if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("add group member success");
@@ -451,22 +451,31 @@ public class Main {
             System.exit(-1);
         }
 
-        voidIMResult = GroupAdmin.setGroupManager("user1", groupInfo.getTarget_id(), Arrays.asList("user4", "user5"), true, null, null);
+        voidIMResult = GroupAdmin.setGroupMemberAlias("user1", groupInfo.getTarget_id(), "user3", "test user3", null, null);
         if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-            System.out.println("set group manager success");
+            System.out.println("set group member alias success");
         } else {
-            System.out.println("set group manager failure");
+            System.out.println("set group member alias failure");
             System.exit(-1);
         }
 
-        voidIMResult = GroupAdmin.setGroupManager("user1", groupInfo.getTarget_id(), Arrays.asList("user4", "user5"), false, null, null);
-        if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-            System.out.println("cancel group manager success");
-        } else {
-            System.out.println("cancel group manager failure");
-            System.exit(-1);
-        }
+        if(commercialServer) {
+            voidIMResult = GroupAdmin.setGroupManager("user1", groupInfo.getTarget_id(), Arrays.asList("user4", "user5"), true, null, null);
+            if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("set group manager success");
+            } else {
+                System.out.println("set group manager failure");
+                System.exit(-1);
+            }
 
+            voidIMResult = GroupAdmin.setGroupManager("user1", groupInfo.getTarget_id(), Arrays.asList("user4", "user5"), false, null, null);
+            if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("cancel group manager success");
+            } else {
+                System.out.println("cancel group manager failure");
+                System.exit(-1);
+            }
+        }
 
         voidIMResult = GroupAdmin.quitGroup("user4", groupInfo.getTarget_id(), null, null);
         if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
@@ -540,7 +549,7 @@ public class Main {
         payload.setType(1);
         payload.setSearchableContent("hello world");
 
-        IMResult<SendMessageResult> resultSendMessage = MessageAdmin.sendMessage("user1", conversation, payload);
+        IMResult<SendMessageResult> resultSendMessage = MessageAdmin.sendMessage("user1", conversation, payload, null);
         if (resultSendMessage != null && resultSendMessage.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("send message success");
         } else {
@@ -573,6 +582,13 @@ public class Main {
                 System.out.println("broad message failure");
                 System.exit(-1);
             }
+
+            voidIMResult = MessageAdmin.recallBroadCastMessage("user1", resultBroadcastMessage.result.getMessageUid());
+            if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("Success");
+            } else {
+                System.out.println("failure");
+            }
         }
 
         List<String> multicastReceivers = Arrays.asList("user2", "user3", "user4");
@@ -583,6 +599,13 @@ public class Main {
             System.out.println("multi message failure");
             System.exit(-1);
         }
+
+        voidIMResult = MessageAdmin.recallMultiCastMessage("user1", resultMulticastMessage.result.getMessageUid(), multicastReceivers);
+        if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("Success");
+        } else {
+            System.out.println("failure");
+        }
     }
 
     //***********************************************

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

@@ -9,11 +9,16 @@ import java.util.List;
 
 public class MessageAdmin {
     public static IMResult<SendMessageResult> sendMessage(String sender, Conversation conversation, MessagePayload payload) throws Exception {
+        return sendMessage(sender, conversation, payload, null);
+    }
+    //toUsers为发送给会话中部分用户用的，正常为null，仅当需要指定群/频道/聊天室中部分接收用户时使用
+    public static IMResult<SendMessageResult> sendMessage(String sender, Conversation conversation, MessagePayload payload, List<String> toUsers) throws Exception {
         String path = APIPath.Msg_Send;
         SendMessageData messageData = new SendMessageData();
         messageData.setSender(sender);
         messageData.setConv(conversation);
         messageData.setPayload(payload);
+        messageData.setToUsers(toUsers);
         return AdminHttpUtils.httpJsonPost(path, messageData, SendMessageResult.class);
     }
 
@@ -36,19 +41,29 @@ public class MessageAdmin {
 
     /**
      * 撤回群发或者广播的消息
-     * @param target 目标用户
+     * @param operator 操作者
      * @param messageUid 消息唯一ID
      * @return
      * @throws Exception
      */
-    public static IMResult<Void> recallBroadcastOrMulticastMessage(String target, long messageUid) throws Exception {
-        String path = APIPath.Msg_Recall;
+    public static IMResult<Void> recallBroadCastMessage(String operator, long messageUid) throws Exception {
+        String path = APIPath.Msg_RecallBroadCast;
         RecallMessageData messageData = new RecallMessageData();
-        messageData.setOperator(target);
+        messageData.setOperator(operator);
         messageData.setMessageUid(messageUid);
         return AdminHttpUtils.httpJsonPost(path, messageData, Void.class);
     }
 
+    public static IMResult<Void> recallMultiCastMessage(String operator, long messageUid, List<String> receivers) throws Exception {
+        String path = APIPath.Msg_RecallMultiCast;
+        RecallMultiCastMessageData messageData = new RecallMultiCastMessageData();
+        messageData.operator = operator;
+        messageData.messageUid = messageUid;
+        messageData.receivers = receivers;
+
+        return AdminHttpUtils.httpJsonPost(path, messageData, Void.class);
+    }
+
     public static IMResult<BroadMessageResult> broadcastMessage(String sender, int line, MessagePayload payload) throws Exception {
         String path = APIPath.Msg_Broadcast;
         BroadMessageData messageData = new BroadMessageData();