version and release note

(cherry picked from commit 1f4cf54990831d4bcc4fcec2fa5479036a581e58)

broker/config/wildfirechat.conf

@@ -126,6 +126,12 @@ message.global_mute_exception_types 401,402,403,404,405,407,408,410,411
 ## 离线用户推送过期天数，0是永不过期，建议配置为7天。
 message.push_expired_days 7
 
+## 当会话静音/全局静音/PC在线静音时，普通消息都不会有推送，如果有某些消息类型需要此时保持推送，可以配置到这里。此配置对消息免打扰时段无效。
+## 此配置只影响远程推送，需要客户端处理客户端在线且在后台收到此消息的处理，需要针对这些消息类型加上本地通知。
+## 强制推送消息的MessagePayload中pushContent和pushData至少要存在一个才可以推送。
+## 消息类型以英文逗号分割。
+#message.force_push_types 401,402
+
 ## 群发消息(包括server api群发和全局频道群发)时，目标用户是否来自于t_user表。如果使用野火托管用户信息，请设置为true，否则设置为false。
 message.broadcast.target_from_user_table true
 
@@ -204,6 +210,9 @@ group.visible_quit_or_kickoff_notification 0
 ## 是否禁止陌生人拉人入群，默认为false
 group.disable_stranger_invite false
 
+## 群组信息是否标记删除
+group.enable_mark_deletion true
+
 ## 隐藏用户信息属性类型，2是性别，3是电话号码，4是邮箱，5是地址，6是公司信息，7是社交账号，8是Extra信息。当需要隐藏多个时以英文逗号分开;
 ## 本配置是为了提高安全性，避免把对应信息同步到客户端，这样就能防止程序被破解从而拿到用户关键信息。仅对客户端有效，server api不受影响。
 ## 注意，修改本配置不会对已经同步的信息产生影响。

broker/migrate/h2/V48__group_add_deleted_column.sql

@@ -0,0 +1,2 @@
+alter table `t_group` add column `_deleted` tinyint NOT NULL DEFAULT 0;
+

broker/migrate/mysql/V55__group_add_deleted_column.sql

@@ -0,0 +1 @@
+alter table `t_group` add column `_deleted` tinyint NOT NULL DEFAULT 0;

broker/pom.xml

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

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

@@ -60,6 +60,7 @@ public class GetGroupInfoAction extends AdminAction {
                     pojoGroupInfo.setMax_member_count(groupInfo.getMemberCount());
                     pojoGroupInfo.setHistory_message(groupInfo.getHistoryMessage());
                     pojoGroupInfo.setSuper_group(groupInfo.getSuperGroup()>0);
+                    pojoGroupInfo.setDeleted(groupInfo.getDeleted()>0);
                     result = RestResult.ok(pojoGroupInfo);
                 }
                 setResponseContent(result, response);

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

