msb-public
/
Open-IM-Server
mirror of https://github.com/OpenIMSDK/Open-IM-Server
2
0
Code Issues Projects Releases Wiki Activity

Error code standardization

Browse Source
test-errcode
skiffer-git 2 years ago
parent 026649f875
commit 6aa4974e29
6 changed files with 215 additions and 183 deletions
Show Stats Download Patch File Download Diff File

70
internal/rpc/friend/black.go
Unescape View File

@ -0,0 +1,70 @@
package friend
import (
"Open_IM/internal/common/check"
"Open_IM/internal/common/convert"
chat "Open_IM/internal/rpc/msg"
"Open_IM/pkg/common/db/relation"
"Open_IM/pkg/common/token_verify"
pbFriend "Open_IM/pkg/proto/friend"
"context"
)
func (s *friendServer) GetBlacks(ctx context.Context, req *pbFriend.GetBlacksReq) (*pbFriend.GetBlacksResp, error) {
resp := &pbFriend.GetBlacksResp{}
if err := check.Access(ctx, req.UserID); err != nil {
return nil, err
}
blacks, err := s.BlackInterface.FindOwnerBlacks(ctx, req.UserID, req.Pagination.PageNumber, req.Pagination.ShowNumber)
if err != nil {
return nil, err
}
blackIDList := make([]string, 0, len(blacks))
for _, black := range blacks {
b, err := convert.NewDBBlack(black).Convert()
if err != nil {
return nil, err
}
resp.BlackUsersInfo = append(resp.BlackUsersInfo, b)
blackIDList = append(blackIDList, black.BlockUserID)
}
return resp, nil
}
func (s *friendServer) IsBlack(ctx context.Context, req *pbFriend.IsBlackReq) (*pbFriend.IsBlackResp, error) {
resp := &pbFriend.IsBlackResp{}
in1, in2, err := s.BlackInterface.CheckIn(ctx, req.UserID1, req.UserID2)
if err != nil {
return nil, err
}
resp.InUser1Blacks = in1
resp.InUser2Blacks = in2
return resp, nil
}
func (s *friendServer) RemoveBlack(ctx context.Context, req *pbFriend.RemoveBlackReq) (*pbFriend.RemoveBlackResp, error) {
resp := &pbFriend.RemoveBlackResp{}
//Parse token, to find current user information
if err := check.Access(ctx, req.OwnerUserID); err != nil {
return nil, err
}
if err := s.BlackInterface.Delete(ctx, []*relation.Black{{OwnerUserID: req.OwnerUserID, BlockUserID: req.BlackUserID}}); err != nil {
return nil, err
}
chat.BlackDeletedNotification(req)
return resp, nil
}
func (s *friendServer) AddBlack(ctx context.Context, req *pbFriend.AddBlackReq) (*pbFriend.AddBlackResp, error) {
resp := &pbFriend.AddBlackResp{}
if err := token_verify.CheckAccessV3(ctx, req.OwnerUserID); err != nil {
return nil, err
}
black := relation.Black{OwnerUserID: req.OwnerUserID, BlockUserID: req.BlackUserID, OperatorUserID: tracelog.OpUserID(ctx)}
if err := s.BlackInterface.Create(ctx, []*relation.Black{&black}); err != nil {
return nil, err
}
chat.BlackAddedNotification(req)
return resp, nil
}

70
internal/rpc/friend/friend.go
Unescape View File

