From df3bace44b8d941250243a2e06a39ecdcb7793f8 Mon Sep 17 00:00:00 2001
From: imhao183 <wildfirechat86@gmail.com>
Date: Tue, 21 Jul 2020 22:07:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=BE=A4=E7=BB=84=E6=97=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9B=B4=E5=A4=9A=E7=9A=84=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wildfirechat/pojos/InputCreateGroup.java  | 41 ++++++++++----
 .../cn/wildfirechat/pojos/PojoGroupInfo.java  | 54 +++++++++++++++++++
 2 files changed, 84 insertions(+), 11 deletions(-)

diff --git a/common/src/main/java/cn/wildfirechat/pojos/InputCreateGroup.java b/common/src/main/java/cn/wildfirechat/pojos/InputCreateGroup.java
index cb25a0c9..05439a71 100755
--- a/common/src/main/java/cn/wildfirechat/pojos/InputCreateGroup.java
+++ b/common/src/main/java/cn/wildfirechat/pojos/InputCreateGroup.java
@@ -24,27 +24,46 @@ public class InputCreateGroup extends InputGroupBase {
     public WFCMessage.CreateGroupRequest toProtoGroupRequest() {
         WFCMessage.Group.Builder groupBuilder = WFCMessage.Group.newBuilder();
         WFCMessage.GroupInfo.Builder groupInfoBuilder = WFCMessage.GroupInfo.newBuilder();
-        if (!StringUtil.isNullOrEmpty(group.getGroup_info().target_id)) {
-            groupInfoBuilder.setTargetId(group.getGroup_info().getTarget_id());
+        PojoGroupInfo group_info = group.getGroup_info();
+        if (!StringUtil.isNullOrEmpty(group_info.target_id)) {
+            groupInfoBuilder.setTargetId(group_info.getTarget_id());
         }
 
-        if (!StringUtil.isNullOrEmpty(group.getGroup_info().name)) {
-            groupInfoBuilder.setName(group.getGroup_info().getName());
+        if (!StringUtil.isNullOrEmpty(group_info.name)) {
+            groupInfoBuilder.setName(group_info.getName());
         }
 
-        if (!StringUtil.isNullOrEmpty(group.getGroup_info().portrait)) {
-            groupInfoBuilder.setPortrait(group.getGroup_info().getPortrait());
+        if (!StringUtil.isNullOrEmpty(group_info.portrait)) {
+            groupInfoBuilder.setPortrait(group_info.getPortrait());
         }
-        if (!StringUtil.isNullOrEmpty(group.getGroup_info().owner)) {
-            groupInfoBuilder.setOwner(group.getGroup_info().getOwner());
+        if (!StringUtil.isNullOrEmpty(group_info.owner)) {
+            groupInfoBuilder.setOwner(group_info.getOwner());
         }
 
-            groupInfoBuilder.setType(group.getGroup_info().getType());
+        groupInfoBuilder.setType(group_info.getType());
 
-        if (!StringUtil.isNullOrEmpty(group.getGroup_info().extra)) {
-            groupInfoBuilder.setExtra(group.getGroup_info().getExtra());
+        if (!StringUtil.isNullOrEmpty(group_info.extra)) {
+            groupInfoBuilder.setExtra(group_info.getExtra());
         }
 
+        if (group_info.history_message > 0 && group_info.history_message < 128) {
+            groupInfoBuilder.setHistoryMessage(group_info.history_message);
+        }
+        if (group_info.join_type > 0 && group_info.join_type < 128) {
+            groupInfoBuilder.setJoinType(group_info.join_type);
+        }
+        if (group_info.max_member_count > 0) {
+            groupInfoBuilder.setMaxMemberCount(group_info.max_member_count);
+        }
+        if (group_info.mute > 0 && group_info.mute < 128) {
+            groupInfoBuilder.setMute(group_info.mute);
+        }
+        if (group_info.private_chat > 0 && group_info.private_chat < 128) {
+            groupInfoBuilder.setPrivateChat(group_info.private_chat);
+        }
+        if (group_info.searchable > 0) {
+            groupInfoBuilder.setSearchable(group_info.searchable);
+        }
 
         groupBuilder.setGroupInfo(groupInfoBuilder);
         for (PojoGroupMember pojoGroupMember : group.getMembers()) {
diff --git a/common/src/main/java/cn/wildfirechat/pojos/PojoGroupInfo.java b/common/src/main/java/cn/wildfirechat/pojos/PojoGroupInfo.java
index 431783b1..49b49eaa 100644
--- a/common/src/main/java/cn/wildfirechat/pojos/PojoGroupInfo.java
+++ b/common/src/main/java/cn/wildfirechat/pojos/PojoGroupInfo.java
@@ -15,6 +15,12 @@ public class PojoGroupInfo {
     String owner;
     int type;
     String extra;
+    int mute;
+    int join_type;
+    int private_chat;
+    int searchable;
+    int max_member_count;
+    int history_message;
 
     public String getTarget_id() {
         return target_id;
@@ -63,4 +69,52 @@ public class PojoGroupInfo {
     public void setExtra(String extra) {
         this.extra = extra;
     }
+
+    public int getMax_member_count() {
+        return max_member_count;
+    }
+
+    public void setMax_member_count(int max_member_count) {
+        this.max_member_count = max_member_count;
+    }
+
+    public int getMute() {
+        return mute;
+    }
+
+    public void setMute(int mute) {
+        this.mute = mute;
+    }
+
+    public int getJoin_type() {
+        return join_type;
+    }
+
+    public void setJoin_type(int join_type) {
+        this.join_type = join_type;
+    }
+
+    public int getPrivate_chat() {
+        return private_chat;
+    }
+
+    public void setPrivate_chat(int private_chat) {
+        this.private_chat = private_chat;
+    }
+
+    public int getSearchable() {
+        return searchable;
+    }
+
+    public void setSearchable(int searchable) {
+        this.searchable = searchable;
+    }
+
+    public int getHistory_message() {
+        return history_message;
+    }
+
+    public void setHistory_message(int history_message) {
+        this.history_message = history_message;
+    }
 }