@@ -0,0 +1,66 @@
+/*
+ * 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.InputGetUserInfo;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.OutputUserInfoList;
+import cn.wildfirechat.proto.WFCMessage;
+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.util.internal.StringUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Route(APIPath.User_Get_Email_Info)
+@HttpMethod("POST")
+public class GetUsersByEmailAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            String email = getRequestBody(request.getNettyRequest(), String.class);
+            if (!StringUtil.isNullOrEmpty(email)) {
+
+                List<WFCMessage.User> users = messagesStore.getUserInfosByEmail(email);
+                List<InputOutputUserInfo> list = new ArrayList<>();
+                for (WFCMessage.User user : users) {
+                    list.add(InputOutputUserInfo.fromPbUser(user));
+                }
+
+                RestResult result;
+                if (list.isEmpty()) {
+                    result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
+                } else {
+                    OutputUserInfoList outputUserInfoList = new OutputUserInfoList();
+                    outputUserInfoList.userInfos = list;
+                    result = RestResult.ok(outputUserInfoList);
+                }
+
+                setResponseContent(result, response);
+            } else {
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
+            }
+
+        }
+        return true;
+    }
+}

broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetGroupInfoAction.java

@@ -56,6 +56,10 @@ public class GetGroupInfoAction extends RobotAction {
                     pojoGroupInfo.setJoin_type(groupInfo.getJoinType());
                     pojoGroupInfo.setPrivate_chat(groupInfo.getPrivateChat());
                     pojoGroupInfo.setSearchable(groupInfo.getSearchable());
+                    pojoGroupInfo.setMax_member_count(groupInfo.getMemberCount());
+                    pojoGroupInfo.setHistory_message(groupInfo.getHistoryMessage());
+                    pojoGroupInfo.setSuper_group(groupInfo.getSuperGroup()>0);
+                    pojoGroupInfo.setDeleted(groupInfo.getDeleted()>0);
                     result = RestResult.ok(pojoGroupInfo);
                 }
                 setResponseContent(result, response);

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

@@ -155,6 +155,7 @@ public final class BrokerConstants {
     public static final String MESSAGE_NO_Forward_Admin_Message = "message.no_forward_admin_message";
 
     public static final String MESSAGE_Push_Expired_Days = "message.push_expired_days";
+    public static final String MESSAGE_Force_Push_Types = "message.force_push_types";
 
     public static final String MESSAGE_Forward_With_Client_Info = "message.forward_with_client_info";
 
@@ -188,6 +189,8 @@ public final class BrokerConstants {
 
     public static final String GROUP_Disable_Stranger_Invite = "group.disable_stranger_invite";
 
+    public static final String GROUP_INFO_MARK_DELETION = "group.enable_mark_deletion";
+
     public static final String USER_HIDE_PROPERTIES = "user.hide_properties";
     public static final String USER_KEEP_DISPLAY_NAME_WHEN_DESTROY = "user.keep_display_name_when_destroy";
 

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

@@ -27,7 +27,7 @@ public class CreateGroupHandler extends GroupHandler<WFCMessage.CreateGroupReque
 
         if (!StringUtil.isNullOrEmpty(request.getGroup().getGroupInfo().getTargetId())) {
             WFCMessage.GroupInfo existGroupInfo = m_messagesStore.getGroupInfo(request.getGroup().getGroupInfo().getTargetId());
-            if (existGroupInfo != null) {
+            if (existGroupInfo != null && existGroupInfo.getDeleted() == 0) {
                 return ErrorCode.ERROR_CODE_GROUP_ALREADY_EXIST;
             }
         }
@@ -59,7 +59,7 @@ public class CreateGroupHandler extends GroupHandler<WFCMessage.CreateGroupReque
         }
 
         WFCMessage.GroupInfo groupInfo = m_messagesStore.createGroup(fromUser, request.getGroup().getGroupInfo(), request.getGroup().getMembersList(), request.getMemberExtra(), isAdmin);
-        if (groupInfo != null) {
+        if (groupInfo != null && groupInfo.getDeleted() == 0) {
             if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
                 sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), request.getNotifyContent());
             } else {

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

@@ -43,13 +43,13 @@ public class QuitGroupHandler extends GroupHandler<WFCMessage.QuitGroupRequest>
             if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());
             } else {
-                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, "").getQuitGroupNotifyContent();
+                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getKeepMsg()>0?"1":"0", "").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();
+                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getKeepMsg()>0?"1":"0", "").getQuitVisibleGroupNotifyContent();
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content, toUsers);
             }
         }

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

@@ -36,6 +36,7 @@ import java.util.function.Function;
 
 import static cn.wildfirechat.common.IMExceptionEvent.EventType.RDBS_Exception;
 import static cn.wildfirechat.proto.ProtoConstants.PersistFlag.Transparent;
+import static io.moquette.BrokerConstants.GROUP_INFO_MARK_DELETION;
 import static io.moquette.server.Constants.MAX_MESSAGE_QUEUE;
 import static cn.wildfirechat.proto.ProtoConstants.SearchUserType.*;
 import static win.liyufan.im.UserSettingScope.kUserSettingPrivacySearchable;
@@ -45,6 +46,7 @@ public class DatabaseStore {
     private final ThreadPoolExecutorWrapper mScheduler;
     private boolean disableRemoteMessageSearch = false;
     private boolean encryptMessage = false;
+    private boolean keepGroupInfo = false;
     public void setDisableRemoteMessageSearch(boolean disableRemoteMessageSearch) {
         this.disableRemoteMessageSearch = disableRemoteMessageSearch;
     }
@@ -55,6 +57,11 @@ public class DatabaseStore {
 
     public DatabaseStore(ThreadPoolExecutorWrapper scheduler) {
         this.mScheduler = scheduler;
+        try {
+            keepGroupInfo = Boolean.parseBoolean(Server.getServer().getConfig().getProperty(GROUP_INFO_MARK_DELETION, "false"));
+        } catch (Exception e) {
+
+        }
     }
 
     TreeMap<Long, Long> reloadUserMessageMaps(String userId) {
@@ -1129,7 +1136,16 @@ public class DatabaseStore {
                 }
 
                 if (!expired) {
-                    messages.add(message);
+                    boolean duplicated = false;
+                    for (WFCMessage.Message msg : messages) {
+                        if(message.getMessageId() == msg.getMessageId()) {
+                            duplicated = true;
+                            break;
+                        }
+                    }
+                    if(!duplicated) {
+                        messages.add(message);
+                    }
                 }
             }
 
@@ -1425,7 +1441,8 @@ public class DatabaseStore {
                 ", `_join_type`" +
                 ", `_private_chat`" +
                 ", `_searchable`" +
-                ", `_member_dt`) values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" +
+                ", `_deleted`" +
+                ", `_member_dt`) values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" +
                 " ON DUPLICATE KEY UPDATE " +
                 "`_name` = ?," +
                 "`_portrait` = ?," +
@@ -1436,8 +1453,9 @@ public class DatabaseStore {
                 "`_mute` = ?" +
                 ", `_join_type` = ?" +
                 ", `_private_chat` = ?" +
-                ", `_searchable` = ?, " +
-                "`_member_dt` = ?";
+                ", `_searchable` = ?" +
+                ", `_deleted` = ?" +
+                ", `_member_dt` = ?";
 
 
             statement = connection.prepareStatement(sql);
@@ -1455,6 +1473,7 @@ public class DatabaseStore {
             statement.setInt(index++, groupInfo.getJoinType());
             statement.setInt(index++, groupInfo.getPrivateChat());
             statement.setInt(index++, groupInfo.getSearchable());
+            statement.setInt(index++, groupInfo.getDeleted());
             statement.setLong(index++, groupInfo.getMemberUpdateDt() == 0 ? System.currentTimeMillis() : groupInfo.getUpdateDt());
 
             statement.setString(index++, groupInfo.getName());
@@ -1467,6 +1486,7 @@ public class DatabaseStore {
             statement.setInt(index++, groupInfo.getJoinType());
             statement.setInt(index++, groupInfo.getPrivateChat());
             statement.setInt(index++, groupInfo.getSearchable());
+            statement.setInt(index++, groupInfo.getDeleted());
             statement.setLong(index++, groupInfo.getMemberUpdateDt() == 0 ? System.currentTimeMillis() : groupInfo.getUpdateDt());
             int count = statement.executeUpdate();
             LOG.info("Update rows {}", count);
@@ -2917,6 +2937,99 @@ public class DatabaseStore {
         return null;
     }
 
+    List<WFCMessage.User> getUserInfosByEmail(String email) {
+        Connection connection = null;
+        PreparedStatement statement = null;
+        ResultSet rs = null;
+        List<WFCMessage.User> outList = new ArrayList<>();
+        try {
+            connection = DBUtil.getConnection();
+            String sql = "select `_uid`, `_name`" +
+                ", `_display_name`" +
+                ", `_portrait`" +
+                ", `_mobile`" +
+                ", `_gender`" +
+                ", `_email`" +
+                ", `_address`" +
+                ", `_company`" +
+                ", `_social`" +
+                ", `_extra`" +
+                ", `_type`" +
+                ", `_deleted`" +
+                ", `_dt` from t_user where `_deleted` = 0 and `_email` = ?";
+            statement = connection.prepareStatement(sql);
+            statement.setString(1, email);
+
+            rs = statement.executeQuery();
+            while (rs.next()) {
+                WFCMessage.User.Builder builder = WFCMessage.User.newBuilder();
+                int index = 1;
+                String value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setUid(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setName(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setDisplayName(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setPortrait(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setMobile(value);
+
+                int gender = rs.getInt(index++);
+                builder.setGender(gender);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setEmail(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setAddress(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setCompany(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setSocial(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setExtra(value);
+
+                int type = rs.getInt(index++);
+                builder.setType(type);
+
+                int deleted = rs.getInt(index++);
+                builder.setDeleted(deleted);
+
+                long longValue = rs.getLong(index++);
+                if(longValue <= 0)
+                    longValue = 1;
+                builder.setUpdateDt(longValue);
+
+                outList.add(builder.build());
+            }
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            Utility.printExecption(LOG, e, RDBS_Exception);
+        } finally {
+            DBUtil.closeDB(connection, statement, rs);
+        }
+        return outList;
+    }
+
     List<WFCMessage.User> getAllUsers(int count, int offset) {
         Connection connection = null;
         PreparedStatement statement = null;
@@ -3317,8 +3430,12 @@ public class DatabaseStore {
         PreparedStatement statement = null;
         try {
             connection = DBUtil.getConnection();
-            String sql = "delete from t_group where _gid = ?";
-
+            String sql;
+            if(keepGroupInfo) {
+                sql = "update t_group set _deleted = 1, _dt = _dt+1, _member_count = 0, _member_dt = _member_dt+1 where _gid = ?";
+            } else {
+                sql = "delete from t_group where _gid = ?";
+            }
 
             statement = connection.prepareStatement(sql);
             int index = 1;

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

@@ -24,6 +24,7 @@ import com.google.protobuf.ByteString;
 import com.hazelcast.core.*;
 import com.hazelcast.util.StringUtil;
 import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.action.Action;
 import com.xiaoleilu.loServer.action.admin.AdminAction;
 import com.xiaoleilu.loServer.model.FriendData;
 import cn.wildfirechat.common.ErrorCode;
@@ -49,6 +50,7 @@ import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
@@ -73,6 +75,7 @@ import static io.moquette.BrokerConstants.*;
 import static io.moquette.server.Constants.MAX_CHATROOM_MESSAGE_QUEUE;
 import static io.moquette.server.Constants.MAX_MESSAGE_QUEUE;
 import static cn.wildfirechat.pojos.MyInfoType.*;
+import static win.liyufan.im.UserSettingScope.kUserSettingAddFriendNoVerify;
 import static win.liyufan.im.UserSettingScope.kUserSettingPCOnline;
 
 public class MemoryMessagesStore implements IMessagesStore {
@@ -155,6 +158,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     private boolean mFriendRobotAutoAccept = true;
 
     private long mPushExpiredTimes = 604800000L;
+    private Set<Integer> mForcePushTypes = new HashSet<>();
 
     private boolean mMultiPlatformNotification = false;
     private boolean mMobileDefaultSilentWhenPCOnline = true;
@@ -257,6 +261,20 @@ public class MemoryMessagesStore implements IMessagesStore {
             e.printStackTrace();
         }
 
+        try {
+            String forcePushTypes = m_Server.getConfig().getProperty(BrokerConstants.MESSAGE_Force_Push_Types);
+            if(!StringUtil.isNullOrEmptyAfterTrim(forcePushTypes)) {
+                forcePushTypes = forcePushTypes.replace("，", ",");
+                for (String s : forcePushTypes.split(",")) {
+                    int type = Integer.parseInt(s.trim());
+                    if(type > 0) {
+                        mForcePushTypes.add(type);
+                    }
+                }
+            }
+        } catch (Exception e) {
+        }
+
         try {
             mMultiPlatformNotification = Boolean.parseBoolean(m_Server.getConfig().getProperty(BrokerConstants.SERVER_MULTI_PLATFROM_NOTIFICATION, "false"));
         } catch (Exception e) {
@@ -1368,7 +1386,7 @@ public class MemoryMessagesStore implements IMessagesStore {
             event.type = type;
             PojoGroupInfo pojoGroupInfo = new PojoGroupInfo();
             event.groupInfo = pojoGroupInfo;
-            if (groupInfo != null) {
+            if (groupInfo != null && groupInfo.getDeleted() == 0) {
                 pojoGroupInfo.setExtra(groupInfo.getExtra());
                 pojoGroupInfo.setName(groupInfo.getName());
                 pojoGroupInfo.setOwner(groupInfo.getOwner());
@@ -1702,8 +1720,19 @@ public class MemoryMessagesStore implements IMessagesStore {
             WFCMessage.GroupMember newOwner = null;
             for (WFCMessage.GroupMember member :members) {
                 if (!member.getMemberId().equals(operator) && member.getType() != GroupMemberType_Removed) {
-                    newOwner = member;
-                    break;
+                    if(newOwner == null) {
+                        newOwner = member;
+                    } else {
+                        if(newOwner.getType() == GroupMemberType_Silent && member.getType() != GroupMemberType_Silent) {
+                            newOwner = member;
+                        } else if(newOwner.getType() != GroupMemberType_Manager && member.getType() == GroupMemberType_Manager) {
+                            newOwner = member;
+                        } else if(newOwner.getType() == member.getType()) {
+                            if(newOwner.getCreateDt() > member.getCreateDt() && member.getCreateDt() > 0) {
+                                newOwner = member;
+                            }
+                        }
+                    }
                 }
             }
 
@@ -1900,7 +1929,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         WFCMessage.GroupInfo groupInfo = mIMap.get(groupId);
         if (groupInfo == null) {
             groupInfo = databaseStore.getPersistGroupInfo(groupId);
-            if (groupInfo != null) {
+            if (groupInfo != null && groupInfo.getDeleted() == 0) {
                 mIMap.set(groupId, groupInfo);
             } else {
                 return ErrorCode.ERROR_CODE_NOT_EXIST;
@@ -1985,7 +2014,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         WFCMessage.GroupInfo groupInfo = mIMap.get(groupId);
         if (groupInfo == null) {
             groupInfo = databaseStore.getPersistGroupInfo(groupId);
-            if (groupInfo != null) {
+            if (groupInfo != null && groupInfo.getDeleted() == 0) {
                 mIMap.set(groupId, groupInfo);
             } else {
                 return ErrorCode.ERROR_CODE_NOT_EXIST;
@@ -2069,16 +2098,12 @@ public class MemoryMessagesStore implements IMessagesStore {
         ArrayList<WFCMessage.GroupInfo> out = new ArrayList<>();
         for (WFCMessage.UserRequest request : requests) {
             WFCMessage.GroupInfo groupInfo = mIMap.get(request.getUid());
-            if (groupInfo == null) {
-                groupInfo = databaseStore.getPersistGroupInfo(request.getUid());
-                if (groupInfo != null) {
-                    mIMap.set(request.getUid(), groupInfo);
-                }
-            }
-
             if (groupInfo != null && groupInfo.getUpdateDt() > request.getUpdateDt()) {
-                if(!isAdmin && !StringUtil.isNullOrEmpty(fromUser)) {
+                if(!isAdmin && !StringUtil.isNullOrEmpty(fromUser) && groupInfo.getDeleted() == 0) {
                     WFCMessage.GroupMember gm = getGroupMember(groupInfo.getTargetId(), fromUser);
+                    if((gm == null || gm.getType() == GroupMemberType_Removed) && request.getUpdateDt() > 0) {
+                        continue;
+                    }
                     if(gm == null) {
                         groupInfo = groupInfo.toBuilder().setMemberUpdateDt(-1).build();
                     } else if(gm.getType() == GroupMemberType_Removed) {
@@ -2306,7 +2331,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         IMap<String, WFCMessage.GroupInfo> groups = hzInstance.getMap(GROUPS_MAP);
         WFCMessage.GroupInfo groupInfo = groups.get(groupId);
         boolean isMute = false;
-        if (groupInfo != null) {
+        if (groupInfo != null && groupInfo.getDeleted() == 0) {
             if (groupInfo.getOwner().equals(memberId)) {
                 return ErrorCode.ERROR_CODE_SUCCESS;
             }
@@ -2986,6 +3011,11 @@ public class MemoryMessagesStore implements IMessagesStore {
         return getUserInfo(userId);
     }
 
+    @Override
+    public List<WFCMessage.User> getUserInfosByEmail(String email) {
+        return databaseStore.getUserInfosByEmail(email);
+    }
+
     @Override
     public List<WFCMessage.User> getUserInfoList(int count, int offset) {
         return databaseStore.getAllUsers(count, offset);
@@ -3315,6 +3345,10 @@ public class MemoryMessagesStore implements IMessagesStore {
 
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         MultiMap<String, WFCMessage.FriendRequest> requestMap = hzInstance.getMultiMap(USER_FRIENDS_REQUEST);
+
+        WFCMessage.UserSettingEntry userSettingData = getUserSetting(request.getTargetUid(), kUserSettingAddFriendNoVerify, "");
+        boolean noVerify = userSettingData != null && "1".equals(userSettingData.getValue());
+
         Collection<WFCMessage.FriendRequest> requests = requestMap.get(userId);
         if (requests == null || requests.size() == 0) {
             requests = loadFriendRequest(requestMap, userId);
@@ -3329,7 +3363,7 @@ public class MemoryMessagesStore implements IMessagesStore {
             }
         }
 
-        if (existRequest != null && existRequest.getStatus() != ProtoConstants.FriendRequestStatus.RequestStatus_Accepted && !isAdmin) {
+        if (!noVerify && existRequest != null && existRequest.getStatus() != ProtoConstants.FriendRequestStatus.RequestStatus_Accepted && !isAdmin) {
             if (existRequest.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Rejected
                 && System.currentTimeMillis() - existRequest.getUpdateDt() < mFriendRejectDuration) {
                 return ErrorCode.ERROR_CODE_FRIEND_REQUEST_BLOCKED;
@@ -3371,7 +3405,7 @@ public class MemoryMessagesStore implements IMessagesStore {
             .setReason(request.getReason())
             .setExtra(request.getExtra())
             .setStatus(ProtoConstants.FriendRequestStatus.RequestStatus_Sent)
-            .setToReadStatus(false)
+            .setToReadStatus(noVerify)
             .setUpdateDt(System.currentTimeMillis())
             .build();
 
@@ -3379,6 +3413,12 @@ public class MemoryMessagesStore implements IMessagesStore {
         requestMap.remove(userId);
         requestMap.remove(request.getTargetUid());
 
+
+        if(noVerify) {
+            WFCMessage.HandleFriendRequest handleFriendRequest = WFCMessage.HandleFriendRequest.newBuilder().setTargetUid(userId).setStatus(ProtoConstants.FriendRequestStatus.RequestStatus_Accepted).build();
+            ServerAPIHelper.sendRequest(request.getTargetUid(), null, IMTopic.HandleFriendRequestTopic, handleFriendRequest.toByteArray(), null, ProtoConstants.RequestSourceType.Request_From_User);
+        }
+
         head[0] = newRequest.getUpdateDt();
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
@@ -4615,6 +4655,11 @@ public class MemoryMessagesStore implements IMessagesStore {
         return mPushExpiredTimes;
     }
 
+    @Override
+    public Set<Integer> getForcePushTypes() {
+        return mForcePushTypes;
+    }
+
     @Override
     public List<Integer> getClientForbiddenSendTypes() {
         return mForbiddenClientSendTypes;

broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java

@@ -135,7 +135,6 @@ public class NettyAcceptor implements ServerAcceptor {
                         }
                     }
                 })
-            .option(ChannelOption.SO_BACKLOG, 10240) // 服务端可连接队列大小
             .option(ChannelOption.SO_BACKLOG, nettySoBacklog)
             .option(ChannelOption.SO_REUSEADDR, nettySoReuseaddr)
             .childOption(ChannelOption.TCP_NODELAY, nettyTcpNodelay)

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

@@ -153,6 +153,7 @@ public interface IMessagesStore {
     WFCMessage.User getUserInfo(String userId);
     WFCMessage.User getUserInfoByName(String name);
     WFCMessage.User getUserInfoByMobile(String mobile);
+    List<WFCMessage.User> getUserInfosByEmail(String email);
     List<WFCMessage.User> searchUser(String keyword, int searchType, int page);
 
     List<WFCMessage.User> getUserInfoList(int count, int offset);
@@ -246,6 +247,7 @@ public interface IMessagesStore {
     boolean isRobotAutoAcceptFriendRequest();
 
     long getPushExpiredTimes();
+    Set<Integer> getForcePushTypes();
 
     List<Integer> getClientForbiddenSendTypes();
     List<Integer> getBlackListExceptionTypes();

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

@@ -21,7 +21,6 @@ import cn.wildfirechat.pojos.OutputMessageData;
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
 import cn.wildfirechat.push.PushServer;
-import com.google.gson.Gson;
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.util.StringUtil;
 import cn.wildfirechat.pojos.OutputNotifyChannelSubscribeStatus;
@@ -271,6 +270,7 @@ public class MessagesPublisher {
                 boolean isVoipSilent;
                 boolean isNoDisturb;
                 boolean isConvSilent = false;
+                boolean isForcePush = false;
                 if (pullType == ProtoConstants.PullType.Pull_ChatRoom) {
                     isSilent = true;
                     isConvSilent = true;
@@ -289,6 +289,11 @@ public class MessagesPublisher {
                             conversation = WFCMessage.Conversation.newBuilder().setType(conversationType).setLine(line).setTarget(target).build();
                         }
 
+                        if(m_messagesStore.getForcePushTypes().contains(messageContentType)) {
+                           LOG.info("The message type {} force push", messageContentType);
+                            isForcePush = true;
+                        }
+
                         if (m_messagesStore.getUserConversationSilent(user, conversation)) {
                             LOG.info("The conversation {}-{}-{} is slient", conversation.getType(), conversation.getTarget(), conversation.getLine());
                             isConvSilent = true;
@@ -369,17 +374,17 @@ public class MessagesPublisher {
                         continue;
                     }
 
-                    if (isConvSilent && !isVoip) {
+                    if (isConvSilent && !isVoip && !isForcePush) {
                         LOG.info("Silent of user or conversation");
                         continue;
                     }
 
-                    if (isSilent && !isVoip) {
+                    if (isSilent && !isVoip && !isForcePush) {
                         LOG.info("Silent of user");
                         continue;
                     }
 
-                    if(isVoip && isVoipSilent) {
+                    if(isVoip && isVoipSilent && !isForcePush) {
                         LOG.info("voip silent of user");
                         continue;
                     }

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

@@ -20,4 +20,5 @@ public interface UserSettingScope {
     int kUserSettingPttSilent = 25;
     int kUserSettingGroupRemark = 26;
     int kUserSettingPrivacySearchable = 27;
+    int kUserSettingAddFriendNoVerify = 28;
 }

common/pom.xml

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

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

@@ -27,6 +27,7 @@ public interface APIPath {
     String User_Get_Token = "/admin/user/get_token";
     String User_Update_Block_Status = "/admin/user/update_block_status";
     String User_Get_Info = "/admin/user/get_info";
+    String User_Get_Email_Info = "/admin/user/get_info_by_email";
     String User_Get_All = "/admin/user/all";
     String User_Get_Robot_Info = "/admin/user/get_robot_info";
     String User_Get_Blocked_List = "/admin/user/get_blocked_list";

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

@@ -1,5 +1,6 @@
 package cn.wildfirechat.pojos;
 
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -33,3 +34,4 @@ public class GetUserSessionResult {
         userSessions = new ArrayList<>();
     }
 }
+

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

@@ -1,3 +1,11 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information; please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 package cn.wildfirechat.pojos;
 
 public class InputConferenceRequest {

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

@@ -68,6 +68,7 @@ public class InputCreateGroup extends InputGroupBase {
         if(group_info.isSuper_group()) {
             groupInfoBuilder.setSuperGroup(1);
         }
+        groupInfoBuilder.setDeleted(0);
 
         groupBuilder.setGroupInfo(groupInfoBuilder);
         if(group.getMembers() != null) {

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

@@ -0,0 +1,35 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.pojos;
+
+public class InputGetUserSK {
+    private String uid;
+    private String cid;
+
+    public InputGetUserSK(String uid, String cid) {
+        this.uid = uid;
+        this.cid = cid;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public String getCid() {
+        return cid;
+    }
+
+    public void setCid(String cid) {
+        this.cid = cid;
+    }
+}

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

@@ -1,5 +1,14 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 package cn.wildfirechat.pojos;
 
+
 public class OutputReadData {
     public String user;
     public Conversation conversation;

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

@@ -0,0 +1,18 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * 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 java.util.List;
+
+public class OutputUserInfoList {
+    public List<InputOutputUserInfo> userInfos;
+}

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

@@ -22,6 +22,7 @@ public class PojoGroupInfo {
     int max_member_count;
     int history_message;
     boolean super_group;
+    boolean deleted;
 
     public String getTarget_id() {
         return target_id;
@@ -126,4 +127,12 @@ public class PojoGroupInfo {
     public void setSuper_group(boolean super_group) {
         this.super_group = super_group;
     }
+
+    public boolean isDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(boolean deleted) {
+        this.deleted = deleted;
+    }
 }

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

@@ -1651,6 +1651,16 @@ public final class WFCMessage {
      * <code>optional int32 super_group = 16;</code>
      */
     int getSuperGroup();