@ -5,8 +5,6 @@ import (
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/db/controller"
"Open_IM/pkg/common/tracelog"
"Open_IM/pkg/common/db/relation"
"Open_IM/pkg/common/log"
"Open_IM/pkg/common/middleware"
@ -115,19 +113,6 @@ func (s *friendServer) Run() {
}
}
func (s *friendServer) AddBlack(ctx context.Context, req *pbFriend.AddBlackReq) (*pbFriend.AddBlackResp, error) {
resp := &pbFriend.AddBlackResp{}
if err := token_verify.CheckAccessV3(ctx, req.OwnerUserID); err != nil {
return nil, err
}
black := relation.Black{OwnerUserID: req.OwnerUserID, BlockUserID: req.BlackUserID, OperatorUserID: tracelog.OpUserID(ctx)}
if err := s.BlackInterface.Create(ctx, []*relation.Black{&black}); err != nil {
return nil, err
}
chat.BlackAddedNotification(req)
return resp, nil
}
func (s *friendServer) AddFriend(ctx context.Context, req *pbFriend.AddFriendReq) (*pbFriend.AddFriendResp, error) {
resp := &pbFriend.AddFriendResp{}
if err := token_verify.CheckAccessV3(ctx, req.FromUserID); err != nil {
@ -228,19 +213,6 @@ func (s *friendServer) SetFriendRemark(ctx context.Context, req *pbFriend.SetFri
return resp, nil
}
func (s *friendServer) RemoveBlack(ctx context.Context, req *pbFriend.RemoveBlackReq) (*pbFriend.RemoveBlackResp, error) {
resp := &pbFriend.RemoveBlackResp{}
//Parse token, to find current user information
if err := check.Access(ctx, req.OwnerUserID); err != nil {
return nil, err
}
if err := s.BlackInterface.Delete(ctx, []*relation.Black{{OwnerUserID: req.OwnerUserID, BlockUserID: req.BlackUserID}}); err != nil {
return nil, err
}
chat.BlackDeletedNotification(req)
return resp, nil
}
func (s *friendServer) GetFriends(ctx context.Context, req *pbFriend.GetFriendsReq) (*pbFriend.GetFriendsResp, error) {
resp := &pbFriend.GetFriendsResp{}
if err := check.Access(ctx, req.UserID); err != nil {
@ -342,48 +314,14 @@ func (s *friendServer) GetSelfApplyList(ctx context.Context, req *pbFriend.GetSe
return resp, nil
}
func (s *friendServer) GetBlacklist(ctx context.Context, req *pbFriend.GetBlacklistReq) (*pbFriend.GetBlacklistResp, error) {
resp := &pbFriend.GetBlacklistResp{}
if err := token_verify.CheckAccessV3(ctx, req.FromUserID); err != nil {
return nil, err
}
blacks, err := s.BlackInterface.FindByOwnerUserID(ctx, req.FromUserID)
if err != nil {
return nil, err
}
blackIDList := make([]string, 0, len(blacks))
for _, black := range blacks {
blackIDList = append(blackIDList, black.BlockUserID)
}
resp.BlackUserInfoList, err = GetPublicUserInfoBatch(ctx, blackIDList)
if err != nil {
return nil, err
}
return resp, nil
}
func (s *friendServer) IsInBlackList(ctx context.Context, req *pbFriend.IsInBlackListReq) (*pbFriend.IsInBlackListResp, error) {
resp := &pbFriend.IsInBlackListResp{}
if err := token_verify.CheckAccessV3(ctx, req.FromUserID); err != nil {
return nil, err
}
exist, err := s.BlackInterface.IsExist(ctx, req.FromUserID, req.ToUserID)
if err != nil {
return nil, err
}
resp.Response = exist
return resp, nil
}
func (s *friendServer) IsFriend(ctx context.Context, req *pbFriend.IsFriendReq) (*pbFriend.IsFriendResp, error) {
resp := &pbFriend.IsFriendResp{}
if err := token_verify.CheckAccessV3(ctx, req.FromUserID); err != nil {
return nil, err
}
exist, err := s.FriendInterface.IsExist(ctx, req.FromUserID, req.ToUserID)
err, in1, in2 := s.FriendInterface.CheckIn(ctx, req.UserID1, req.UserID2)
if err != nil {
return nil, err
}
resp.Response = exist
resp.InUser1Friends = in1
resp.InUser2Friends = in2
return resp, nil
}

5
pkg/common/db/controller/black.go
Unescape View File

@ -13,7 +13,10 @@ type BlackInterface interface {
Update(ctx context.Context, blacks []*relation.Black) (err error)
Find(ctx context.Context, blacks []*relation.Black) (blackList []*relation.Black, err error)
Take(ctx context.Context, ownerUserID, blockUserID string) (black *relation.Black, err error)
FindByOwnerUserID(ctx context.Context, ownerUserID string) (blackList []*relation.Black, err error)
FindOwnerBlacks(ctx context.Context, ownerUserID string, pageNumber, showNumber int32) (blackList []*relation.Black, err error)
// CheckIn 检查user2是否在user1的黑名单列表中(inUser1Blacks==true) 检查user1是否在user2的黑名单列表中(inUser2Blacks==true)
CheckIn(ctx context.Context, ownerUserID, blackUserID string) (inUser1Blacks bool, inUser2Blacks bool, err error)
}
type BlackController struct {

4
pkg/common/db/controller/friend.go
Unescape View File

@ -7,8 +7,8 @@ import (
)
type FriendInterface interface {
// CheckIn 检查fromUserID是否在toUserID的好友列表中(inTo==true) 检查toUserID是否在fromUserID的好友列表中(inFrom==true)
CheckIn(ctx context.Context, fromUserID, toUserID string) (err error, inTo bool, inFrom bool)
// CheckIn 检查user2是否在user1的好友列表中(inUser1Friends==true) 检查user1是否在user2的好友列表中(inUser2Friends==true)
CheckIn(ctx context.Context, user1, user2 string) (err error, inUser1Friends bool, inUser2Friends bool)
// AddFriendRequest 增加或者更新好友申请
AddFriendRequest(ctx context.Context, fromUserID, toUserID string, reqMsg string, ex string) (err error)
// 先判断是否在好友表，如果在则不插入

233
pkg/proto/friend/friend.pb.go
Unescape View File

@ -36,7 +36,7 @@ func (m *GetFriendsInfoReq) Reset() { *m = GetFriendsInfoReq{} }
func (m *GetFriendsInfoReq) String() string { return proto.CompactTextString(m) }
func (*GetFriendsInfoReq) ProtoMessage() {}
func (*GetFriendsInfoReq) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{0}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{0}
}
func (m *GetFriendsInfoReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GetFriendsInfoReq.Unmarshal(m, b)
@ -81,7 +81,7 @@ func (m *GetFriendsInfoResp) Reset() { *m = GetFriendsInfoResp{} }
func (m *GetFriendsInfoResp) String() string { return proto.CompactTextString(m) }
func (*GetFriendsInfoResp) ProtoMessage() {}
func (*GetFriendsInfoResp) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{1}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{1}
}
func (m *GetFriendsInfoResp) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GetFriendsInfoResp.Unmarshal(m, b)
@ -122,7 +122,7 @@ func (m *AddFriendReq) Reset() { *m = AddFriendReq{} }
func (m *AddFriendReq) String() string { return proto.CompactTextString(m) }
func (*AddFriendReq) ProtoMessage() {}
func (*AddFriendReq) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{2}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{2}
}
func (m *AddFriendReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_AddFriendReq.Unmarshal(m, b)
@ -180,7 +180,7 @@ func (m *AddFriendResp) Reset() { *m = AddFriendResp{} }
func (m *AddFriendResp) String() string { return proto.CompactTextString(m) }
func (*AddFriendResp) ProtoMessage() {}
func (*AddFriendResp) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{3}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{3}
}
func (m *AddFriendResp) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_AddFriendResp.Unmarshal(m, b)
@ -212,7 +212,7 @@ func (m *ImportFriendReq) Reset() { *m = ImportFriendReq{} }
func (m *ImportFriendReq) String() string { return proto.CompactTextString(m) }
func (*ImportFriendReq) ProtoMessage() {}
func (*ImportFriendReq) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{4}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{4}
}
func (m *ImportFriendReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ImportFriendReq.Unmarshal(m, b)
@ -256,7 +256,7 @@ func (m *ImportFriendResp) Reset() { *m = ImportFriendResp{} }
func (m *ImportFriendResp) String() string { return proto.CompactTextString(m) }
func (*ImportFriendResp) ProtoMessage() {}
func (*ImportFriendResp) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{5}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{5}
}
func (m *ImportFriendResp) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ImportFriendResp.Unmarshal(m, b)
@ -288,7 +288,7 @@ func (m *GetToFriendsApplyReq) Reset() { *m = GetToFriendsApplyReq{} }
func (m *GetToFriendsApplyReq) String() string { return proto.CompactTextString(m) }
func (*GetToFriendsApplyReq) ProtoMessage() {}
func (*GetToFriendsApplyReq) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{6}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{6}
}
func (m *GetToFriendsApplyReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GetToFriendsApplyReq.Unmarshal(m, b)
@ -334,7 +334,7 @@ func (m *GetToFriendsApplyResp) Reset() { *m = GetToFriendsApplyResp{} }
func (m *GetToFriendsApplyResp) String() string { return proto.CompactTextString(m) }
func (*GetToFriendsApplyResp) ProtoMessage() {}
func (*GetToFriendsApplyResp) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{7}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{7}
}
func (m *GetToFriendsApplyResp) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GetToFriendsApplyResp.Unmarshal(m, b)
@ -380,7 +380,7 @@ func (m *GetFriendsReq) Reset() { *m = GetFriendsReq{} }
func (m *GetFriendsReq) String() string { return proto.CompactTextString(m) }
func (*GetFriendsReq) ProtoMessage() {}
func (*GetFriendsReq) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{8}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{8}
}
func (m *GetFriendsReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GetFriendsReq.Unmarshal(m, b)
@ -426,7 +426,7 @@ func (m *GetFriendsResp) Reset() { *m = GetFriendsResp{} }
func (m *GetFriendsResp) String() string { return proto.CompactTextString(m) }
func (*GetFriendsResp) ProtoMessage() {}
func (*GetFriendsResp) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{9}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{9}
}
func (m *GetFriendsResp) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GetFriendsResp.Unmarshal(m, b)
@ -472,7 +472,7 @@ func (m *AddBlackReq) Reset() { *m = AddBlackReq{} }
func (m *AddBlackReq) String() string { return proto.CompactTextString(m) }
func (*AddBlackReq) ProtoMessage() {}
func (*AddBlackReq) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{10}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{10}
}
func (m *AddBlackReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_AddBlackReq.Unmarshal(m, b)
@ -516,7 +516,7 @@ func (m *AddBlackResp) Reset() { *m = AddBlackResp{} }
func (m *AddBlackResp) String() string { return proto.CompactTextString(m) }
func (*AddBlackResp) ProtoMessage() {}
func (*AddBlackResp) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{11}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{11}
}
func (m *AddBlackResp) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_AddBlackResp.Unmarshal(m, b)
@ -548,7 +548,7 @@ func (m *RemoveBlackReq) Reset() { *m = RemoveBlackReq{} }
func (m *RemoveBlackReq) String() string { return proto.CompactTextString(m) }
func (*RemoveBlackReq) ProtoMessage() {}
func (*RemoveBlackReq) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{12}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{12}
}
func (m *RemoveBlackReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_RemoveBlackReq.Unmarshal(m, b)
@ -592,7 +592,7 @@ func (m *RemoveBlackResp) Reset() { *m = RemoveBlackResp{} }
func (m *RemoveBlackResp) String() string { return proto.CompactTextString(m) }
func (*RemoveBlackResp) ProtoMessage() {}
func (*RemoveBlackResp) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{13}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{13}
}
func (m *RemoveBlackResp) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_RemoveBlackResp.Unmarshal(m, b)
@ -624,7 +624,7 @@ func (m *GetBlacksReq) Reset() { *m = GetBlacksReq{} }
func (m *GetBlacksReq) String() string { return proto.CompactTextString(m) }
func (*GetBlacksReq) ProtoMessage() {}
func (*GetBlacksReq) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{14}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{14}
}
func (m *GetBlacksReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GetBlacksReq.Unmarshal(m, b)
@ -670,7 +670,7 @@ func (m *GetBlacksResp) Reset() { *m = GetBlacksResp{} }
func (m *GetBlacksResp) String() string { return proto.CompactTextString(m) }
func (*GetBlacksResp) ProtoMessage() {}
func (*GetBlacksResp) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{15}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{15}
}
func (m *GetBlacksResp) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GetBlacksResp.Unmarshal(m, b)
@ -705,8 +705,8 @@ func (m *GetBlacksResp) GetTotal() int32 {
}
type IsFriendReq struct {
OwnerUserID string `protobuf:"bytes,1,opt,name=ownerUserID" json:"ownerUserID,omitempty"`
FriendUserID string `protobuf:"bytes,2,opt,name=friendUserID" json:"friendUserID,omitempty"`
UserID1 string `protobuf:"bytes,1,opt,name=userID1" json:"userID1,omitempty"`
UserID2 string `protobuf:"bytes,2,opt,name=userID2" json:"userID2,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@ -716,7 +716,7 @@ func (m *IsFriendReq) Reset() { *m = IsFriendReq{} }
func (m *IsFriendReq) String() string { return proto.CompactTextString(m) }
func (*IsFriendReq) ProtoMessage() {}
func (*IsFriendReq) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{16}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{16}
}
func (m *IsFriendReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_IsFriendReq.Unmarshal(m, b)
@ -736,22 +736,23 @@ func (m *IsFriendReq) XXX_DiscardUnknown() {
var xxx_messageInfo_IsFriendReq proto.InternalMessageInfo
func (m *IsFriendReq) GetOwnerUserID() string {
func (m *IsFriendReq) GetUserID1() string {
if m != nil {
return m.OwnerUserID
return m.UserID1
}
return ""
}
func (m *IsFriendReq) GetFriendUserID() string {
func (m *IsFriendReq) GetUserID2() string {
if m != nil {
return m.FriendUserID
return m.UserID2
}
return ""
}
type IsFriendResp struct {
Response bool `protobuf:"varint,1,opt,name=response" json:"response,omitempty"`
InUser1Friends bool `protobuf:"varint,1,opt,name=inUser1Friends" json:"inUser1Friends,omitempty"`
InUser2Friends bool `protobuf:"varint,2,opt,name=inUser2Friends" json:"inUser2Friends,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@ -761,7 +762,7 @@ func (m *IsFriendResp) Reset() { *m = IsFriendResp{} }
func (m *IsFriendResp) String() string { return proto.CompactTextString(m) }
func (*IsFriendResp) ProtoMessage() {}
func (*IsFriendResp) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{17}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{17}
}
func (m *IsFriendResp) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_IsFriendResp.Unmarshal(m, b)
@ -781,16 +782,23 @@ func (m *IsFriendResp) XXX_DiscardUnknown() {
var xxx_messageInfo_IsFriendResp proto.InternalMessageInfo
func (m *IsFriendResp) GetResponse() bool {
func (m *IsFriendResp) GetInUser1Friends() bool {
if m != nil {
return m.InUser1Friends
}
return false
}
func (m *IsFriendResp) GetInUser2Friends() bool {
if m != nil {
return m.Response
return m.InUser2Friends
}
return false
}
type IsBlackReq struct {
OwnerUserID string `protobuf:"bytes,1,opt,name=ownerUserID" json:"ownerUserID,omitempty"`
BlackUserID string `protobuf:"bytes,2,opt,name=blackUserID" json:"blackUserID,omitempty"`
UserID1 string `protobuf:"bytes,1,opt,name=userID1" json:"userID1,omitempty"`
UserID2 string `protobuf:"bytes,2,opt,name=userID2" json:"userID2,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@ -800,7 +808,7 @@ func (m *IsBlackReq) Reset() { *m = IsBlackReq{} }
func (m *IsBlackReq) String() string { return proto.CompactTextString(m) }
func (*IsBlackReq) ProtoMessage() {}
func (*IsBlackReq) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{18}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{18}
}
func (m *IsBlackReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_IsBlackReq.Unmarshal(m, b)
@ -820,22 +828,23 @@ func (m *IsBlackReq) XXX_DiscardUnknown() {
var xxx_messageInfo_IsBlackReq proto.InternalMessageInfo
func (m *IsBlackReq) GetOwnerUserID() string {
func (m *IsBlackReq) GetUserID1() string {
if m != nil {
return m.OwnerUserID
return m.UserID1
}
return ""
}
func (m *IsBlackReq) GetBlackUserID() string {
func (m *IsBlackReq) GetUserID2() string {
if m != nil {
return m.BlackUserID
return m.UserID2
}
return ""
}
type IsBlackResp struct {
Response bool `protobuf:"varint,1,opt,name=response" json:"response,omitempty"`
InUser1Blacks bool `protobuf:"varint,1,opt,name=inUser1Blacks" json:"inUser1Blacks,omitempty"`
InUser2Blacks bool `protobuf:"varint,2,opt,name=inUser2Blacks" json:"inUser2Blacks,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@ -845,7 +854,7 @@ func (m *IsBlackResp) Reset() { *m = IsBlackResp{} }
func (m *IsBlackResp) String() string { return proto.CompactTextString(m) }
func (*IsBlackResp) ProtoMessage() {}
func (*IsBlackResp) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{19}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{19}
}
func (m *IsBlackResp) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_IsBlackResp.Unmarshal(m, b)
@ -865,9 +874,16 @@ func (m *IsBlackResp) XXX_DiscardUnknown() {
var xxx_messageInfo_IsBlackResp proto.InternalMessageInfo
func (m *IsBlackResp) GetResponse() bool {
func (m *IsBlackResp) GetInUser1Blacks() bool {
if m != nil {
return m.InUser1Blacks
}
return false
}
func (m *IsBlackResp) GetInUser2Blacks() bool {
if m != nil {
return m.Response
return m.InUser2Blacks
}
return false
}
@ -884,7 +900,7 @@ func (m *DeleteFriendReq) Reset() { *m = DeleteFriendReq{} }
func (m *DeleteFriendReq) String() string { return proto.CompactTextString(m) }
func (*DeleteFriendReq) ProtoMessage() {}
func (*DeleteFriendReq) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{20}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{20}
}
func (m *DeleteFriendReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_DeleteFriendReq.Unmarshal(m, b)
@ -928,7 +944,7 @@ func (m *DeleteFriendResp) Reset() { *m = DeleteFriendResp{} }
func (m *DeleteFriendResp) String() string { return proto.CompactTextString(m) }
func (*DeleteFriendResp) ProtoMessage() {}
func (*DeleteFriendResp) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{21}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{21}
}
func (m *DeleteFriendResp) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_DeleteFriendResp.Unmarshal(m, b)
@ -963,7 +979,7 @@ func (m *RespondFriendApplyReq) Reset() { *m = RespondFriendApplyReq{} }
func (m *RespondFriendApplyReq) String() string { return proto.CompactTextString(m) }
func (*RespondFriendApplyReq) ProtoMessage() {}
func (*RespondFriendApplyReq) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{22}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{22}
}
func (m *RespondFriendApplyReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_RespondFriendApplyReq.Unmarshal(m, b)
@ -1021,7 +1037,7 @@ func (m *RespondFriendApplyResp) Reset() { *m = RespondFriendApplyResp{}
func (m *RespondFriendApplyResp) String() string { return proto.CompactTextString(m) }
func (*RespondFriendApplyResp) ProtoMessage() {}
func (*RespondFriendApplyResp) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{23}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{23}
}
func (m *RespondFriendApplyResp) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_RespondFriendApplyResp.Unmarshal(m, b)
@ -1054,7 +1070,7 @@ func (m *SetFriendRemarkReq) Reset() { *m = SetFriendRemarkReq{} }
func (m *SetFriendRemarkReq) String() string { return proto.CompactTextString(m) }
func (*SetFriendRemarkReq) ProtoMessage() {}
func (*SetFriendRemarkReq) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{24}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{24}
}
func (m *SetFriendRemarkReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_SetFriendRemarkReq.Unmarshal(m, b)
@ -1105,7 +1121,7 @@ func (m *SetFriendRemarkResp) Reset() { *m = SetFriendRemarkResp{} }
func (m *SetFriendRemarkResp) String() string { return proto.CompactTextString(m) }
func (*SetFriendRemarkResp) ProtoMessage() {}
func (*SetFriendRemarkResp) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{25}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{25}
}
func (m *SetFriendRemarkResp) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_SetFriendRemarkResp.Unmarshal(m, b)
@ -1137,7 +1153,7 @@ func (m *GetFromFriendsApplyReq) Reset() { *m = GetFromFriendsApplyReq{}
func (m *GetFromFriendsApplyReq) String() string { return proto.CompactTextString(m) }
func (*GetFromFriendsApplyReq) ProtoMessage() {}
func (*GetFromFriendsApplyReq) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{26}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{26}
}
func (m *GetFromFriendsApplyReq) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GetFromFriendsApplyReq.Unmarshal(m, b)
@ -1183,7 +1199,7 @@ func (m *GetFromFriendsApplyResp) Reset() { *m = GetFromFriendsApplyResp
func (m *GetFromFriendsApplyResp) String() string { return proto.CompactTextString(m) }
func (*GetFromFriendsApplyResp) ProtoMessage() {}
func (*GetFromFriendsApplyResp) Descriptor() ([]byte, []int) {
return fileDescriptor_friend_a69e7413271cca0f, []int{27}
return fileDescriptor_friend_1cbbba1bcb7ea397, []int{27}
}
func (m *GetFromFriendsApplyResp) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_GetFromFriendsApplyResp.Unmarshal(m, b)
@ -1777,65 +1793,68 @@ var _Friend_serviceDesc = grpc.ServiceDesc{
Metadata: "friend/friend.proto",
}
func init() { proto.RegisterFile("friend/friend.proto", fileDescriptor_friend_a69e7413271cca0f) }
var fileDescriptor_friend_a69e7413271cca0f = []byte{
// 912 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xe1, 0x6e, 0xdb, 0x46,
0x0c, 0x86, 0x9d, 0x25, 0x4d, 0x28, 0xc7, 0x6e, 0xe9, 0xd8, 0xf5, 0xb4, 0x26, 0x75, 0x0f, 0xfd,
0x91, 0x0d, 0x68, 0x0c, 0x64, 0x18, 0x30, 0xa0, 0xc0, 0x86, 0x06, 0x45, 0x37, 0x0f, 0x08, 0x96,
0x29, 0xed, 0x86, 0x6d, 0x3f, 0x02, 0xa5, 0x3a, 0x7b, 0x42, 0x64, 0x89, 0x11, 0x95, 0xb8, 0x7d,
0x90, 0xbd, 0xca, 0x9e, 0x6f, 0xd0, 0x9d, 0x2c, 0x9d, 0x6c, 0xd9, 0x68, 0x33, 0xaf, 0xbf, 0x04,
0x92, 0x47, 0xf2, 0xc8, 0xe3, 0x7d, 0xdf, 0x09, 0xda, 0xa3, 0xd8, 0x97, 0xa1, 0x37, 0xd0, 0x9f,
0x23, 0x8a, 0xa3, 0x24, 0xc2, 0x2d, 0x2d, 0xd9, 0x87, 0x3f, 0x93, 0x0c, 0x9f, 0x0d, 0x4f, 0x9f,
0x9d, 0xcb, 0xf8, 0x56, 0xc6, 0x03, 0xba, 0x1a, 0x0f, 0xd4, 0x8a, 0x01, 0x7b, 0x57, 0x17, 0x53,
0x1e, 0x4c, 0x59, 0x7b, 0x88, 0x3f, 0xe1, 0xc1, 0x58, 0x26, 0xaf, 0x94, 0x1b, 0x0f, 0xc3, 0x51,
0xe4, 0xc8, 0x6b, 0xec, 0x83, 0x15, 0x4d, 0x43, 0x19, 0xbf, 0x61, 0x19, 0x0f, 0x5f, 0xf6, 0x6a,
0xfd, 0xda, 0xe1, 0x8e, 0x63, 0xaa, 0xf0, 0x29, 0xec, 0xea, 0x54, 0x5a, 0xe6, 0x5e, 0xbd, 0xbf,
0x71, 0xb8, 0xe3, 0x94, 0x95, 0xe2, 0x0d, 0xe0, 0x7c, 0x70, 0x26, 0xfc, 0x1e, 0xac, 0x51, 0xa1,
0xea, 0xd5, 0xfa, 0x1b, 0x87, 0xd6, 0xf1, 0xfe, 0x11, 0xab, 0xad, 0x5e, 0xb8, 0xe4, 0x5f, 0x90,
0x1b, 0xbb, 0x13, 0x3e, 0xd2, 0x8e, 0xca, 0xcf, 0xf4, 0x10, 0x31, 0x34, 0x5c, 0xcf, 0xd3, 0xd6,
0x74, 0xbb, 0x07, 0x00, 0xa3, 0x38, 0x9a, 0x94, 0x76, 0x6b, 0x68, 0xd0, 0x86, 0xed, 0x24, 0xca,
0xac, 0x75, 0x65, 0xcd, 0x65, 0xec, 0xc2, 0x56, 0x2c, 0xaf, 0x4f, 0x79, 0xdc, 0xdb, 0x50, 0x96,
0x4c, 0xc2, 0x26, 0xd4, 0xe5, 0xbb, 0xde, 0x67, 0x4a, 0x57, 0x97, 0xef, 0x44, 0x0b, 0x76, 0x8d,
0x9c, 0x4c, 0xe2, 0x77, 0x68, 0xf9, 0x13, 0x8a, 0xe2, 0xa4, 0xd8, 0xc7, 0xba, 0xda, 0x86, 0x70,
0xbf, 0x1c, 0x9a, 0x49, 0x24, 0xb0, 0x37, 0x96, 0xc9, 0xeb, 0x28, 0x6b, 0xe6, 0x0b, 0xa2, 0xe0,
0x7d, 0x9a, 0xb3, 0x0b, 0x5b, 0x37, 0x66, 0xba, 0x4c, 0xc2, 0x97, 0x00, 0xe4, 0x8e, 0xfd, 0xd0,
0x4d, 0xfc, 0x28, 0x54, 0x55, 0x5b, 0xc7, 0x4f, 0x2b, 0x7a, 0xec, 0xc8, 0xeb, 0x1b, 0xc9, 0xc9,
0x59, 0xbe, 0xd6, 0x31, 0xfc, 0xc4, 0x14, 0x3a, 0x15, 0x59, 0x99, 0xf0, 0x47, 0x68, 0xe6, 0x75,
0xa7, 0xfe, 0x9c, 0x1d, 0x63, 0x7f, 0xe9, 0x31, 0x66, 0x0b, 0x9d, 0x39, 0x3f, 0xdc, 0x83, 0xcd,
0x24, 0x4a, 0xdc, 0x40, 0xed, 0x71, 0xd3, 0xd1, 0x82, 0x98, 0xc0, 0x6e, 0x31, 0x39, 0x69, 0x9d,
0xe5, 0x7a, 0x6a, 0x77, 0xab, 0xc7, 0xe8, 0x56, 0xdd, 0xec, 0x96, 0x18, 0x43, 0xd3, 0x4c, 0xa7,
0x87, 0xf4, 0xd5, 0x47, 0x0f, 0xa9, 0xe1, 0xb1, 0xa4, 0xae, 0x5f, 0xc0, 0x72, 0x3d, 0xef, 0x24,
0x70, 0xdf, 0x5e, 0x7d, 0xd8, 0xc4, 0xf4, 0xc1, 0xba, 0x4c, 0x57, 0x97, 0xc6, 0xd7, 0x54, 0x89,
0xa6, 0xba, 0x0d, 0x59, 0x48, 0x26, 0xf1, 0x1a, 0x9a, 0xb1, 0x9c, 0x44, 0xb7, 0x72, 0xad, 0x59,
0x1e, 0x40, 0xab, 0x14, 0x95, 0x49, 0x04, 0xd0, 0x18, 0xcb, 0x44, 0xc9, 0xfc, 0xff, 0x8f, 0x22,
0xa9, 0x89, 0x98, 0x65, 0x63, 0xc2, 0x21, 0x34, 0xf3, 0x0d, 0x9a, 0x87, 0xf4, 0xa4, 0x22, 0xf4,
0xd9, 0xcd, 0x65, 0xe0, 0xbf, 0x55, 0xa5, 0xa4, 0x07, 0x35, 0xe7, 0xb8, 0xe4, 0xac, 0xce, 0xc1,
0xf2, 0xf9, 0x63, 0x6e, 0xb7, 0x80, 0x86, 0x79, 0x91, 0xb3, 0x36, 0x96, 0x74, 0xe2, 0x2b, 0x68,
0x14, 0x41, 0x99, 0x52, 0x6c, 0x8a, 0x25, 0x53, 0x14, 0xb2, 0x54, 0x21, 0xb7, 0x9d, 0x5c, 0x16,
0x67, 0x00, 0x3e, 0xaf, 0xf5, 0x14, 0xbf, 0x4c, 0x4b, 0xca, 0x4f, 0x70, 0x65, 0xf2, 0xdf, 0xa0,
0xe5, 0xc9, 0x40, 0x26, 0x72, 0xdd, 0x1d, 0x40, 0xb8, 0x5f, 0x0e, 0xcc, 0x24, 0xfe, 0xae, 0x41,
0x47, 0x67, 0xce, 0x20, 0x36, 0xc7, 0xb7, 0xff, 0x82, 0xed, 0x02, 0x1a, 0x7f, 0xb9, 0xa1, 0x17,
0x48, 0x47, 0xf2, 0x4d, 0x90, 0x28, 0x84, 0xdf, 0x74, 0x4a, 0x3a, 0x7c, 0x04, 0x3b, 0x5a, 0x4e,
0x29, 0x40, 0xc3, 0x7d, 0xa1, 0x10, 0x3d, 0xe8, 0x56, 0x6d, 0x8b, 0x49, 0xc4, 0x80, 0x2c, 0x73,
0x80, 0x9e, 0xb8, 0xf1, 0xd5, 0xda, 0x3a, 0xa4, 0x39, 0x29, 0x0d, 0x59, 0x70, 0x52, 0x2a, 0x89,
0x0e, 0xb4, 0x17, 0x72, 0x32, 0x89, 0x5b, 0xe8, 0x2a, 0xf0, 0x8a, 0x26, 0x9f, 0x96, 0x1c, 0xde,
0xc3, 0xc3, 0xca, 0xbc, 0x9a, 0x1e, 0x46, 0x77, 0xa4, 0x87, 0xd1, 0x07, 0xd0, 0xc3, 0xf1, 0x3f,
0xf7, 0x20, 0x7b, 0xea, 0xe0, 0xb7, 0xb0, 0x93, 0x13, 0x33, 0xee, 0x1d, 0x65, 0xcf, 0x21, 0xf3,
0x7d, 0x60, 0x77, 0x2a, 0xb4, 0x4c, 0x78, 0xa6, 0x9e, 0x3e, 0x65, 0x72, 0xc3, 0x47, 0xb3, 0xb5,
0x55, 0x6c, 0x6b, 0xef, 0xaf, 0xb0, 0x32, 0xe1, 0xaf, 0xd0, 0xae, 0xe8, 0x08, 0x1e, 0x18, 0x5e,
0x15, 0xc7, 0x64, 0x3f, 0x5e, 0x69, 0x67, 0xc2, 0xe7, 0x00, 0x05, 0x3d, 0x61, 0xa7, 0xb4, 0x7c,
0xc6, 0x90, 0x76, 0xb7, 0x4a, 0xcd, 0x84, 0xdf, 0xc0, 0xf6, 0x8c, 0x1f, 0xb0, 0x6d, 0x74, 0x62,
0x06, 0x2c, 0xf6, 0xde, 0xa2, 0x92, 0x09, 0xbf, 0x03, 0xcb, 0x00, 0x7c, 0xcc, 0xa3, 0x97, 0xb9,
0xc5, 0x7e, 0x58, 0xa9, 0xd7, 0x69, 0x67, 0x40, 0x57, 0xa4, 0x35, 0xf0, 0xb4, 0x48, 0x5b, 0xc2,
0xc3, 0x63, 0xb8, 0x97, 0x21, 0x14, 0x62, 0xb1, 0x20, 0x4f, 0xd7, 0x5e, 0xd0, 0x31, 0xa5, 0x23,
0x90, 0x53, 0x43, 0x31, 0x02, 0x26, 0x37, 0xd9, 0x9d, 0x0a, 0x2d, 0x13, 0xbe, 0x80, 0x86, 0x89,
0x45, 0x98, 0x57, 0x33, 0x07, 0x7d, 0x76, 0xaf, 0xda, 0xc0, 0x84, 0xe7, 0x80, 0x8b, 0x10, 0x81,
0xfb, 0x45, 0x5b, 0x2a, 0x50, 0xcd, 0x3e, 0x58, 0x65, 0x66, 0xc2, 0x9f, 0xa0, 0x35, 0x77, 0xd3,
0xd1, 0x9e, 0xb9, 0x2c, 0xc2, 0x8e, 0xfd, 0xc5, 0x52, 0x1b, 0x13, 0x9e, 0xc0, 0xae, 0xf9, 0x9a,
0xe4, 0xa2, 0xc8, 0xb9, 0xf7, 0x6b, 0x51, 0xe4, 0xfc, 0xeb, 0x13, 0x7f, 0x30, 0xdf, 0x47, 0x8a,
0x32, 0x3f, 0x5f, 0x9c, 0xb6, 0xec, 0xef, 0xc1, 0xb6, 0x97, 0x99, 0x98, 0x4e, 0x9e, 0xfc, 0xf1,
0x38, 0xfd, 0x35, 0xb9, 0x18, 0x9e, 0x1a, 0xff, 0x24, 0x7a, 0xf9, 0x73, 0xfd, 0xb9, 0xdc, 0x52,
0xca, 0xaf, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xf3, 0x1f, 0x6f, 0xae, 0xe1, 0x0c, 0x00, 0x00,
func init() { proto.RegisterFile("friend/friend.proto", fileDescriptor_friend_1cbbba1bcb7ea397) }
var fileDescriptor_friend_1cbbba1bcb7ea397 = []byte{
// 958 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x6d, 0x6f, 0x1b, 0x45,
0x10, 0x96, 0x1d, 0xf2, 0x36, 0x76, 0x6c, 0x3a, 0x8e, 0x5d, 0x73, 0x34, 0xa9, 0xbb, 0xaa, 0x50,
0xbe, 0x34, 0x56, 0x8d, 0x90, 0x90, 0x2a, 0x01, 0x89, 0xaa, 0x82, 0x91, 0x22, 0xc2, 0xb5, 0x05,
0x15, 0x24, 0xa2, 0x4b, 0xbd, 0x36, 0xa7, 0x9c, 0xef, 0x36, 0x37, 0x97, 0xb8, 0xfd, 0x21, 0xfc,
0x15, 0x7e, 0x1f, 0xba, 0xdd, 0xbd, 0xdb, 0xbd, 0xf3, 0x39, 0x6a, 0x43, 0xe0, 0x93, 0x35, 0xcf,
0xcc, 0xec, 0xbc, 0xec, 0x78, 0x9e, 0x3d, 0xe8, 0x4c, 0x63, 0x9f, 0x87, 0x93, 0xa1, 0xfa, 0x39,
0x14, 0x71, 0x94, 0x44, 0xb8, 0xa1, 0x24, 0xe7, 0xe0, 0x27, 0xc1, 0xc3, 0x27, 0xe3, 0x93, 0x27,
0x2f, 0x79, 0x7c, 0xcd, 0xe3, 0xa1, 0xb8, 0x98, 0x0d, 0xa5, 0xc5, 0x90, 0x26, 0x17, 0x67, 0x0b,
0x1a, 0x2e, 0x48, 0x79, 0xb0, 0xdf, 0xe1, 0xde, 0x8c, 0x27, 0x2f, 0xa4, 0x1b, 0x8d, 0xc3, 0x69,
0xe4, 0xf2, 0x4b, 0x1c, 0x40, 0x23, 0x5a, 0x84, 0x3c, 0x7e, 0x4d, 0x3c, 0x1e, 0x3f, 0xef, 0xd7,
0x06, 0xb5, 0x83, 0x6d, 0xd7, 0x86, 0xf0, 0x31, 0xec, 0xa8, 0x50, 0x4a, 0xa6, 0x7e, 0x7d, 0xb0,
0x76, 0xb0, 0xed, 0x16, 0x41, 0xf6, 0x1a, 0xb0, 0x7c, 0x38, 0x09, 0xfc, 0x16, 0x1a, 0x53, 0x03,
0xf5, 0x6b, 0x83, 0xb5, 0x83, 0xc6, 0x68, 0xef, 0x90, 0x64, 0xaa, 0x67, 0x9e, 0xf0, 0xcf, 0x84,
0x17, 0x7b, 0x73, 0x3a, 0x54, 0x8e, 0xd2, 0xcf, 0xf6, 0x60, 0x31, 0x34, 0xbd, 0xc9, 0x44, 0x69,
0xd3, 0x74, 0xf7, 0x01, 0xa6, 0x71, 0x34, 0x2f, 0x64, 0x6b, 0x21, 0xe8, 0xc0, 0x56, 0x12, 0x69,
0x6d, 0x5d, 0x6a, 0x73, 0x19, 0x7b, 0xb0, 0x11, 0xf3, 0xcb, 0x13, 0x9a, 0xf5, 0xd7, 0xa4, 0x46,
0x4b, 0xd8, 0x82, 0x3a, 0x7f, 0xd7, 0xff, 0x44, 0x62, 0x75, 0xfe, 0x8e, 0xb5, 0x61, 0xc7, 0x8a,
0x49, 0x82, 0xbd, 0x81, 0xb6, 0x3f, 0x17, 0x51, 0x9c, 0x98, 0x3c, 0xee, 0xaa, 0x6d, 0x08, 0x9f,
0x16, 0x8f, 0x26, 0xc1, 0x12, 0xd8, 0x9d, 0xf1, 0xe4, 0x55, 0xa4, 0x9b, 0x79, 0x24, 0x44, 0xf0,
0x3e, 0x8d, 0xd9, 0x83, 0x8d, 0x2b, 0x3b, 0x9c, 0x96, 0xf0, 0x39, 0x80, 0xf0, 0x66, 0x7e, 0xe8,
0x25, 0x7e, 0x14, 0xca, 0xaa, 0x1b, 0xa3, 0xc7, 0x15, 0x3d, 0x76, 0xf9, 0xe5, 0x15, 0xa7, 0xe4,
0x34, 0xb7, 0x75, 0x2d, 0x3f, 0xb6, 0x80, 0x6e, 0x45, 0x54, 0x12, 0xf8, 0x03, 0xb4, 0xf2, 0xba,
0x53, 0x7f, 0xd2, 0xd7, 0x38, 0x58, 0x79, 0x8d, 0xda, 0xd0, 0x2d, 0xf9, 0xe1, 0x2e, 0xac, 0x27,
0x51, 0xe2, 0x05, 0x32, 0xc7, 0x75, 0x57, 0x09, 0x6c, 0x0e, 0x3b, 0x66, 0x72, 0xd2, 0x3a, 0x8b,
0xf5, 0xd4, 0x6e, 0x57, 0x8f, 0xd5, 0xad, 0xba, 0xdd, 0x2d, 0x36, 0x83, 0x96, 0x1d, 0x4e, 0x0d,
0xe9, 0x8b, 0x8f, 0x1e, 0x52, 0xcb, 0x63, 0x45, 0x5d, 0x3f, 0x43, 0xc3, 0x9b, 0x4c, 0x8e, 0x03,
0xef, 0xed, 0xc5, 0x87, 0x4d, 0xcc, 0x00, 0x1a, 0xe7, 0xa9, 0x75, 0x61, 0x7c, 0x6d, 0x88, 0xb5,
0xe4, 0xbf, 0x41, 0x1f, 0x49, 0x82, 0xbd, 0x82, 0x56, 0xcc, 0xe7, 0xd1, 0x35, 0xbf, 0xd3, 0x28,
0xf7, 0xa0, 0x5d, 0x38, 0x95, 0x04, 0x0b, 0xa0, 0x39, 0xe3, 0x89, 0x94, 0xe9, 0xbf, 0x1f, 0x45,
0x21, 0x27, 0x22, 0x8b, 0x46, 0x02, 0xc7, 0xd0, 0xca, 0x13, 0xb4, 0x2f, 0xe9, 0x51, 0xc5, 0xd1,
0xa7, 0x57, 0xe7, 0x81, 0xff, 0x56, 0x96, 0x92, 0x5e, 0x54, 0xc9, 0x71, 0xc5, 0x5d, 0x1d, 0x41,
0xc3, 0x27, 0xf3, 0xef, 0xee, 0xc3, 0xa6, 0x2a, 0xe8, 0xa9, 0xae, 0x2f, 0x13, 0x8d, 0x66, 0xa4,
0x3b, 0x97, 0x89, 0xec, 0x0f, 0x68, 0x9a, 0x23, 0x48, 0xe0, 0x17, 0xd0, 0xf2, 0xc3, 0x34, 0xee,
0x53, 0x3d, 0x2a, 0xf2, 0xa8, 0x2d, 0xb7, 0x84, 0x1a, 0xbb, 0x51, 0x66, 0x57, 0xb7, 0xed, 0x32,
0x94, 0x7d, 0x07, 0xe0, 0x53, 0x7e, 0xcf, 0xb7, 0xc9, 0xf0, 0x4d, 0x5a, 0x64, 0x7e, 0xa7, 0xe9,
0x82, 0xd2, 0xa9, 0xa8, 0x4e, 0xeb, 0xfc, 0x8a, 0xa0, 0xb1, 0x1a, 0x69, 0xab, 0xba, 0x6d, 0xa5,
0x41, 0xf6, 0x2b, 0xb4, 0x27, 0x3c, 0xe0, 0x09, 0xff, 0x98, 0x0d, 0xc9, 0xa0, 0x69, 0x2f, 0x43,
0x9d, 0x6e, 0x01, 0x4b, 0xf7, 0x63, 0xf1, 0x60, 0x12, 0xec, 0xaf, 0x1a, 0x74, 0x63, 0x4e, 0x22,
0x0a, 0xf5, 0x92, 0xce, 0x37, 0xe4, 0xbf, 0x61, 0x07, 0x06, 0xcd, 0x3f, 0xbd, 0x70, 0x12, 0x70,
0x97, 0xd3, 0x55, 0x90, 0x48, 0x8e, 0x58, 0x77, 0x0b, 0x18, 0x3e, 0x80, 0x6d, 0x25, 0xa7, 0x24,
0xa2, 0x08, 0xc3, 0x00, 0xac, 0x0f, 0xbd, 0xaa, 0xb4, 0x48, 0xb0, 0x18, 0x90, 0x78, 0xbe, 0xe2,
0xe7, 0x5e, 0x7c, 0x71, 0x67, 0x1d, 0x52, 0xac, 0x96, 0x1e, 0x69, 0x58, 0x2d, 0x95, 0x58, 0x17,
0x3a, 0x4b, 0x31, 0x49, 0xb0, 0x6b, 0xe8, 0xc9, 0xf5, 0x17, 0xcd, 0xff, 0x5f, 0x7a, 0x79, 0x0f,
0xf7, 0x2b, 0xe3, 0x2a, 0x82, 0x99, 0xde, 0x92, 0x60, 0xa6, 0x1f, 0x40, 0x30, 0xa3, 0xbf, 0x37,
0x41, 0x3f, 0x96, 0xf0, 0x6b, 0xd8, 0xce, 0xa9, 0x1d, 0x77, 0x0f, 0xf5, 0x83, 0xca, 0x7e, 0x61,
0x38, 0xdd, 0x0a, 0x94, 0x04, 0x9e, 0xca, 0xc7, 0x53, 0x91, 0x1e, 0xf1, 0x41, 0x66, 0x5b, 0xc5,
0xd7, 0xce, 0xde, 0x0d, 0x5a, 0x12, 0xf8, 0x0b, 0x74, 0x2a, 0x3a, 0x82, 0xfb, 0x96, 0x57, 0xc5,
0x35, 0x39, 0x0f, 0x6f, 0xd4, 0x93, 0xc0, 0x67, 0x00, 0x86, 0xe0, 0xb0, 0x5b, 0x30, 0xcf, 0x38,
0xd6, 0xe9, 0x55, 0xc1, 0x24, 0xf0, 0x2b, 0xd8, 0xca, 0x18, 0x06, 0x3b, 0x56, 0x27, 0xb2, 0xc5,
0xe3, 0xec, 0x2e, 0x83, 0x24, 0xf0, 0x1b, 0x68, 0x58, 0x94, 0x81, 0xf9, 0xe9, 0x45, 0x76, 0x72,
0xee, 0x57, 0xe2, 0x2a, 0x6c, 0xb6, 0x3c, 0x4d, 0x58, 0x6b, 0x23, 0x9b, 0xb0, 0x85, 0x1d, 0x3b,
0x82, 0x4d, 0xbd, 0xd1, 0x10, 0x8d, 0x41, 0x1e, 0xae, 0xb3, 0x84, 0x91, 0x48, 0x47, 0x20, 0x27,
0x17, 0x33, 0x02, 0x36, 0xbb, 0x39, 0xdd, 0x0a, 0x94, 0x04, 0x1e, 0x41, 0xd3, 0xde, 0x45, 0x98,
0x57, 0x53, 0x5a, 0x7d, 0x4e, 0xbf, 0x5a, 0x41, 0x02, 0x5f, 0x02, 0x2e, 0xaf, 0x08, 0xdc, 0x33,
0x6d, 0xa9, 0xd8, 0x6a, 0xce, 0xfe, 0x4d, 0x6a, 0x12, 0xf8, 0x23, 0xb4, 0x4b, 0xff, 0x74, 0x74,
0x32, 0x97, 0xe5, 0xb5, 0xe3, 0x7c, 0xbe, 0x52, 0x47, 0x02, 0x8f, 0x61, 0xc7, 0x7e, 0x8f, 0x92,
0x29, 0xb2, 0xf4, 0x02, 0x36, 0x45, 0x96, 0xdf, 0xaf, 0xf8, 0xbd, 0xfd, 0xc2, 0x92, 0xa4, 0xfb,
0xd9, 0xf2, 0xb4, 0xe9, 0xef, 0x0f, 0xc7, 0x59, 0xa5, 0x22, 0x71, 0xfc, 0xe8, 0xb7, 0x87, 0xe9,
0xc7, 0xcd, 0xd9, 0xf8, 0xc4, 0xfa, 0xaa, 0x51, 0xe6, 0xcf, 0xd4, 0xcf, 0xf9, 0x86, 0x04, 0xbf,
0xfc, 0x27, 0x00, 0x00, 0xff, 0xff, 0x5c, 0x71, 0xd7, 0x68, 0x23, 0x0d, 0x00, 0x00,
}

16
pkg/proto/friend/friend.proto
Unescape View File

@ -72,26 +72,28 @@ message getBlacksReq{
server_api_params.RequestPagination pagination = 2;
}
message getBlacksResp{
repeated server_api_params.PublicUserInfo blackUsersInfo= 1;
repeated server_api_params.BlackInfo blacks= 1;
int32 total = 2;
}
message isFriendReq{
string ownerUserID = 1;
string friendUserID = 2;
string userID1 = 1;
string userID2 = 2;
}
message isFriendResp{
bool response = 1;
bool inUser1Friends = 1; //如果userID2在userID1的好友列表中 true
bool inUser2Friends = 2; //如果userID1在userID2的好友列表中 true
}
message isBlackReq{
string ownerUserID = 1;
string blackUserID = 2;
string userID1 = 1;
string userID2 = 2;
}
message isBlackResp{
bool response = 1;
bool inUser1Blacks = 1; //如果userID2在userID1的黑名单列表中 true
bool inUser2Blacks = 2; //如果userID1在userID2的黑名单列表中 true
}

Write Preview
Loading…
Cancel
Save