From d4d467afe2f80c36c4b34bdba458b6cf88a5b48d Mon Sep 17 00:00:00 2001 From: imhao183 Date: Fri, 2 Apr 2021 12:04:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E7=BE=A4=E7=BB=84=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojos/InputModifyGroupInfo.java | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/common/src/main/java/cn/wildfirechat/pojos/InputModifyGroupInfo.java b/common/src/main/java/cn/wildfirechat/pojos/InputModifyGroupInfo.java index ed0f70c8..19ef9ff0 100755 --- a/common/src/main/java/cn/wildfirechat/pojos/InputModifyGroupInfo.java +++ b/common/src/main/java/cn/wildfirechat/pojos/InputModifyGroupInfo.java @@ -49,11 +49,21 @@ public class InputModifyGroupInfo extends InputGroupBase { } public WFCMessage.ModifyGroupInfoRequest toProtoGroupRequest() { - return WFCMessage.ModifyGroupInfoRequest.newBuilder() - .setGroupId(group_id) - .setType(type) - .setValue(value) - .addAllToLine(to_lines == null || to_lines.isEmpty() ? Arrays.asList(0) : to_lines) - .build(); + if(notify_message != null && notify_message.getType() > 0) { + return WFCMessage.ModifyGroupInfoRequest.newBuilder() + .setGroupId(group_id) + .setType(type) + .setValue(value) + .addAllToLine(to_lines == null || to_lines.isEmpty() ? Arrays.asList(0) : to_lines) + .build(); + } else { + return WFCMessage.ModifyGroupInfoRequest.newBuilder() + .setGroupId(group_id) + .setType(type) + .setValue(value) + .addAllToLine(to_lines == null || to_lines.isEmpty() ? Arrays.asList(0) : to_lines) + .setNotifyContent(notify_message.toProtoMessageContent()) + .build(); + } } }