+
+    // optional int32 deleted = 17;
+    /**
+     * <code>optional int32 deleted = 17;</code>
+     */
+    boolean hasDeleted();
+    /**
+     * <code>optional int32 deleted = 17;</code>
+     */
+    int getDeleted();
   }
   /**
    * Protobuf type {@code GroupInfo}
@@ -1783,6 +1793,11 @@ public final class WFCMessage {
               superGroup_ = input.readInt32();
               break;
             }
+            case 136: {
+              bitField0_ |= 0x00010000;
+              deleted_ = input.readInt32();
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -2214,6 +2229,22 @@ public final class WFCMessage {
       return superGroup_;
     }
 
+    // optional int32 deleted = 17;
+    public static final int DELETED_FIELD_NUMBER = 17;
+    private int deleted_;
+    /**
+     * <code>optional int32 deleted = 17;</code>
+     */
+    public boolean hasDeleted() {
+      return ((bitField0_ & 0x00010000) == 0x00010000);
+    }
+    /**
+     * <code>optional int32 deleted = 17;</code>
+     */
+    public int getDeleted() {
+      return deleted_;
+    }
+
     private void initFields() {
       targetId_ = "";
       name_ = "";
@@ -2231,6 +2262,7 @@ public final class WFCMessage {
       maxMemberCount_ = 0;
       historyMessage_ = 0;
       superGroup_ = 0;
+      deleted_ = 0;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -2300,6 +2332,9 @@ public final class WFCMessage {
       if (((bitField0_ & 0x00008000) == 0x00008000)) {
         output.writeInt32(16, superGroup_);
       }
+      if (((bitField0_ & 0x00010000) == 0x00010000)) {
+        output.writeInt32(17, deleted_);
+      }
       getUnknownFields().writeTo(output);
     }
 
@@ -2373,6 +2408,10 @@ public final class WFCMessage {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(16, superGroup_);
       }
+      if (((bitField0_ & 0x00010000) == 0x00010000)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(17, deleted_);
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
       return size;
@@ -2521,6 +2560,8 @@ public final class WFCMessage {
         bitField0_ = (bitField0_ & ~0x00004000);
         superGroup_ = 0;
         bitField0_ = (bitField0_ & ~0x00008000);
+        deleted_ = 0;
+        bitField0_ = (bitField0_ & ~0x00010000);
         return this;
       }
 
@@ -2613,6 +2654,10 @@ public final class WFCMessage {
           to_bitField0_ |= 0x00008000;
         }
         result.superGroup_ = superGroup_;
+        if (((from_bitField0_ & 0x00010000) == 0x00010000)) {
+          to_bitField0_ |= 0x00010000;
+        }
+        result.deleted_ = deleted_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -2687,6 +2732,9 @@ public final class WFCMessage {
         if (other.hasSuperGroup()) {
           setSuperGroup(other.getSuperGroup());
         }
+        if (other.hasDeleted()) {
+          setDeleted(other.getDeleted());
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
@@ -3455,6 +3503,39 @@ public final class WFCMessage {
         return this;
       }
 
+      // optional int32 deleted = 17;
+      private int deleted_ ;
+      /**
+       * <code>optional int32 deleted = 17;</code>
+       */
+      public boolean hasDeleted() {
+        return ((bitField0_ & 0x00010000) == 0x00010000);
+      }
+      /**
+       * <code>optional int32 deleted = 17;</code>
+       */
+      public int getDeleted() {
+        return deleted_;
+      }
+      /**
+       * <code>optional int32 deleted = 17;</code>
+       */
+      public Builder setDeleted(int value) {
+        bitField0_ |= 0x00010000;
+        deleted_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional int32 deleted = 17;</code>
+       */
+      public Builder clearDeleted() {
+        bitField0_ = (bitField0_ & ~0x00010000);
+        deleted_ = 0;
+        onChanged();
+        return this;
+      }
+
       // @@protoc_insertion_point(builder_scope:GroupInfo)
     }
 
@@ -41793,6 +41874,16 @@ public final class WFCMessage {
      * <code>optional .MessageContent notify_content = 3;</code>
      */
     cn.wildfirechat.proto.WFCMessage.MessageContentOrBuilder getNotifyContentOrBuilder();
+
+    // optional int32 keep_msg = 4;
+    /**
+     * <code>optional int32 keep_msg = 4;</code>
+     */
+    boolean hasKeepMsg();
+    /**
+     * <code>optional int32 keep_msg = 4;</code>
+     */
+    int getKeepMsg();
   }
   /**
    * Protobuf type {@code QuitGroupRequest}
@@ -41884,6 +41975,11 @@ public final class WFCMessage {
               bitField0_ |= 0x00000002;
               break;
             }
+            case 32: {
+              bitField0_ |= 0x00000004;
+              keepMsg_ = input.readInt32();
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -42015,10 +42111,27 @@ public final class WFCMessage {
       return notifyContent_;
     }
 
+    // optional int32 keep_msg = 4;
+    public static final int KEEP_MSG_FIELD_NUMBER = 4;
+    private int keepMsg_;
+    /**
+     * <code>optional int32 keep_msg = 4;</code>
+     */
+    public boolean hasKeepMsg() {
+      return ((bitField0_ & 0x00000004) == 0x00000004);
+    }
+    /**
+     * <code>optional int32 keep_msg = 4;</code>
+     */
+    public int getKeepMsg() {
+      return keepMsg_;
+    }
+
     private void initFields() {
       groupId_ = "";
       toLine_ = java.util.Collections.emptyList();
       notifyContent_ = cn.wildfirechat.proto.WFCMessage.MessageContent.getDefaultInstance();
+      keepMsg_ = 0;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -42051,6 +42164,9 @@ public final class WFCMessage {
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         output.writeMessage(3, notifyContent_);
       }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        output.writeInt32(4, keepMsg_);
+      }
       getUnknownFields().writeTo(output);
     }
 
@@ -42077,6 +42193,10 @@ public final class WFCMessage {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(3, notifyContent_);
       }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(4, keepMsg_);
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
       return size;
@@ -42204,6 +42324,8 @@ public final class WFCMessage {
           notifyContentBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000004);
+        keepMsg_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
@@ -42249,6 +42371,10 @@ public final class WFCMessage {
         } else {
           result.notifyContent_ = notifyContentBuilder_.build();
         }
+        if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
+          to_bitField0_ |= 0x00000004;
+        }
+        result.keepMsg_ = keepMsg_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -42283,6 +42409,9 @@ public final class WFCMessage {
         if (other.hasNotifyContent()) {
           mergeNotifyContent(other.getNotifyContent());
         }
+        if (other.hasKeepMsg()) {
+          setKeepMsg(other.getKeepMsg());
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
@@ -42577,6 +42706,39 @@ public final class WFCMessage {
         return notifyContentBuilder_;
       }
 
+      // optional int32 keep_msg = 4;
+      private int keepMsg_ ;
+      /**
+       * <code>optional int32 keep_msg = 4;</code>
+       */
+      public boolean hasKeepMsg() {
+        return ((bitField0_ & 0x00000008) == 0x00000008);
+      }
+      /**
+       * <code>optional int32 keep_msg = 4;</code>
+       */
+      public int getKeepMsg() {
+        return keepMsg_;
+      }
+      /**
+       * <code>optional int32 keep_msg = 4;</code>
+       */
+      public Builder setKeepMsg(int value) {
+        bitField0_ |= 0x00000008;
+        keepMsg_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional int32 keep_msg = 4;</code>
+       */
+      public Builder clearKeepMsg() {
+        bitField0_ = (bitField0_ & ~0x00000008);
+        keepMsg_ = 0;
+        onChanged();
+        return this;
+      }
+
       // @@protoc_insertion_point(builder_scope:QuitGroupRequest)
     }
 
@@ -67305,7 +67467,7 @@ public final class WFCMessage {
       "dRequest\022\022\n\ntarget_uid\030\001 \002(\t\022\016\n\006reason\030\002" +
       " \002(\t\022\r\n\005extra\030\003 \001(\t\":\n\014Conversation\022\014\n\004t" +
       "ype\030\001 \002(\005\022\016\n\006target\030\002 \002(\t\022\014\n\004line\030\003 \002(\005\"" +
-      "\300\002\n\tGroupInfo\022\021\n\ttarget_id\030\001 \001(\t\022\014\n\004name" +
+      "\321\002\n\tGroupInfo\022\021\n\ttarget_id\030\001 \001(\t\022\014\n\004name" +
       "\030\002 \002(\t\022\020\n\010portrait\030\003 \001(\t\022\r\n\005owner\030\004 \001(\t\022" +
       "\014\n\004type\030\005 \002(\005\022\024\n\014member_count\030\006 \001(\005\022\r\n\005e" +
       "xtra\030\007 \001(\t\022\021\n\tupdate_dt\030\010 \001(\003\022\030\n\020member_" +
@@ -67313,172 +67475,173 @@ public final class WFCMessage {
       "pe\030\013 \001(\005\022\024\n\014private_chat\030\014 \001(\005\022\022\n\nsearch",
       "able\030\r \001(\005\022\030\n\020max_member_count\030\016 \001(\005\022\027\n\017" +
       "history_message\030\017 \001(\005\022\023\n\013super_group\030\020 \001" +
-      "(\005\"r\n\013GroupMember\022\021\n\tmember_id\030\001 \002(\t\022\r\n\005" +
-      "alias\030\002 \001(\t\022\014\n\004type\030\003 \002(\005\022\021\n\tupdate_dt\030\004" +
-      " \001(\003\022\021\n\tcreate_dt\030\005 \001(\003\022\r\n\005extra\030\006 \001(\t\"F" +
-      "\n\005Group\022\036\n\ngroup_info\030\001 \002(\0132\n.GroupInfo\022" +
-      "\035\n\007members\030\002 \003(\0132\014.GroupMember\"\313\001\n\013Chann" +
-      "elMenu\022\014\n\004type\030\001 \002(\t\022\014\n\004name\030\002 \002(\t\022\013\n\003ke" +
-      "y\030\003 \001(\t\022\013\n\003url\030\004 \001(\t\022\020\n\010media_id\030\005 \001(\t\022\022" +
-      "\n\narticle_id\030\006 \001(\t\022\016\n\006app_id\030\007 \001(\t\022\020\n\010ap",
-      "p_page\030\010 \001(\t\022\036\n\010sub_menu\030\t \003(\0132\014.Channel" +
-      "Menu\022\017\n\007menu_id\030\n \001(\t\022\r\n\005extra\030\013 \001(\t\"-\n\017" +
-      "ChannelMenuList\022\032\n\004menu\030\001 \003(\0132\014.ChannelM" +
-      "enu\"\340\001\n\013ChannelInfo\022\021\n\ttarget_id\030\001 \001(\t\022\014" +
-      "\n\004name\030\002 \002(\t\022\020\n\010portrait\030\003 \001(\t\022\r\n\005owner\030" +
-      "\004 \001(\t\022\016\n\006status\030\005 \001(\005\022\014\n\004desc\030\006 \001(\t\022\r\n\005e" +
-      "xtra\030\007 \001(\t\022\021\n\tupdate_dt\030\010 \001(\003\022\016\n\006secret\030" +
-      "\t \001(\t\022\020\n\010callback\030\n \001(\t\022\021\n\tautomatic\030\013 \001" +
-      "(\005\022\032\n\004menu\030\014 \003(\0132\014.ChannelMenu\"D\n\021Modify" +
-      "ChannelInfo\022\022\n\nchannel_id\030\001 \002(\t\022\014\n\004type\030",
-      "\002 \002(\005\022\r\n\005value\030\003 \002(\t\"8\n\017TransferChannel\022" +
-      "\022\n\nchannel_id\030\001 \002(\t\022\021\n\tnew_owner\030\002 \002(\t\"3" +
-      "\n\017PullChannelInfo\022\022\n\nchannel_id\030\001 \002(\t\022\014\n" +
-      "\004head\030\002 \002(\003\"H\n\023PullChannelListener\022\022\n\nch" +
-      "annel_id\030\001 \002(\t\022\016\n\006offset\030\002 \002(\005\022\r\n\005count\030" +
-      "\003 \002(\005\"R\n\031PullChannelListenerResult\022\023\n\013to" +
-      "tal_count\030\001 \002(\005\022\016\n\006offset\030\002 \002(\005\022\020\n\010liste" +
-      "ner\030\003 \003(\t\"3\n\rListenChannel\022\022\n\nchannel_id" +
-      "\030\001 \002(\t\022\016\n\006listen\030\002 \002(\005\"E\n\023SearchChannelR" +
-      "esult\022\035\n\007channel\030\001 \003(\0132\014.ChannelInfo\022\017\n\007",
-      "keyword\030\002 \002(\t\"\235\002\n\016MessageContent\022\014\n\004type" +
-      "\030\001 \002(\005\022\032\n\022searchable_content\030\002 \001(\t\022\024\n\014pu" +
-      "sh_content\030\003 \001(\t\022\017\n\007content\030\004 \001(\t\022\014\n\004dat" +
-      "a\030\005 \001(\014\022\021\n\tmediaType\030\006 \001(\005\022\026\n\016remoteMedi" +
-      "aUrl\030\007 \001(\t\022\024\n\014persist_flag\030\010 \001(\005\022\027\n\017expi" +
-      "re_duration\030\t \001(\005\022\026\n\016mentioned_type\030\n \001(" +
-      "\005\022\030\n\020mentioned_target\030\013 \003(\t\022\r\n\005extra\030\014 \001" +
-      "(\t\022\021\n\tpush_data\030\r \001(\t\"\226\001\n\025AddGroupMember" +
-      "Request\022\020\n\010group_id\030\001 \002(\t\022\"\n\014added_membe" +
-      "r\030\002 \003(\0132\014.GroupMember\022\017\n\007to_line\030\003 \003(\005\022\'",
-      "\n\016notify_content\030\004 \001(\0132\017.MessageContent\022" +
-      "\r\n\005extra\030\005 \001(\t\"{\n\022CreateGroupRequest\022\025\n\005" +
-      "group\030\001 \002(\0132\006.Group\022\017\n\007to_line\030\002 \003(\005\022\'\n\016" +
-      "notify_content\030\003 \001(\0132\017.MessageContent\022\024\n" +
-      "\014member_extra\030\004 \001(\t\"a\n\023DismissGroupReque" +
-      "st\022\020\n\010group_id\030\001 \002(\t\022\017\n\007to_line\030\002 \003(\005\022\'\n" +
-      "\016notify_content\030\003 \001(\0132\017.MessageContent\"\245" +
-      "\001\n\rFriendRequest\022\020\n\010from_uid\030\001 \001(\t\022\016\n\006to" +
-      "_uid\030\002 \002(\t\022\016\n\006reason\030\003 \002(\t\022\016\n\006status\030\004 \001" +
-      "(\005\022\021\n\tupdate_dt\030\005 \001(\003\022\030\n\020from_read_statu",
-      "s\030\006 \001(\010\022\026\n\016to_read_status\030\007 \001(\010\022\r\n\005extra" +
-      "\030\010 \001(\t\"#\n\rGeneralResult\022\022\n\nerror_code\030\001 " +
-      "\002(\005\"?\n\025GetUploadTokenRequest\022\022\n\nmedia_ty" +
-      "pe\030\001 \002(\005\022\022\n\nmedia_path\030\002 \002(\t\"S\n\024GetUploa" +
-      "dTokenResult\022\016\n\006domain\030\001 \002(\t\022\r\n\005token\030\002 " +
-      "\002(\t\022\016\n\006server\030\003 \002(\t\022\014\n\004port\030\004 \001(\005\"H\n\023Han" +
-      "dleFriendRequest\022\022\n\ntarget_uid\030\001 \002(\t\022\016\n\006" +
-      "status\030\002 \002(\005\022\r\n\005extra\030\003 \001(\t\"\023\n\005IDBuf\022\n\n\002" +
-      "id\030\001 \002(\t\"\027\n\tIDListBuf\022\n\n\002id\030\001 \003(\t\"\256\001\n\007Me" +
-      "ssage\022#\n\014conversation\030\001 \002(\0132\r.Conversati",
-      "on\022\021\n\tfrom_user\030\002 \002(\t\022 \n\007content\030\003 \002(\0132\017" +
-      ".MessageContent\022\022\n\nmessage_id\030\004 \001(\003\022\030\n\020s" +
-      "erver_timestamp\030\005 \001(\003\022\017\n\007to_user\030\006 \001(\t\022\n" +
-      "\n\002to\030\007 \003(\t\"\353\001\n\004User\022\013\n\003uid\030\001 \002(\t\022\014\n\004name" +
-      "\030\002 \001(\t\022\024\n\014display_name\030\003 \001(\t\022\020\n\010portrait" +
-      "\030\004 \001(\t\022\016\n\006mobile\030\005 \001(\t\022\r\n\005email\030\006 \001(\t\022\017\n" +
-      "\007address\030\007 \001(\t\022\017\n\007company\030\010 \001(\t\022\r\n\005extra" +
-      "\030\t \001(\t\022\021\n\tupdate_dt\030\n \001(\003\022\016\n\006gender\030\013 \001(" +
-      "\005\022\016\n\006social\030\014 \001(\t\022\014\n\004type\030\r \001(\005\022\017\n\007delet" +
-      "ed\030\016 \001(\005\"c\n\005Robot\022\013\n\003uid\030\001 \002(\t\022\r\n\005state\030",
-      "\002 \002(\005\022\r\n\005owner\030\003 \001(\t\022\016\n\006secret\030\004 \001(\t\022\020\n\010" +
-      "callback\030\005 \001(\t\022\r\n\005extra\030\006 \001(\t\"(\n\017GetRobo" +
-      "tsResult\022\025\n\005entry\030\001 \003(\0132\006.Robot\"g\n\030Uploa" +
-      "dDeviceTokenRequest\022\020\n\010platform\030\001 \002(\005\022\020\n" +
-      "\010app_name\030\002 \002(\t\022\024\n\014device_token\030\003 \002(\t\022\021\n" +
-      "\tpush_type\030\004 \002(\005\"\201\001\n\026ModifyGroupInfoRequ" +
-      "est\022\020\n\010group_id\030\001 \002(\t\022\014\n\004type\030\002 \002(\005\022\r\n\005v" +
-      "alue\030\003 \002(\t\022\017\n\007to_line\030\004 \003(\005\022\'\n\016notify_co" +
-      "ntent\030\005 \001(\0132\017.MessageContent\"\203\001\n\026SetGrou" +
-      "pManagerRequest\022\020\n\010group_id\030\001 \002(\t\022\014\n\004typ",
-      "e\030\002 \002(\005\022\017\n\007user_id\030\003 \003(\t\022\017\n\007to_line\030\004 \003(" +
-      "\005\022\'\n\016notify_content\030\005 \001(\0132\017.MessageConte" +
-      "nt\"(\n\tInfoEntry\022\014\n\004type\030\001 \002(\005\022\r\n\005value\030\002" +
-      " \002(\t\"0\n\023ModifyMyInfoRequest\022\031\n\005entry\030\001 \003" +
-      "(\0132\n.InfoEntry\";\n\rNotifyMessage\022\014\n\004type\030" +
-      "\001 \002(\005\022\014\n\004head\030\002 \002(\003\022\016\n\006target\030\003 \001(\t\"=\n\022P" +
-      "ullMessageRequest\022\n\n\002id\030\001 \002(\003\022\014\n\004type\030\002 " +
-      "\002(\005\022\r\n\005delay\030\003 \001(\003\"M\n\021PullMessageResult\022" +
-      "\031\n\007message\030\001 \003(\0132\010.Message\022\017\n\007current\030\002 " +
-      "\002(\003\022\014\n\004head\030\003 \002(\003\"/\n\023PullGroupInfoResult",
-      "\022\030\n\004info\030\001 \003(\0132\n.GroupInfo\"6\n\026PullGroupM" +
-      "emberRequest\022\016\n\006target\030\001 \002(\t\022\014\n\004head\030\002 \002" +
-      "(\003\"5\n\025PullGroupMemberResult\022\034\n\006member\030\001 " +
-      "\003(\0132\014.GroupMember\"-\n\013UserRequest\022\013\n\003uid\030" +
-      "\001 \002(\t\022\021\n\tupdate_dt\030\002 \001(\003\"0\n\017PullUserRequ" +
-      "est\022\035\n\007request\030\001 \003(\0132\014.UserRequest\"/\n\nUs" +
-      "erResult\022\023\n\004user\030\001 \002(\0132\005.User\022\014\n\004code\030\002 " +
-      "\002(\005\"-\n\016PullUserResult\022\033\n\006result\030\001 \003(\0132\013." +
-      "UserResult\"^\n\020QuitGroupRequest\022\020\n\010group_" +
-      "id\030\001 \002(\t\022\017\n\007to_line\030\002 \003(\005\022\'\n\016notify_cont",
-      "ent\030\003 \001(\0132\017.MessageContent\"~\n\030RemoveGrou" +
-      "pMemberRequest\022\020\n\010group_id\030\001 \002(\t\022\026\n\016remo" +
-      "ved_member\030\002 \003(\t\022\017\n\007to_line\030\003 \003(\005\022\'\n\016not" +
-      "ify_content\030\004 \001(\0132\017.MessageContent\"u\n\024Tr" +
-      "ansferGroupRequest\022\020\n\010group_id\030\001 \002(\t\022\021\n\t" +
-      "new_owner\030\002 \002(\t\022\017\n\007to_line\030\003 \003(\005\022\'\n\016noti" +
-      "fy_content\030\004 \001(\0132\017.MessageContent\"\206\001\n\026Mo" +
-      "difyGroupMemberAlias\022\020\n\010group_id\030\001 \002(\t\022\r" +
-      "\n\005alias\030\002 \002(\t\022\017\n\007to_line\030\003 \003(\005\022\'\n\016notify" +
-      "_content\030\004 \001(\0132\017.MessageContent\022\021\n\tmembe",
-      "r_id\030\005 \001(\t\"\206\001\n\026ModifyGroupMemberExtra\022\020\n" +
-      "\010group_id\030\001 \002(\t\022\017\n\007to_line\030\002 \003(\005\022\'\n\016noti" +
-      "fy_content\030\003 \001(\0132\017.MessageContent\022\r\n\005ext" +
-      "ra\030\004 \001(\t\022\021\n\tmember_id\030\005 \001(\t\"P\n\020UserSetti" +
-      "ngEntry\022\r\n\005scope\030\001 \002(\005\022\013\n\003key\030\002 \002(\t\022\r\n\005v" +
-      "alue\030\003 \002(\t\022\021\n\tupdate_dt\030\004 \002(\003\"A\n\024ModifyU" +
-      "serSettingReq\022\r\n\005scope\030\001 \002(\005\022\013\n\003key\030\002 \002(" +
-      "\t\022\r\n\005value\030\003 \002(\t\"\032\n\007Version\022\017\n\007version\030\001" +
-      " \002(\003\"8\n\024GetUserSettingResult\022 \n\005entry\030\001 " +
-      "\003(\0132\021.UserSettingEntry\"f\n\006Friend\022\013\n\003uid\030",
-      "\001 \002(\t\022\r\n\005state\030\002 \002(\005\022\021\n\tupdate_dt\030\003 \002(\003\022" +
-      "\r\n\005alias\030\004 \001(\t\022\017\n\007blacked\030\005 \001(\005\022\r\n\005extra" +
-      "\030\006 \001(\t\"*\n\020GetFriendsResult\022\026\n\005entry\030\001 \003(" +
-      "\0132\007.Friend\"7\n\026GetFriendRequestResult\022\035\n\005" +
-      "entry\030\001 \003(\0132\016.FriendRequest\"\243\001\n\021ConnectA" +
-      "ckPayload\022\020\n\010msg_head\030\001 \001(\003\022\023\n\013friend_he" +
-      "ad\030\002 \001(\003\022\026\n\016friend_rq_head\030\003 \001(\003\022\024\n\014sett" +
-      "ing_head\030\004 \001(\003\022\021\n\tnode_addr\030\005 \001(\t\022\021\n\tnod" +
-      "e_port\030\006 \001(\005\022\023\n\013server_time\030\007 \001(\003\"P\n\rIMH" +
-      "ttpWrapper\022\r\n\005token\030\001 \002(\t\022\021\n\tclient_id\030\002",
-      " \002(\t\022\017\n\007request\030\003 \002(\t\022\014\n\004data\030\004 \001(\014\"A\n\021S" +
-      "earchUserRequest\022\017\n\007keyword\030\001 \002(\t\022\r\n\005fuz" +
-      "zy\030\002 \001(\005\022\014\n\004page\030\003 \001(\005\"(\n\020SearchUserResu" +
-      "lt\022\024\n\005entry\030\001 \003(\0132\005.User\"@\n\026GetChatroomI" +
-      "nfoRequest\022\023\n\013chatroom_id\030\001 \002(\t\022\021\n\tupdat" +
-      "e_dt\030\002 \001(\003\"\227\001\n\014ChatroomInfo\022\r\n\005title\030\001 \002" +
-      "(\t\022\014\n\004desc\030\002 \001(\t\022\020\n\010portrait\030\003 \001(\t\022\024\n\014me" +
-      "mber_count\030\004 \001(\005\022\021\n\tcreate_dt\030\005 \001(\003\022\021\n\tu" +
-      "pdate_dt\030\006 \001(\003\022\r\n\005extra\030\007 \001(\t\022\r\n\005state\030\010" +
-      " \001(\005\"F\n\034GetChatroomMemberInfoRequest\022\023\n\013",
-      "chatroom_id\030\001 \002(\t\022\021\n\tmax_count\030\002 \001(\005\";\n\022" +
-      "ChatroomMemberInfo\022\024\n\014member_count\030\001 \001(\005" +
-      "\022\017\n\007members\030\002 \003(\t\"\026\n\010INT64Buf\022\n\n\002id\030\001 \002(" +
-      "\003\"4\n\023NotifyRecallMessage\022\n\n\002id\030\001 \002(\003\022\021\n\t" +
-      "from_user\030\002 \002(\t\"/\n\020BlackUserRequest\022\013\n\003u" +
-      "id\030\001 \002(\t\022\016\n\006status\030\002 \002(\005\"\323\001\n\014RouteReques" +
-      "t\022\013\n\003app\030\001 \001(\t\022\020\n\010platform\030\002 \001(\005\022\021\n\tpush" +
-      "_type\030\003 \001(\005\022\023\n\013device_name\030\004 \001(\t\022\026\n\016devi" +
-      "ce_version\030\005 \001(\t\022\022\n\nphone_name\030\006 \001(\t\022\020\n\010" +
-      "language\030\007 \001(\t\022\024\n\014carrier_name\030\010 \001(\t\022\023\n\013",
-      "app_version\030\t \001(\t\022\023\n\013sdk_version\030\n \001(\t\"D" +
-      "\n\rRouteResponse\022\014\n\004host\030\001 \002(\t\022\021\n\tlong_po" +
-      "rt\030\002 \002(\005\022\022\n\nshort_port\030\003 \002(\005\"G\n\017GetToken" +
-      "Request\022\017\n\007user_id\030\001 \002(\t\022\021\n\tclient_id\030\002 " +
-      "\002(\t\022\020\n\010platform\030\003 \001(\005\"r\n\022LoadRemoteMessa" +
-      "ges\022#\n\014conversation\030\001 \002(\0132\r.Conversation" +
-      "\022\022\n\nbefore_uid\030\002 \002(\003\022\r\n\005count\030\003 \002(\005\022\024\n\014c" +
-      "ontent_type\030\004 \003(\005\"a\n\020MultiCastMessage\022\021\n" +
-      "\tfrom_user\030\001 \002(\t\022 \n\007content\030\002 \002(\0132\017.Mess" +
-      "ageContent\022\n\n\002to\030\003 \003(\t\022\014\n\004line\030\004 \002(\005\"E\n\035",
-      "RecallMultiCastMessageRequest\022\022\n\nmessage" +
-      "_id\030\001 \002(\003\022\020\n\010receiver\030\002 \003(\t\"@\n\017AuthCodeR" +
-      "equest\022\021\n\ttarget_id\030\001 \002(\t\022\014\n\004type\030\002 \002(\005\022" +
-      "\014\n\004host\030\003 \002(\t\"o\n\030ApplicationConfigReques" +
-      "t\022\r\n\005appId\030\001 \002(\t\022\017\n\007appType\030\002 \002(\005\022\021\n\ttim" +
-      "estamp\030\003 \002(\003\022\r\n\005nonce\030\004 \002(\t\022\021\n\tsignature" +
-      "\030\005 \002(\tB/\n\025cn.wildfirechat.protoB\nWFCMess" +
-      "ageZ\n./go;proto"
+      "(\005\022\017\n\007deleted\030\021 \001(\005\"r\n\013GroupMember\022\021\n\tme" +
+      "mber_id\030\001 \002(\t\022\r\n\005alias\030\002 \001(\t\022\014\n\004type\030\003 \002" +
+      "(\005\022\021\n\tupdate_dt\030\004 \001(\003\022\021\n\tcreate_dt\030\005 \001(\003" +
+      "\022\r\n\005extra\030\006 \001(\t\"F\n\005Group\022\036\n\ngroup_info\030\001" +
+      " \002(\0132\n.GroupInfo\022\035\n\007members\030\002 \003(\0132\014.Grou" +
+      "pMember\"\313\001\n\013ChannelMenu\022\014\n\004type\030\001 \002(\t\022\014\n" +
+      "\004name\030\002 \002(\t\022\013\n\003key\030\003 \001(\t\022\013\n\003url\030\004 \001(\t\022\020\n" +
+      "\010media_id\030\005 \001(\t\022\022\n\narticle_id\030\006 \001(\t\022\016\n\006a",
+      "pp_id\030\007 \001(\t\022\020\n\010app_page\030\010 \001(\t\022\036\n\010sub_men" +
+      "u\030\t \003(\0132\014.ChannelMenu\022\017\n\007menu_id\030\n \001(\t\022\r" +
+      "\n\005extra\030\013 \001(\t\"-\n\017ChannelMenuList\022\032\n\004menu" +
+      "\030\001 \003(\0132\014.ChannelMenu\"\340\001\n\013ChannelInfo\022\021\n\t" +
+      "target_id\030\001 \001(\t\022\014\n\004name\030\002 \002(\t\022\020\n\010portrai" +
+      "t\030\003 \001(\t\022\r\n\005owner\030\004 \001(\t\022\016\n\006status\030\005 \001(\005\022\014" +
+      "\n\004desc\030\006 \001(\t\022\r\n\005extra\030\007 \001(\t\022\021\n\tupdate_dt" +
+      "\030\010 \001(\003\022\016\n\006secret\030\t \001(\t\022\020\n\010callback\030\n \001(\t" +
+      "\022\021\n\tautomatic\030\013 \001(\005\022\032\n\004menu\030\014 \003(\0132\014.Chan" +
+      "nelMenu\"D\n\021ModifyChannelInfo\022\022\n\nchannel_",
+      "id\030\001 \002(\t\022\014\n\004type\030\002 \002(\005\022\r\n\005value\030\003 \002(\t\"8\n" +
+      "\017TransferChannel\022\022\n\nchannel_id\030\001 \002(\t\022\021\n\t" +
+      "new_owner\030\002 \002(\t\"3\n\017PullChannelInfo\022\022\n\nch" +
+      "annel_id\030\001 \002(\t\022\014\n\004head\030\002 \002(\003\"H\n\023PullChan" +
+      "nelListener\022\022\n\nchannel_id\030\001 \002(\t\022\016\n\006offse" +
+      "t\030\002 \002(\005\022\r\n\005count\030\003 \002(\005\"R\n\031PullChannelLis" +
+      "tenerResult\022\023\n\013total_count\030\001 \002(\005\022\016\n\006offs" +
+      "et\030\002 \002(\005\022\020\n\010listener\030\003 \003(\t\"3\n\rListenChan" +
+      "nel\022\022\n\nchannel_id\030\001 \002(\t\022\016\n\006listen\030\002 \002(\005\"" +
+      "E\n\023SearchChannelResult\022\035\n\007channel\030\001 \003(\0132",
+      "\014.ChannelInfo\022\017\n\007keyword\030\002 \002(\t\"\235\002\n\016Messa" +
+      "geContent\022\014\n\004type\030\001 \002(\005\022\032\n\022searchable_co" +
+      "ntent\030\002 \001(\t\022\024\n\014push_content\030\003 \001(\t\022\017\n\007con" +
+      "tent\030\004 \001(\t\022\014\n\004data\030\005 \001(\014\022\021\n\tmediaType\030\006 " +
+      "\001(\005\022\026\n\016remoteMediaUrl\030\007 \001(\t\022\024\n\014persist_f" +
+      "lag\030\010 \001(\005\022\027\n\017expire_duration\030\t \001(\005\022\026\n\016me" +
+      "ntioned_type\030\n \001(\005\022\030\n\020mentioned_target\030\013" +
+      " \003(\t\022\r\n\005extra\030\014 \001(\t\022\021\n\tpush_data\030\r \001(\t\"\226" +
+      "\001\n\025AddGroupMemberRequest\022\020\n\010group_id\030\001 \002" +
+      "(\t\022\"\n\014added_member\030\002 \003(\0132\014.GroupMember\022\017",
+      "\n\007to_line\030\003 \003(\005\022\'\n\016notify_content\030\004 \001(\0132" +
+      "\017.MessageContent\022\r\n\005extra\030\005 \001(\t\"{\n\022Creat" +
+      "eGroupRequest\022\025\n\005group\030\001 \002(\0132\006.Group\022\017\n\007" +
+      "to_line\030\002 \003(\005\022\'\n\016notify_content\030\003 \001(\0132\017." +
+      "MessageContent\022\024\n\014member_extra\030\004 \001(\t\"a\n\023" +
+      "DismissGroupRequest\022\020\n\010group_id\030\001 \002(\t\022\017\n" +
+      "\007to_line\030\002 \003(\005\022\'\n\016notify_content\030\003 \001(\0132\017" +
+      ".MessageContent\"\245\001\n\rFriendRequest\022\020\n\010fro" +
+      "m_uid\030\001 \001(\t\022\016\n\006to_uid\030\002 \002(\t\022\016\n\006reason\030\003 " +
+      "\002(\t\022\016\n\006status\030\004 \001(\005\022\021\n\tupdate_dt\030\005 \001(\003\022\030",
+      "\n\020from_read_status\030\006 \001(\010\022\026\n\016to_read_stat" +
+      "us\030\007 \001(\010\022\r\n\005extra\030\010 \001(\t\"#\n\rGeneralResult" +
+      "\022\022\n\nerror_code\030\001 \002(\005\"?\n\025GetUploadTokenRe" +
+      "quest\022\022\n\nmedia_type\030\001 \002(\005\022\022\n\nmedia_path\030" +
+      "\002 \002(\t\"S\n\024GetUploadTokenResult\022\016\n\006domain\030" +
+      "\001 \002(\t\022\r\n\005token\030\002 \002(\t\022\016\n\006server\030\003 \002(\t\022\014\n\004" +
+      "port\030\004 \001(\005\"H\n\023HandleFriendRequest\022\022\n\ntar" +
+      "get_uid\030\001 \002(\t\022\016\n\006status\030\002 \002(\005\022\r\n\005extra\030\003" +
+      " \001(\t\"\023\n\005IDBuf\022\n\n\002id\030\001 \002(\t\"\027\n\tIDListBuf\022\n" +
+      "\n\002id\030\001 \003(\t\"\256\001\n\007Message\022#\n\014conversation\030\001",
+      " \002(\0132\r.Conversation\022\021\n\tfrom_user\030\002 \002(\t\022 " +
+      "\n\007content\030\003 \002(\0132\017.MessageContent\022\022\n\nmess" +
+      "age_id\030\004 \001(\003\022\030\n\020server_timestamp\030\005 \001(\003\022\017" +
+      "\n\007to_user\030\006 \001(\t\022\n\n\002to\030\007 \003(\t\"\353\001\n\004User\022\013\n\003" +
+      "uid\030\001 \002(\t\022\014\n\004name\030\002 \001(\t\022\024\n\014display_name\030" +
+      "\003 \001(\t\022\020\n\010portrait\030\004 \001(\t\022\016\n\006mobile\030\005 \001(\t\022" +
+      "\r\n\005email\030\006 \001(\t\022\017\n\007address\030\007 \001(\t\022\017\n\007compa" +
+      "ny\030\010 \001(\t\022\r\n\005extra\030\t \001(\t\022\021\n\tupdate_dt\030\n \001" +
+      "(\003\022\016\n\006gender\030\013 \001(\005\022\016\n\006social\030\014 \001(\t\022\014\n\004ty" +
+      "pe\030\r \001(\005\022\017\n\007deleted\030\016 \001(\005\"c\n\005Robot\022\013\n\003ui",
+      "d\030\001 \002(\t\022\r\n\005state\030\002 \002(\005\022\r\n\005owner\030\003 \001(\t\022\016\n" +
+      "\006secret\030\004 \001(\t\022\020\n\010callback\030\005 \001(\t\022\r\n\005extra" +
+      "\030\006 \001(\t\"(\n\017GetRobotsResult\022\025\n\005entry\030\001 \003(\013" +
+      "2\006.Robot\"g\n\030UploadDeviceTokenRequest\022\020\n\010" +
+      "platform\030\001 \002(\005\022\020\n\010app_name\030\002 \002(\t\022\024\n\014devi" +
+      "ce_token\030\003 \002(\t\022\021\n\tpush_type\030\004 \002(\005\"\201\001\n\026Mo" +
+      "difyGroupInfoRequest\022\020\n\010group_id\030\001 \002(\t\022\014" +
+      "\n\004type\030\002 \002(\005\022\r\n\005value\030\003 \002(\t\022\017\n\007to_line\030\004" +
+      " \003(\005\022\'\n\016notify_content\030\005 \001(\0132\017.MessageCo" +
+      "ntent\"\203\001\n\026SetGroupManagerRequest\022\020\n\010grou",
+      "p_id\030\001 \002(\t\022\014\n\004type\030\002 \002(\005\022\017\n\007user_id\030\003 \003(" +
+      "\t\022\017\n\007to_line\030\004 \003(\005\022\'\n\016notify_content\030\005 \001" +
+      "(\0132\017.MessageContent\"(\n\tInfoEntry\022\014\n\004type" +
+      "\030\001 \002(\005\022\r\n\005value\030\002 \002(\t\"0\n\023ModifyMyInfoReq" +
+      "uest\022\031\n\005entry\030\001 \003(\0132\n.InfoEntry\";\n\rNotif" +
+      "yMessage\022\014\n\004type\030\001 \002(\005\022\014\n\004head\030\002 \002(\003\022\016\n\006" +
+      "target\030\003 \001(\t\"=\n\022PullMessageRequest\022\n\n\002id" +
+      "\030\001 \002(\003\022\014\n\004type\030\002 \002(\005\022\r\n\005delay\030\003 \001(\003\"M\n\021P" +
+      "ullMessageResult\022\031\n\007message\030\001 \003(\0132\010.Mess" +
+      "age\022\017\n\007current\030\002 \002(\003\022\014\n\004head\030\003 \002(\003\"/\n\023Pu",
+      "llGroupInfoResult\022\030\n\004info\030\001 \003(\0132\n.GroupI" +
+      "nfo\"6\n\026PullGroupMemberRequest\022\016\n\006target\030" +
+      "\001 \002(\t\022\014\n\004head\030\002 \002(\003\"5\n\025PullGroupMemberRe" +
+      "sult\022\034\n\006member\030\001 \003(\0132\014.GroupMember\"-\n\013Us" +
+      "erRequest\022\013\n\003uid\030\001 \002(\t\022\021\n\tupdate_dt\030\002 \001(" +
+      "\003\"0\n\017PullUserRequest\022\035\n\007request\030\001 \003(\0132\014." +
+      "UserRequest\"/\n\nUserResult\022\023\n\004user\030\001 \002(\0132" +
+      "\005.User\022\014\n\004code\030\002 \002(\005\"-\n\016PullUserResult\022\033" +
+      "\n\006result\030\001 \003(\0132\013.UserResult\"p\n\020QuitGroup" +
+      "Request\022\020\n\010group_id\030\001 \002(\t\022\017\n\007to_line\030\002 \003",
+      "(\005\022\'\n\016notify_content\030\003 \001(\0132\017.MessageCont" +
+      "ent\022\020\n\010keep_msg\030\004 \001(\005\"~\n\030RemoveGroupMemb" +
+      "erRequest\022\020\n\010group_id\030\001 \002(\t\022\026\n\016removed_m" +
+      "ember\030\002 \003(\t\022\017\n\007to_line\030\003 \003(\005\022\'\n\016notify_c" +
+      "ontent\030\004 \001(\0132\017.MessageContent\"u\n\024Transfe" +
+      "rGroupRequest\022\020\n\010group_id\030\001 \002(\t\022\021\n\tnew_o" +
+      "wner\030\002 \002(\t\022\017\n\007to_line\030\003 \003(\005\022\'\n\016notify_co" +
+      "ntent\030\004 \001(\0132\017.MessageContent\"\206\001\n\026ModifyG" +
+      "roupMemberAlias\022\020\n\010group_id\030\001 \002(\t\022\r\n\005ali" +
+      "as\030\002 \002(\t\022\017\n\007to_line\030\003 \003(\005\022\'\n\016notify_cont",
+      "ent\030\004 \001(\0132\017.MessageContent\022\021\n\tmember_id\030" +
+      "\005 \001(\t\"\206\001\n\026ModifyGroupMemberExtra\022\020\n\010grou" +
+      "p_id\030\001 \002(\t\022\017\n\007to_line\030\002 \003(\005\022\'\n\016notify_co" +
+      "ntent\030\003 \001(\0132\017.MessageContent\022\r\n\005extra\030\004 " +
+      "\001(\t\022\021\n\tmember_id\030\005 \001(\t\"P\n\020UserSettingEnt" +
+      "ry\022\r\n\005scope\030\001 \002(\005\022\013\n\003key\030\002 \002(\t\022\r\n\005value\030" +
+      "\003 \002(\t\022\021\n\tupdate_dt\030\004 \002(\003\"A\n\024ModifyUserSe" +
+      "ttingReq\022\r\n\005scope\030\001 \002(\005\022\013\n\003key\030\002 \002(\t\022\r\n\005" +
+      "value\030\003 \002(\t\"\032\n\007Version\022\017\n\007version\030\001 \002(\003\"" +
+      "8\n\024GetUserSettingResult\022 \n\005entry\030\001 \003(\0132\021",
+      ".UserSettingEntry\"f\n\006Friend\022\013\n\003uid\030\001 \002(\t" +
+      "\022\r\n\005state\030\002 \002(\005\022\021\n\tupdate_dt\030\003 \002(\003\022\r\n\005al" +
+      "ias\030\004 \001(\t\022\017\n\007blacked\030\005 \001(\005\022\r\n\005extra\030\006 \001(" +
+      "\t\"*\n\020GetFriendsResult\022\026\n\005entry\030\001 \003(\0132\007.F" +
+      "riend\"7\n\026GetFriendRequestResult\022\035\n\005entry" +
+      "\030\001 \003(\0132\016.FriendRequest\"\243\001\n\021ConnectAckPay" +
+      "load\022\020\n\010msg_head\030\001 \001(\003\022\023\n\013friend_head\030\002 " +
+      "\001(\003\022\026\n\016friend_rq_head\030\003 \001(\003\022\024\n\014setting_h" +
+      "ead\030\004 \001(\003\022\021\n\tnode_addr\030\005 \001(\t\022\021\n\tnode_por" +
+      "t\030\006 \001(\005\022\023\n\013server_time\030\007 \001(\003\"P\n\rIMHttpWr",
+      "apper\022\r\n\005token\030\001 \002(\t\022\021\n\tclient_id\030\002 \002(\t\022" +
+      "\017\n\007request\030\003 \002(\t\022\014\n\004data\030\004 \001(\014\"A\n\021Search" +
+      "UserRequest\022\017\n\007keyword\030\001 \002(\t\022\r\n\005fuzzy\030\002 " +
+      "\001(\005\022\014\n\004page\030\003 \001(\005\"(\n\020SearchUserResult\022\024\n" +
+      "\005entry\030\001 \003(\0132\005.User\"@\n\026GetChatroomInfoRe" +
+      "quest\022\023\n\013chatroom_id\030\001 \002(\t\022\021\n\tupdate_dt\030" +
+      "\002 \001(\003\"\227\001\n\014ChatroomInfo\022\r\n\005title\030\001 \002(\t\022\014\n" +
+      "\004desc\030\002 \001(\t\022\020\n\010portrait\030\003 \001(\t\022\024\n\014member_" +
+      "count\030\004 \001(\005\022\021\n\tcreate_dt\030\005 \001(\003\022\021\n\tupdate" +
+      "_dt\030\006 \001(\003\022\r\n\005extra\030\007 \001(\t\022\r\n\005state\030\010 \001(\005\"",
+      "F\n\034GetChatroomMemberInfoRequest\022\023\n\013chatr" +
+      "oom_id\030\001 \002(\t\022\021\n\tmax_count\030\002 \001(\005\";\n\022Chatr" +
+      "oomMemberInfo\022\024\n\014member_count\030\001 \001(\005\022\017\n\007m" +
+      "embers\030\002 \003(\t\"\026\n\010INT64Buf\022\n\n\002id\030\001 \002(\003\"4\n\023" +
+      "NotifyRecallMessage\022\n\n\002id\030\001 \002(\003\022\021\n\tfrom_" +
+      "user\030\002 \002(\t\"/\n\020BlackUserRequest\022\013\n\003uid\030\001 " +
+      "\002(\t\022\016\n\006status\030\002 \002(\005\"\323\001\n\014RouteRequest\022\013\n\003" +
+      "app\030\001 \001(\t\022\020\n\010platform\030\002 \001(\005\022\021\n\tpush_type" +
+      "\030\003 \001(\005\022\023\n\013device_name\030\004 \001(\t\022\026\n\016device_ve" +
+      "rsion\030\005 \001(\t\022\022\n\nphone_name\030\006 \001(\t\022\020\n\010langu",
+      "age\030\007 \001(\t\022\024\n\014carrier_name\030\010 \001(\t\022\023\n\013app_v" +
+      "ersion\030\t \001(\t\022\023\n\013sdk_version\030\n \001(\t\"D\n\rRou" +
+      "teResponse\022\014\n\004host\030\001 \002(\t\022\021\n\tlong_port\030\002 " +
+      "\002(\005\022\022\n\nshort_port\030\003 \002(\005\"G\n\017GetTokenReque" +
+      "st\022\017\n\007user_id\030\001 \002(\t\022\021\n\tclient_id\030\002 \002(\t\022\020" +
+      "\n\010platform\030\003 \001(\005\"r\n\022LoadRemoteMessages\022#" +
+      "\n\014conversation\030\001 \002(\0132\r.Conversation\022\022\n\nb" +
+      "efore_uid\030\002 \002(\003\022\r\n\005count\030\003 \002(\005\022\024\n\014conten" +
+      "t_type\030\004 \003(\005\"a\n\020MultiCastMessage\022\021\n\tfrom" +
+      "_user\030\001 \002(\t\022 \n\007content\030\002 \002(\0132\017.MessageCo",
+      "ntent\022\n\n\002to\030\003 \003(\t\022\014\n\004line\030\004 \002(\005\"E\n\035Recal" +
+      "lMultiCastMessageRequest\022\022\n\nmessage_id\030\001" +
+      " \002(\003\022\020\n\010receiver\030\002 \003(\t\"@\n\017AuthCodeReques" +
+      "t\022\021\n\ttarget_id\030\001 \002(\t\022\014\n\004type\030\002 \002(\005\022\014\n\004ho" +
+      "st\030\003 \002(\t\"o\n\030ApplicationConfigRequest\022\r\n\005" +
+      "appId\030\001 \002(\t\022\017\n\007appType\030\002 \002(\005\022\021\n\ttimestam" +
+      "p\030\003 \002(\003\022\r\n\005nonce\030\004 \002(\t\022\021\n\tsignature\030\005 \002(" +
+      "\tB/\n\025cn.wildfirechat.protoB\nWFCMessageZ\n" +
+      "./go;proto"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -67502,7 +67665,7 @@ public final class WFCMessage {
           internal_static_GroupInfo_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_GroupInfo_descriptor,
-              new java.lang.String[] { "TargetId", "Name", "Portrait", "Owner", "Type", "MemberCount", "Extra", "UpdateDt", "MemberUpdateDt", "Mute", "JoinType", "PrivateChat", "Searchable", "MaxMemberCount", "HistoryMessage", "SuperGroup", });
+              new java.lang.String[] { "TargetId", "Name", "Portrait", "Owner", "Type", "MemberCount", "Extra", "UpdateDt", "MemberUpdateDt", "Mute", "JoinType", "PrivateChat", "Searchable", "MaxMemberCount", "HistoryMessage", "SuperGroup", "Deleted", });
           internal_static_GroupMember_descriptor =
             getDescriptor().getMessageTypes().get(3);
           internal_static_GroupMember_fieldAccessorTable = new
@@ -67760,7 +67923,7 @@ public final class WFCMessage {
           internal_static_QuitGroupRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_QuitGroupRequest_descriptor,
-              new java.lang.String[] { "GroupId", "ToLine", "NotifyContent", });
+              new java.lang.String[] { "GroupId", "ToLine", "NotifyContent", "KeepMsg", });
           internal_static_RemoveGroupMemberRequest_descriptor =
             getDescriptor().getMessageTypes().get(46);
           internal_static_RemoveGroupMemberRequest_fieldAccessorTable = new

distribution/pom.xml

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

distribution/src/main/resources/wildfirechat.conf

@@ -124,6 +124,12 @@ message.global_mute_exception_types 401,402,403,404,405,407,408,410,411
 ## 离线用户推送过期天数，0是永不过期，建议配置为7天。
 message.push_expired_days 7
 
+## 当会话静音/全局静音/PC在线静音时，普通消息都不会有推送，如果有某些消息类型需要此时保持推送，可以配置到这里。此配置对消息免打扰时段无效。
+## 此配置只影响远程推送，需要客户端处理客户端在线且在后台收到此消息的处理，需要针对这些消息类型加上本地通知。
+## 强制推送消息的MessagePayload中pushContent和pushData至少要存在一个才可以推送。
+## 消息类型以英文逗号分割。
+#message.force_push_types 401,402
+
 ## 群发消息(包括server api群发和全局频道群发)时，目标用户是否来自于t_user表。如果使用野火托管用户信息，请设置为true，否则设置为false。
 message.broadcast.target_from_user_table true
 
@@ -203,6 +209,9 @@ group.visible_quit_or_kickoff_notification 0
 ## 是否禁止陌生人拉人入群，默认为false
 group.disable_stranger_invite false
 
+## 群组信息是否标记删除
+group.enable_mark_deletion false
+
 ## 隐藏用户信息属性类型，2是性别，3是电话号码，4是邮箱，5是地址，6是公司信息，7是社交账号，8是Extra信息。当需要隐藏多个时以英文逗号分开;
 ## 本配置是为了提高安全性，避免把对应信息同步到客户端，这样就能防止程序被破解从而拿到用户关键信息。仅对客户端有效，server api不受影响。
 ## 注意，修改本配置不会对已经同步的信息产生影响。

pom.xml

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

release_note.md

@@ -12,6 +12,20 @@
 
 # 更新记录
 
+--------------
+Release note 1.2.6:
+1. 群主强制被退群时（销毁账号/server api强制退群），调整新群主选择，群管理优先，先加入群组优先。
+2. 拉取远程消息时，过滤掉可能重复的消息。
+3. 退群时添加是否保留消息的参数，可以退群后保留原有消息。
+4. 如果不在群组中，当获取群组信息时不更新数据。
+
+--------------
+Release note 1.2.5:
+1. Server API添加通过邮箱获取用户信息的接口。
+2. 支持群组标记删除功能。
+3. 添加配置，可以设置在静音时强制推送指定类型消息。
+4. 支持用户设置添加好友是否验证功能
+
 --------------
 Release note 1.2.4:
 1. 去掉用户的默认密码。

sdk/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>1.2.4</version>
+        <version>1.2.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -178,6 +178,15 @@ public class Main {
             System.out.println("get user info by userId failure");
             System.exit(-1);
         }
+
+        IMResult<OutputUserInfoList> userInfoListIMResult = UserAdmin.getUserByEmail("[email protected]");
+        if(userInfoListIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS || userInfoListIMResult.getErrorCode() == ErrorCode.ERROR_CODE_NOT_EXIST) {
+            System.out.println("getUserByEmail success");
+        } else {
+            System.out.println("getUserByEmail failure");
+            System.exit(-1);
+        }
+
         InputOutputUserInfo updateUserInfo = new InputOutputUserInfo();
         updateUserInfo.setUserId(System.currentTimeMillis()+"");
         updateUserInfo.setDisplayName("updatedUserName");

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

@@ -24,6 +24,11 @@ public class UserAdmin {
         return AdminHttpUtils.httpJsonPost(path, getUserInfo, InputOutputUserInfo.class);
     }
 
+    public static IMResult<OutputUserInfoList> getUserByEmail(String email) throws Exception {
+        String path = APIPath.User_Get_Email_Info;
+        return AdminHttpUtils.httpJsonPost(path, email, OutputUserInfoList.class);
+    }
+
     public static IMResult<OutputGetUserList> getAllUsers(int count, int offset) throws Exception {
         String path = APIPath.User_Get_All;
         InputGetUserList input = new InputGetUserList();