diff --git a/common/src/main/java/cn/wildfirechat/proto/WFCMessage.java b/common/src/main/java/cn/wildfirechat/proto/WFCMessage.java
index cf5b1759..aa956a67 100644
--- a/common/src/main/java/cn/wildfirechat/proto/WFCMessage.java
+++ b/common/src/main/java/cn/wildfirechat/proto/WFCMessage.java
@@ -1,5 +1,5 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
-// source: wfcmessage.proto
+// source: wfcmessage_community.proto
package cn.wildfirechat.proto;
@@ -45256,6 +45256,16 @@ public final class WFCMessage {
*/
com.google.protobuf.ByteString
getAliasBytes();
+
+ // optional int32 blacked = 5;
+ /**
+ * optional int32 blacked = 5;
+ */
+ boolean hasBlacked();
+ /**
+ * optional int32 blacked = 5;
+ */
+ int getBlacked();
}
/**
* Protobuf type {@code Friend}
@@ -45328,6 +45338,11 @@ public final class WFCMessage {
alias_ = input.readBytes();
break;
}
+ case 40: {
+ bitField0_ |= 0x00000010;
+ blacked_ = input.readInt32();
+ break;
+ }
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -45486,11 +45501,28 @@ public final class WFCMessage {
}
}
+ // optional int32 blacked = 5;
+ public static final int BLACKED_FIELD_NUMBER = 5;
+ private int blacked_;
+ /**
+ * optional int32 blacked = 5;
+ */
+ public boolean hasBlacked() {
+ return ((bitField0_ & 0x00000010) == 0x00000010);
+ }
+ /**
+ * optional int32 blacked = 5;
+ */
+ public int getBlacked() {
+ return blacked_;
+ }
+
private void initFields() {
uid_ = "";
state_ = 0;
updateDt_ = 0L;
alias_ = "";
+ blacked_ = 0;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -45528,6 +45560,9 @@ public final class WFCMessage {
if (((bitField0_ & 0x00000008) == 0x00000008)) {
output.writeBytes(4, getAliasBytes());
}
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ output.writeInt32(5, blacked_);
+ }
getUnknownFields().writeTo(output);
}
@@ -45553,6 +45588,10 @@ public final class WFCMessage {
size += com.google.protobuf.CodedOutputStream
.computeBytesSize(4, getAliasBytes());
}
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeInt32Size(5, blacked_);
+ }
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
return size;
@@ -45677,6 +45716,8 @@ public final class WFCMessage {
bitField0_ = (bitField0_ & ~0x00000004);
alias_ = "";
bitField0_ = (bitField0_ & ~0x00000008);
+ blacked_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000010);
return this;
}
@@ -45721,6 +45762,10 @@ public final class WFCMessage {
to_bitField0_ |= 0x00000008;
}
result.alias_ = alias_;
+ if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
+ to_bitField0_ |= 0x00000010;
+ }
+ result.blacked_ = blacked_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@@ -45753,6 +45798,9 @@ public final class WFCMessage {
alias_ = other.alias_;
onChanged();
}
+ if (other.hasBlacked()) {
+ setBlacked(other.getBlacked());
+ }
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
@@ -46006,6 +46054,39 @@ public final class WFCMessage {
return this;
}
+ // optional int32 blacked = 5;
+ private int blacked_ ;
+ /**
+ * optional int32 blacked = 5;
+ */
+ public boolean hasBlacked() {
+ return ((bitField0_ & 0x00000010) == 0x00000010);
+ }
+ /**
+ * optional int32 blacked = 5;
+ */
+ public int getBlacked() {
+ return blacked_;
+ }
+ /**
+ * optional int32 blacked = 5;
+ */
+ public Builder setBlacked(int value) {
+ bitField0_ |= 0x00000010;
+ blacked_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * optional int32 blacked = 5;
+ */
+ public Builder clearBlacked() {
+ bitField0_ = (bitField0_ & ~0x00000010);
+ blacked_ = 0;
+ onChanged();
+ return this;
+ }
+
// @@protoc_insertion_point(builder_scope:Friend)
}
@@ -60248,46 +60329,46 @@ public final class WFCMessage {
"cope\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\024GetUserSet" +
"tingResult\022 \n\005entry\030\001 \003(\0132\021.UserSettingE" +
- "ntry\"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\"*\n\020" +
- "GetFriendsResult\022\026\n\005entry\030\001 \003(\0132\007.Friend" +
- "\"7\n\026GetFriendRequestResult\022\035\n\005entry\030\001 \003(",
- "\0132\016.FriendRequest\"\243\001\n\021ConnectAckPayload\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_head\030\004" +
- " \001(\003\022\021\n\tnode_addr\030\005 \001(\t\022\021\n\tnode_port\030\006 \001" +
- "(\005\022\023\n\013server_time\030\007 \001(\003\"P\n\rIMHttpWrapper" +
- "\022\r\n\005token\030\001 \002(\t\022\021\n\tclient_id\030\002 \002(\t\022\017\n\007re" +
- "quest\030\003 \002(\t\022\014\n\004data\030\004 \001(\014\"A\n\021SearchUserR" +
- "equest\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\005entr" +
- "y\030\001 \003(\0132\005.User\"@\n\026GetChatroomInfoRequest",
- "\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\034Ge" +
- "tChatroomMemberInfoRequest\022\023\n\013chatroom_i" +
- "d\030\001 \002(\t\022\021\n\tmax_count\030\002 \001(\005\";\n\022ChatroomMe" +
- "mberInfo\022\024\n\014member_count\030\001 \001(\005\022\017\n\007member" +
- "s\030\002 \003(\t\"\026\n\010INT64Buf\022\n\n\002id\030\001 \002(\003\"4\n\023Notif" +
- "yRecallMessage\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\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\016device_version" +
- "\030\005 \001(\t\022\022\n\nphone_name\030\006 \001(\t\022\020\n\010language\030\007" +
- " \001(\t\022\024\n\014carrier_name\030\010 \001(\t\022\023\n\013app_versio" +
- "n\030\t \001(\t\022\023\n\013sdk_version\030\n \001(\t\"D\n\rRouteRes" +
- "ponse\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\"5\n\017GetTokenRequest\022\017\n" +
- "\007user_id\030\001 \002(\t\022\021\n\tclient_id\030\002 \002(\t\"\\\n\022Loa",
- "dRemoteMessages\022#\n\014conversation\030\001 \002(\0132\r." +
- "Conversation\022\022\n\nbefore_uid\030\002 \002(\003\022\r\n\005coun" +
- "t\030\003 \002(\005\"a\n\020MultiCastMessage\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.wildfir" +
- "echat.protoB\nWFCMessage"
+ "ntry\"W\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\007" +
+ "blacked\030\005 \001(\005\"*\n\020GetFriendsResult\022\026\n\005ent" +
+ "ry\030\001 \003(\0132\007.Friend\"7\n\026GetFriendRequestRes",
+ "ult\022\035\n\005entry\030\001 \003(\0132\016.FriendRequest\"\243\001\n\021C" +
+ "onnectAckPayload\022\020\n\010msg_head\030\001 \001(\003\022\023\n\013fr" +
+ "iend_head\030\002 \001(\003\022\026\n\016friend_rq_head\030\003 \001(\003\022" +
+ "\024\n\014setting_head\030\004 \001(\003\022\021\n\tnode_addr\030\005 \001(\t" +
+ "\022\021\n\tnode_port\030\006 \001(\005\022\023\n\013server_time\030\007 \001(\003" +
+ "\"P\n\rIMHttpWrapper\022\r\n\005token\030\001 \002(\t\022\021\n\tclie" +
+ "nt_id\030\002 \002(\t\022\017\n\007request\030\003 \002(\t\022\014\n\004data\030\004 \001" +
+ "(\014\"A\n\021SearchUserRequest\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\020SearchU" +
+ "serResult\022\024\n\005entry\030\001 \003(\0132\005.User\"@\n\026GetCh",
+ "atroomInfoRequest\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\005ti" +
+ "tle\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\005" +
+ "state\030\010 \001(\005\"F\n\034GetChatroomMemberInfoRequ" +
+ "est\022\023\n\013chatroom_id\030\001 \002(\t\022\021\n\tmax_count\030\002 " +
+ "\001(\005\";\n\022ChatroomMemberInfo\022\024\n\014member_coun" +
+ "t\030\001 \001(\005\022\017\n\007members\030\002 \003(\t\"\026\n\010INT64Buf\022\n\n\002" +
+ "id\030\001 \002(\003\"4\n\023NotifyRecallMessage\022\n\n\002id\030\001 ",
+ "\002(\003\022\021\n\tfrom_user\030\002 \002(\t\"/\n\020BlackUserReque" +
+ "st\022\013\n\003uid\030\001 \002(\t\022\016\n\006status\030\002 \002(\005\"\323\001\n\014Rout" +
+ "eRequest\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\016device_version\030\005 \001(\t\022\022\n\nphone_name\030\006 " +
+ "\001(\t\022\020\n\010language\030\007 \001(\t\022\024\n\014carrier_name\030\010 " +
+ "\001(\t\022\023\n\013app_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\t" +
+ "long_port\030\002 \002(\005\022\022\n\nshort_port\030\003 \002(\005\"5\n\017G" +
+ "etTokenRequest\022\017\n\007user_id\030\001 \002(\t\022\021\n\tclien",
+ "t_id\030\002 \002(\t\"\\\n\022LoadRemoteMessages\022#\n\014conv" +
+ "ersation\030\001 \002(\0132\r.Conversation\022\022\n\nbefore_" +
+ "uid\030\002 \002(\003\022\r\n\005count\030\003 \002(\005\"a\n\020MultiCastMes" +
+ "sage\022\021\n\tfrom_user\030\001 \002(\t\022 \n\007content\030\002 \002(\013" +
+ "2\017.MessageContent\022\n\n\002to\030\003 \003(\t\022\014\n\004line\030\004 " +
+ "\002(\005B#\n\025cn.wildfirechat.protoB\nWFCMessage"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -60617,7 +60698,7 @@ public final class WFCMessage {
internal_static_Friend_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_Friend_descriptor,
- new java.lang.String[] { "Uid", "State", "UpdateDt", "Alias", });
+ new java.lang.String[] { "Uid", "State", "UpdateDt", "Alias", "Blacked", });
internal_static_GetFriendsResult_descriptor =
getDescriptor().getMessageTypes().get(54);
internal_static_GetFriendsResult_fieldAccessorTable = new