Merge remote-tracking branch 'origin/main'

openimsdk · Dec 25, 2023 · e9e7779 · e9e7779
2 parents 8b20563 + 2e6f3b9
commit e9e7779
Show file tree

Hide file tree

Showing 9 changed files with 2,306 additions and 1,952 deletions.
diff --git a/friend/friend.go b/friend/friend.go
@@ -183,7 +183,7 @@ func (x *GetDesignatedFriendsApplyReq) Check() error {
 	}
 	return nil
 }
-func (x *PinFriendsReq) Check() error {
+func (x *UpdateFriendsReq) Check() error {
 	if x.OwnerUserID == "" {
 		return errors.New("ownerUserID is empty")
 	}

diff --git a/friend/friend.pb.go b/friend/friend.pb.go
diff --git a/friend/friend.proto b/friend/friend.proto
@@ -79,6 +79,7 @@ message getDesignatedFriendsResp{
 message addBlackReq{
   string ownerUserID = 1;
   string blackUserID = 2;
+  string ex = 3;
 }
 message addBlackResp{
 }
@@ -138,12 +139,14 @@ message respondFriendApplyReq{
 message respondFriendApplyResp{
 }
 
-message pinFriendsReq{
+message updateFriendsReq{
   string ownerUserID = 1;
   repeated string friendUserIDs = 2;
   OpenIMServer.protobuf.BoolValue isPinned = 3;
+  OpenIMServer.protobuf.StringValue remark = 4;
+  OpenIMServer.protobuf.StringValue ex = 5;
 }
-message pinFriendsResp{
+message updateFriendsResp{
 
 }
 
@@ -211,7 +214,7 @@ service friend{
   //对好友申请响应（同意或拒绝）
   rpc respondFriendApply(respondFriendApplyReq) returns(respondFriendApplyResp);
   //星标好友
-  rpc pinFriends(pinFriendsReq) returns(pinFriendsResp);
+  rpc updateFriends(updateFriendsReq) returns(updateFriendsResp);
   //设置好友备注
   rpc setFriendRemark(setFriendRemarkReq) returns(setFriendRemarkResp);
   //导入好友关系

diff --git a/group/group.pb.go b/group/group.pb.go
diff --git a/group/group.proto b/group/group.proto
@@ -80,6 +80,7 @@ message JoinGroupReq{
   string reqMessage = 2;
   int32 joinSource = 3;
   string inviterUserID = 4;
+  string ex = 5;
 }
 message JoinGroupResp{
 }