创建群组或者添加群组成员时,群组成员的Extra会放到通知消息的extra中,这样便于业务处理通知消息

This commit is contained in:
heavyrian2012
2024-09-25 11:07:12 +08:00
parent d100bd5fb1
commit 6d91f3869e
8 changed files with 89 additions and 13 deletions
@@ -13,6 +13,7 @@ import cn.wildfirechat.proto.WFCMessage;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.protobuf.ByteString;
import io.netty.util.internal.StringUtil;
import java.util.List;
@@ -32,6 +33,8 @@ public class GroupNotificationBinaryContent {
//value2(member or something)
private String m;
private String extra;
public GroupNotificationBinaryContent() {
}
@@ -89,8 +92,18 @@ public class GroupNotificationBinaryContent {
this.ms = ms;
}
public GroupNotificationBinaryContent setExtra(String extra) {
this.extra = extra;
return this;
}
public WFCMessage.MessageContent getGroupNotifyContent(int groupContentType) {
return WFCMessage.MessageContent.newBuilder().setType(groupContentType).setData(ByteString.copyFromUtf8(new GsonBuilder().disableHtmlEscaping().create().toJson(this))).build();
WFCMessage.MessageContent.Builder builder = WFCMessage.MessageContent.newBuilder().setType(groupContentType).setData(ByteString.copyFromUtf8(new GsonBuilder().disableHtmlEscaping().create().toJson(this)));
if(!StringUtil.isNullOrEmpty(extra)) {
builder.setExtra(extra);
}
return builder.build();
}
public WFCMessage.MessageContent getAddGroupNotifyContent() {
@@ -17,6 +17,7 @@ import java.util.List;
public class InputAddGroupMember extends InputGroupBase {
private String group_id;
private List<PojoGroupMember> members;
private String member_extra;
public String getGroup_id() {
return group_id;
@@ -34,6 +35,14 @@ public class InputAddGroupMember extends InputGroupBase {
this.members = members;
}
public String getMember_extra() {
return member_extra;
}
public void setMemberExtra(String extra) {
this.member_extra = extra;
}
public boolean isValide() {
return true;
}
@@ -41,6 +50,9 @@ public class InputAddGroupMember extends InputGroupBase {
public WFCMessage.AddGroupMemberRequest toProtoGroupRequest() {
WFCMessage.AddGroupMemberRequest.Builder addGroupBuilder = WFCMessage.AddGroupMemberRequest.newBuilder();
addGroupBuilder.setGroupId(group_id);
if(!StringUtil.isNullOrEmpty(member_extra)) {
addGroupBuilder.setExtra(member_extra);
}
for (PojoGroupMember pojoGroupMember : getMembers()) {
WFCMessage.GroupMember.Builder groupMemberBuilder = WFCMessage.GroupMember.newBuilder().setMemberId(pojoGroupMember.getMember_id());
if (!StringUtil.isNullOrEmpty(pojoGroupMember.getAlias())) {
@@ -16,6 +16,7 @@ import java.util.List;
public class InputCreateGroup extends InputGroupBase {
private PojoGroup group;
private String member_extra;
public boolean isValide() {
return true;
@@ -87,6 +88,9 @@ public class InputCreateGroup extends InputGroupBase {
WFCMessage.CreateGroupRequest.Builder createGroupReqBuilder = WFCMessage.CreateGroupRequest.newBuilder();
createGroupReqBuilder.setGroup(groupBuilder);
if(!StringUtil.isNullOrEmpty(member_extra)) {
createGroupReqBuilder.setMemberExtra(member_extra);
}
if (to_lines != null) {
for (Integer line : to_lines
) {
@@ -107,4 +111,12 @@ public class InputCreateGroup extends InputGroupBase {
public void setGroup(PojoGroup group) {
this.group = group;
}
public String getMember_extra() {
return member_extra;
}
public void setMember_extra(String member_extra) {
this.member_extra = member_extra;
}
}