加好友推送通知
This commit is contained in:
parent
59e83d1026
commit
5502e4c3b4
@ -445,7 +445,6 @@ const (
|
||||
EventOpenCond core.Event_Key = "event_open_cond" //功能开放事件
|
||||
|
||||
//EventBuriedComplete core.Event_Key = "event_buried_complete" //埋点系统条件完成事件批处理接口 接口样例 func(uid string,conids []int32)
|
||||
EventFriendChange core.Event_Key = "event_friend_change" //加好友
|
||||
)
|
||||
|
||||
const (
|
||||
|
@ -1,94 +0,0 @@
|
||||
package friend
|
||||
|
||||
import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/lego/sys/log"
|
||||
"go_dreamfactory/pb"
|
||||
"go_dreamfactory/sys/configure"
|
||||
)
|
||||
|
||||
//接受切磋
|
||||
|
||||
func (this *apiComp) AcceptCheck(session comm.IUserSession, req *pb.FriendAcceptReq) (errdata *pb.ErrorData) {
|
||||
if req.Uid == "" {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ReqParameterError,
|
||||
Title: pb.ErrorCode_ReqParameterError.ToString(),
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func (this *apiComp) Accept(session comm.IUserSession, req *pb.FriendAcceptReq) (errdata *pb.ErrorData) {
|
||||
if errdata = this.AcceptCheck(session, req); errdata != nil {
|
||||
return
|
||||
}
|
||||
|
||||
//校验切磋请求是否超时
|
||||
if qr := this.module.ModelFriendQiecuo.getQiecuo(req.Uid); qr != nil {
|
||||
now := configure.Now().Unix()
|
||||
if now-qr.Timestamp > 10 { //大于10s 切磋超时
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_FriendQiecuoTimeout,
|
||||
Title: pb.ErrorCode_FriendQiecuoTimeout.ToString(),
|
||||
}
|
||||
this.module.Debug("切磋接受超时", log.Field{Key: "uid", Value: session.GetUserId()})
|
||||
return
|
||||
}
|
||||
} else {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_FriendQiecuoNoRequest,
|
||||
Title: pb.ErrorCode_FriendQiecuoNoRequest.ToString(),
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
if imodule, err := this.module.service.GetModule(comm.ModulePvp); err == nil {
|
||||
if ipvp, ok := imodule.(comm.IPvp); ok {
|
||||
//发起者 red
|
||||
red := this.module.ModuleUser.GetUser(req.Uid)
|
||||
if red == nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_UserNofound,
|
||||
Title: pb.ErrorCode_UserNofound.ToString(),
|
||||
}
|
||||
this.module.Error("未找到红方信息", log.Field{Key: "uid", Value: req.Uid})
|
||||
return
|
||||
}
|
||||
blue := this.module.ModuleUser.GetUser(session.GetUserId())
|
||||
if blue == nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_UserNofound,
|
||||
Title: pb.ErrorCode_UserNofound.ToString(),
|
||||
}
|
||||
|
||||
this.module.Error("未找到蓝方信息", log.Field{Key: "uid", Value: session.GetUserId()})
|
||||
return
|
||||
}
|
||||
matchId, c := ipvp.CreatePvp(
|
||||
&pb.PvpUserInfo{Uid: red.Uid, Name: red.Name, Avatar: red.Avatar, Lv: red.Lv},
|
||||
&pb.PvpUserInfo{Uid: blue.Uid, Name: blue.Name, Avatar: blue.Avatar, Lv: blue.Lv},
|
||||
pb.PvpType_friends,
|
||||
)
|
||||
if c != nil {
|
||||
this.module.Debug("createPvp code:", log.Field{Key: "code", Value: c})
|
||||
return
|
||||
}
|
||||
|
||||
//更新状态
|
||||
this.module.ModelFriendQiecuo.updateQiecuoRecord(req.Uid, session.GetUserId(), matchId)
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
resp := &pb.FriendAcceptResp{
|
||||
IsSucc: true,
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), FriendSubTypeAccept, resp)
|
||||
|
||||
|
||||
this.module.SendMsgToUser(string(this.module.GetType()), "qiecuonotify",
|
||||
&pb.FriendQiecuonotifyPush{Uid: session.GetUserId(), NotifyType: 2}, req.Uid)
|
||||
|
||||
return
|
||||
}
|
@ -2,7 +2,6 @@ package friend
|
||||
|
||||
import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/lego/sys/event"
|
||||
"go_dreamfactory/lego/sys/log"
|
||||
"go_dreamfactory/pb"
|
||||
"go_dreamfactory/utils"
|
||||
@ -57,6 +56,23 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (e
|
||||
agreeIds = append(agreeIds, friendId)
|
||||
}
|
||||
}
|
||||
pushAgreeData := func(uid string, friendId string) {
|
||||
//把设置的助战英雄推送给好友
|
||||
push := &pb.FriendAddAgreePush{
|
||||
TargetUid: friendId,
|
||||
}
|
||||
|
||||
this.module.Debug("推送加好友成功",
|
||||
log.Field{Key: "uid", Value: uid},
|
||||
log.Field{Key: "friendId", Value: friendId},
|
||||
)
|
||||
if err := this.module.SendMsgToUsers(string(this.module.GetType()), "addagree", push, uid); err != nil {
|
||||
this.module.Error("推送加好友成功",
|
||||
log.Field{Key: "uid", Value: uid},
|
||||
log.Field{Key: "err", Value: err.Error()},
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
pushAssistHero := func(uid, friendId, heroObjId string) {
|
||||
//把设置的助战英雄推送给好友
|
||||
@ -134,7 +150,7 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (e
|
||||
if self.AssistHeroId != "" {
|
||||
pushAssistHero(self.Uid, target.Uid, self.AssistHeroId)
|
||||
}
|
||||
|
||||
pushAgreeData(target.Uid, self.Uid)
|
||||
optNum++
|
||||
}
|
||||
|
||||
@ -153,7 +169,7 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (e
|
||||
return
|
||||
}
|
||||
|
||||
event.TriggerEvent(comm.EventFriendChange, uid, int32(len(self.FriendIds)))
|
||||
// event.TriggerEvent(comm.EventFriendChange, uid, int32(len(self.FriendIds)))
|
||||
}
|
||||
|
||||
// 拥有xx个好友
|
||||
|
@ -1,64 +0,0 @@
|
||||
package friend
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
)
|
||||
|
||||
// 踢馆(熊猫武馆)
|
||||
func (this *apiComp) QiecuoCheck(session comm.IUserSession, req *pb.FriendQiecuoReq) (errdata *pb.ErrorData) {
|
||||
if req.TargetUid == "" {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ReqParameterError,
|
||||
Title: pb.ErrorCode_ReqParameterError.ToString(),
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.FriendQiecuoReq) (errdata *pb.ErrorData) {
|
||||
if errdata = this.QiecuoCheck(session, req); errdata != nil {
|
||||
return
|
||||
}
|
||||
|
||||
//目标是否在线
|
||||
if !this.module.ModuleUser.IsOnline(req.TargetUid) {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_UserOffline,
|
||||
Title: pb.ErrorCode_UserOffline.ToString(),
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
//切磋请求处理
|
||||
if err := this.module.ModelFriendQiecuo.qiecuoReq(session.GetUserId(), req.TargetUid); err != nil {
|
||||
var customErr = new(comm.CustomError)
|
||||
if errors.As(err, &customErr) {
|
||||
code := customErr.Code
|
||||
errdata = &pb.ErrorData{
|
||||
Code: code,
|
||||
Title: code.ToString(),
|
||||
Message: err.Error(),
|
||||
}
|
||||
} else {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_DBError,
|
||||
Title: pb.ErrorCode_DBError.ToString(),
|
||||
Message: err.Error(),
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
resp := &pb.FriendQiecuoResp{
|
||||
TargetUid: req.TargetUid,
|
||||
Uid: session.GetUserId(),
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), FriendSubTypeQiecuo, resp)
|
||||
|
||||
this.module.SendMsgToUser(string(this.module.GetType()), "qiecuonotify",
|
||||
&pb.FriendQiecuonotifyPush{Uid: session.GetUserId(), NotifyType: 1}, req.TargetUid)
|
||||
|
||||
return
|
||||
}
|
@ -1,28 +0,0 @@
|
||||
package friend
|
||||
|
||||
import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
)
|
||||
|
||||
// 切磋终止
|
||||
func (this *apiComp) StopCheck(session comm.IUserSession, req *pb.FriendStopReq) (errdata *pb.ErrorData) {
|
||||
return
|
||||
}
|
||||
|
||||
func (this *apiComp) Stop(session comm.IUserSession, req *pb.FriendStopReq) (errdata *pb.ErrorData) {
|
||||
if errdata = this.StopCheck(session, req); errdata != nil {
|
||||
return
|
||||
}
|
||||
|
||||
//清楚切磋请求记录
|
||||
this.module.ModelFriendQiecuo.DelByUId(req.Uid)
|
||||
|
||||
resp := &pb.FriendStopResp{
|
||||
IsSucc: true,
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), "stop", resp)
|
||||
this.module.SendMsgToUser(string(this.module.GetType()), "qiecuonotify",
|
||||
&pb.FriendQiecuonotifyPush{Uid: session.GetUserId(), NotifyType: 3}, req.Uid)
|
||||
return
|
||||
}
|
@ -118,7 +118,7 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.PracticeAcceptReq
|
||||
"battid": redRecord.Battid,
|
||||
})
|
||||
|
||||
if err := session.SendMsg(string(this.module.GetType()), "accept", &pb.FriendAcceptResp{
|
||||
if err := session.SendMsg(string(this.module.GetType()), "accept", &pb.PracticeAcceptResp{
|
||||
IsSucc: true,
|
||||
}); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
|
@ -4,7 +4,6 @@ import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/lego/base"
|
||||
"go_dreamfactory/lego/core"
|
||||
"go_dreamfactory/lego/sys/event"
|
||||
"go_dreamfactory/modules"
|
||||
"go_dreamfactory/pb"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
@ -41,7 +40,7 @@ func (this *ModuleSys) OnInstallComp() {
|
||||
func (this *ModuleSys) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
|
||||
err = this.ModuleBase.Init(service, module, options)
|
||||
this.service = service.(base.IRPCXService)
|
||||
event.Register(comm.EventFriendChange, this.FriendCountChange)
|
||||
//event.Register(comm.EventFriendChange, this.FriendCountChange)
|
||||
return
|
||||
}
|
||||
|
||||
@ -139,19 +138,19 @@ func (this *ModuleSys) CheckOpenCondCfgById(uid string, id string) (bOpen bool,
|
||||
return
|
||||
}
|
||||
|
||||
func (this *ModuleSys) FriendCountChange(uid string, count int32) {
|
||||
if cond := this.configure.getFriendTask(count); len(cond) > 0 {
|
||||
if session, ok := this.GetUserSession(uid); ok {
|
||||
this.AutoActivate(session, cond)
|
||||
if err := session.Push(); err != nil {
|
||||
this.Errorln(err)
|
||||
}
|
||||
this.PutUserSession(session)
|
||||
} else {
|
||||
this.PutUserSession(session)
|
||||
}
|
||||
}
|
||||
}
|
||||
// func (this *ModuleSys) FriendCountChange(uid string, count int32) {
|
||||
// if cond := this.configure.getFriendTask(count); len(cond) > 0 {
|
||||
// if session, ok := this.GetUserSession(uid); ok {
|
||||
// this.AutoActivate(session, cond)
|
||||
// if err := session.Push(); err != nil {
|
||||
// this.Errorln(err)
|
||||
// }
|
||||
// this.PutUserSession(session)
|
||||
// } else {
|
||||
// this.PutUserSession(session)
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
func (this *ModuleSys) QueryOpenCondData(uid string) (data map[string]int32, errdata *pb.ErrorData) {
|
||||
data = make(map[string]int32, 0)
|
||||
list, err := this.modelSys.GetOpenCondList(uid)
|
||||
|
760
pb/comm.pb.go
760
pb/comm.pb.go
File diff suppressed because it is too large
Load Diff
@ -2119,17 +2119,17 @@ func (x *FriendGetRelationResp) GetStatus() bool {
|
||||
return false
|
||||
}
|
||||
|
||||
// 切磋请求
|
||||
type FriendQiecuoReq struct {
|
||||
// 加好友推送
|
||||
type FriendAddAgreePush struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
TargetUid string `protobuf:"bytes,1,opt,name=targetUid,proto3" json:"targetUid"` //切磋目标玩家UID
|
||||
TargetUid string `protobuf:"bytes,1,opt,name=targetUid,proto3" json:"targetUid"` // 好友id
|
||||
}
|
||||
|
||||
func (x *FriendQiecuoReq) Reset() {
|
||||
*x = FriendQiecuoReq{}
|
||||
func (x *FriendAddAgreePush) Reset() {
|
||||
*x = FriendAddAgreePush{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_friend_friend_msg_proto_msgTypes[42]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
@ -2137,13 +2137,13 @@ func (x *FriendQiecuoReq) Reset() {
|
||||
}
|
||||
}
|
||||
|
||||
func (x *FriendQiecuoReq) String() string {
|
||||
func (x *FriendAddAgreePush) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*FriendQiecuoReq) ProtoMessage() {}
|
||||
func (*FriendAddAgreePush) ProtoMessage() {}
|
||||
|
||||
func (x *FriendQiecuoReq) ProtoReflect() protoreflect.Message {
|
||||
func (x *FriendAddAgreePush) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_friend_friend_msg_proto_msgTypes[42]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
@ -2155,373 +2155,18 @@ func (x *FriendQiecuoReq) ProtoReflect() protoreflect.Message {
|
||||
return mi.MessageOf(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use FriendQiecuoReq.ProtoReflect.Descriptor instead.
|
||||
func (*FriendQiecuoReq) Descriptor() ([]byte, []int) {
|
||||
// Deprecated: Use FriendAddAgreePush.ProtoReflect.Descriptor instead.
|
||||
func (*FriendAddAgreePush) Descriptor() ([]byte, []int) {
|
||||
return file_friend_friend_msg_proto_rawDescGZIP(), []int{42}
|
||||
}
|
||||
|
||||
func (x *FriendQiecuoReq) GetTargetUid() string {
|
||||
func (x *FriendAddAgreePush) GetTargetUid() string {
|
||||
if x != nil {
|
||||
return x.TargetUid
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
type FriendQiecuoResp struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
TargetUid string `protobuf:"bytes,1,opt,name=targetUid,proto3" json:"targetUid"` //切磋目标
|
||||
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` //发起者
|
||||
}
|
||||
|
||||
func (x *FriendQiecuoResp) Reset() {
|
||||
*x = FriendQiecuoResp{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_friend_friend_msg_proto_msgTypes[43]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *FriendQiecuoResp) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*FriendQiecuoResp) ProtoMessage() {}
|
||||
|
||||
func (x *FriendQiecuoResp) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_friend_friend_msg_proto_msgTypes[43]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
return ms
|
||||
}
|
||||
return mi.MessageOf(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use FriendQiecuoResp.ProtoReflect.Descriptor instead.
|
||||
func (*FriendQiecuoResp) Descriptor() ([]byte, []int) {
|
||||
return file_friend_friend_msg_proto_rawDescGZIP(), []int{43}
|
||||
}
|
||||
|
||||
func (x *FriendQiecuoResp) GetTargetUid() string {
|
||||
if x != nil {
|
||||
return x.TargetUid
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *FriendQiecuoResp) GetUid() string {
|
||||
if x != nil {
|
||||
return x.Uid
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
//接受切磋
|
||||
type FriendAcceptReq struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` //切磋发起者
|
||||
}
|
||||
|
||||
func (x *FriendAcceptReq) Reset() {
|
||||
*x = FriendAcceptReq{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_friend_friend_msg_proto_msgTypes[44]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *FriendAcceptReq) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*FriendAcceptReq) ProtoMessage() {}
|
||||
|
||||
func (x *FriendAcceptReq) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_friend_friend_msg_proto_msgTypes[44]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
return ms
|
||||
}
|
||||
return mi.MessageOf(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use FriendAcceptReq.ProtoReflect.Descriptor instead.
|
||||
func (*FriendAcceptReq) Descriptor() ([]byte, []int) {
|
||||
return file_friend_friend_msg_proto_rawDescGZIP(), []int{44}
|
||||
}
|
||||
|
||||
func (x *FriendAcceptReq) GetUid() string {
|
||||
if x != nil {
|
||||
return x.Uid
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
type FriendAcceptResp struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
IsSucc bool `protobuf:"varint,1,opt,name=isSucc,proto3" json:"isSucc"`
|
||||
}
|
||||
|
||||
func (x *FriendAcceptResp) Reset() {
|
||||
*x = FriendAcceptResp{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_friend_friend_msg_proto_msgTypes[45]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *FriendAcceptResp) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*FriendAcceptResp) ProtoMessage() {}
|
||||
|
||||
func (x *FriendAcceptResp) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_friend_friend_msg_proto_msgTypes[45]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
return ms
|
||||
}
|
||||
return mi.MessageOf(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use FriendAcceptResp.ProtoReflect.Descriptor instead.
|
||||
func (*FriendAcceptResp) Descriptor() ([]byte, []int) {
|
||||
return file_friend_friend_msg_proto_rawDescGZIP(), []int{45}
|
||||
}
|
||||
|
||||
func (x *FriendAcceptResp) GetIsSucc() bool {
|
||||
if x != nil {
|
||||
return x.IsSucc
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
//拒绝切磋
|
||||
type FriendStopReq struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` //切磋发起者
|
||||
}
|
||||
|
||||
func (x *FriendStopReq) Reset() {
|
||||
*x = FriendStopReq{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_friend_friend_msg_proto_msgTypes[46]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *FriendStopReq) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*FriendStopReq) ProtoMessage() {}
|
||||
|
||||
func (x *FriendStopReq) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_friend_friend_msg_proto_msgTypes[46]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
return ms
|
||||
}
|
||||
return mi.MessageOf(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use FriendStopReq.ProtoReflect.Descriptor instead.
|
||||
func (*FriendStopReq) Descriptor() ([]byte, []int) {
|
||||
return file_friend_friend_msg_proto_rawDescGZIP(), []int{46}
|
||||
}
|
||||
|
||||
func (x *FriendStopReq) GetUid() string {
|
||||
if x != nil {
|
||||
return x.Uid
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
type FriendStopResp struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
IsSucc bool `protobuf:"varint,1,opt,name=isSucc,proto3" json:"isSucc"`
|
||||
}
|
||||
|
||||
func (x *FriendStopResp) Reset() {
|
||||
*x = FriendStopResp{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_friend_friend_msg_proto_msgTypes[47]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *FriendStopResp) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*FriendStopResp) ProtoMessage() {}
|
||||
|
||||
func (x *FriendStopResp) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_friend_friend_msg_proto_msgTypes[47]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
return ms
|
||||
}
|
||||
return mi.MessageOf(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use FriendStopResp.ProtoReflect.Descriptor instead.
|
||||
func (*FriendStopResp) Descriptor() ([]byte, []int) {
|
||||
return file_friend_friend_msg_proto_rawDescGZIP(), []int{47}
|
||||
}
|
||||
|
||||
func (x *FriendStopResp) GetIsSucc() bool {
|
||||
if x != nil {
|
||||
return x.IsSucc
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
type FriendQiecuonotifyPush struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` //发起者(切磋)
|
||||
NotifyType int32 `protobuf:"varint,2,opt,name=notifyType,proto3" json:"notifyType"` //1发起通知 2接受通知 3拒绝通知
|
||||
}
|
||||
|
||||
func (x *FriendQiecuonotifyPush) Reset() {
|
||||
*x = FriendQiecuonotifyPush{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_friend_friend_msg_proto_msgTypes[48]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *FriendQiecuonotifyPush) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*FriendQiecuonotifyPush) ProtoMessage() {}
|
||||
|
||||
func (x *FriendQiecuonotifyPush) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_friend_friend_msg_proto_msgTypes[48]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
return ms
|
||||
}
|
||||
return mi.MessageOf(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use FriendQiecuonotifyPush.ProtoReflect.Descriptor instead.
|
||||
func (*FriendQiecuonotifyPush) Descriptor() ([]byte, []int) {
|
||||
return file_friend_friend_msg_proto_rawDescGZIP(), []int{48}
|
||||
}
|
||||
|
||||
func (x *FriendQiecuonotifyPush) GetUid() string {
|
||||
if x != nil {
|
||||
return x.Uid
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *FriendQiecuonotifyPush) GetNotifyType() int32 {
|
||||
if x != nil {
|
||||
return x.NotifyType
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
type RPCFriendNumReq struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
|
||||
Cond []string `protobuf:"bytes,2,rep,name=cond,proto3" json:"cond"`
|
||||
}
|
||||
|
||||
func (x *RPCFriendNumReq) Reset() {
|
||||
*x = RPCFriendNumReq{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_friend_friend_msg_proto_msgTypes[49]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *RPCFriendNumReq) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*RPCFriendNumReq) ProtoMessage() {}
|
||||
|
||||
func (x *RPCFriendNumReq) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_friend_friend_msg_proto_msgTypes[49]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
return ms
|
||||
}
|
||||
return mi.MessageOf(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use RPCFriendNumReq.ProtoReflect.Descriptor instead.
|
||||
func (*RPCFriendNumReq) Descriptor() ([]byte, []int) {
|
||||
return file_friend_friend_msg_proto_rawDescGZIP(), []int{49}
|
||||
}
|
||||
|
||||
func (x *RPCFriendNumReq) GetUid() string {
|
||||
if x != nil {
|
||||
return x.Uid
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *RPCFriendNumReq) GetCond() []string {
|
||||
if x != nil {
|
||||
return x.Cond
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
var File_friend_friend_msg_proto protoreflect.FileDescriptor
|
||||
|
||||
var file_friend_friend_msg_proto_rawDesc = []byte{
|
||||
@ -2683,34 +2328,11 @@ var file_friend_friend_msg_proto_rawDesc = []byte{
|
||||
0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55,
|
||||
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74,
|
||||
0x55, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20,
|
||||
0x01, 0x28, 0x08, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x2f, 0x0a, 0x0f, 0x46,
|
||||
0x72, 0x69, 0x65, 0x6e, 0x64, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x1c,
|
||||
0x0a, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
|
||||
0x09, 0x52, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, 0x64, 0x22, 0x42, 0x0a, 0x10,
|
||||
0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x52, 0x65, 0x73, 0x70,
|
||||
0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, 0x64, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, 0x64, 0x12, 0x10,
|
||||
0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
|
||||
0x22, 0x23, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74,
|
||||
0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x2a, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41,
|
||||
0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x53,
|
||||
0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x53, 0x75, 0x63,
|
||||
0x63, 0x22, 0x21, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x74, 0x6f, 0x70, 0x52,
|
||||
0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
|
||||
0x03, 0x75, 0x69, 0x64, 0x22, 0x28, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x74,
|
||||
0x6f, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x53, 0x75, 0x63, 0x63,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x53, 0x75, 0x63, 0x63, 0x22, 0x4a,
|
||||
0x0a, 0x16, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x6e, 0x6f,
|
||||
0x74, 0x69, 0x66, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x6e, 0x6f,
|
||||
0x74, 0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
|
||||
0x6e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x22, 0x37, 0x0a, 0x0f, 0x52, 0x50,
|
||||
0x43, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4e, 0x75, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a,
|
||||
0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12,
|
||||
0x12, 0x0a, 0x04, 0x63, 0x6f, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x63,
|
||||
0x6f, 0x6e, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
|
||||
0x74, 0x6f, 0x33,
|
||||
0x01, 0x28, 0x08, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x32, 0x0a, 0x12, 0x46,
|
||||
0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x64, 0x64, 0x41, 0x67, 0x72, 0x65, 0x65, 0x50, 0x75, 0x73,
|
||||
0x68, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, 0x64, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, 0x64, 0x42,
|
||||
0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
@ -2725,7 +2347,7 @@ func file_friend_friend_msg_proto_rawDescGZIP() []byte {
|
||||
return file_friend_friend_msg_proto_rawDescData
|
||||
}
|
||||
|
||||
var file_friend_friend_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 50)
|
||||
var file_friend_friend_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 43)
|
||||
var file_friend_friend_msg_proto_goTypes = []interface{}{
|
||||
(*FriendBase)(nil), // 0: FriendBase
|
||||
(*FriendListReq)(nil), // 1: FriendListReq
|
||||
@ -2769,27 +2391,20 @@ var file_friend_friend_msg_proto_goTypes = []interface{}{
|
||||
(*FriendAssistHeroListResp)(nil), // 39: FriendAssistHeroListResp
|
||||
(*FriendGetRelationReq)(nil), // 40: FriendGetRelationReq
|
||||
(*FriendGetRelationResp)(nil), // 41: FriendGetRelationResp
|
||||
(*FriendQiecuoReq)(nil), // 42: FriendQiecuoReq
|
||||
(*FriendQiecuoResp)(nil), // 43: FriendQiecuoResp
|
||||
(*FriendAcceptReq)(nil), // 44: FriendAcceptReq
|
||||
(*FriendAcceptResp)(nil), // 45: FriendAcceptResp
|
||||
(*FriendStopReq)(nil), // 46: FriendStopReq
|
||||
(*FriendStopResp)(nil), // 47: FriendStopResp
|
||||
(*FriendQiecuonotifyPush)(nil), // 48: FriendQiecuonotifyPush
|
||||
(*RPCFriendNumReq)(nil), // 49: RPCFriendNumReq
|
||||
(*DBFriend)(nil), // 50: DBFriend
|
||||
(*AssistRecord)(nil), // 51: AssistRecord
|
||||
(*FriendAddAgreePush)(nil), // 42: FriendAddAgreePush
|
||||
(*DBFriend)(nil), // 43: DBFriend
|
||||
(*AssistRecord)(nil), // 44: AssistRecord
|
||||
}
|
||||
var file_friend_friend_msg_proto_depIdxs = []int32{
|
||||
0, // 0: FriendListResp.list:type_name -> FriendBase
|
||||
50, // 1: FriendListResp.friend:type_name -> DBFriend
|
||||
43, // 1: FriendListResp.friend:type_name -> DBFriend
|
||||
0, // 2: FriendRandlistResp.list:type_name -> FriendBase
|
||||
0, // 3: FriendApplyListResp.list:type_name -> FriendBase
|
||||
0, // 4: FriendSearchResp.friends:type_name -> FriendBase
|
||||
0, // 5: FriendBlackListResp.friends:type_name -> FriendBase
|
||||
0, // 6: FriendZanlistResp.list:type_name -> FriendBase
|
||||
0, // 7: FriendAssistlistResp.list:type_name -> FriendBase
|
||||
51, // 8: FriendAssistlistResp.record:type_name -> AssistRecord
|
||||
44, // 8: FriendAssistlistResp.record:type_name -> AssistRecord
|
||||
0, // 9: FriendAssistHeroUpdatePush.friend:type_name -> FriendBase
|
||||
0, // 10: FriendAssistHeroListResp.friends:type_name -> FriendBase
|
||||
11, // [11:11] is the sub-list for method output_type
|
||||
@ -3311,91 +2926,7 @@ func file_friend_friend_msg_proto_init() {
|
||||
}
|
||||
}
|
||||
file_friend_friend_msg_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*FriendQiecuoReq); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_friend_friend_msg_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*FriendQiecuoResp); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_friend_friend_msg_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*FriendAcceptReq); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_friend_friend_msg_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*FriendAcceptResp); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_friend_friend_msg_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*FriendStopReq); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_friend_friend_msg_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*FriendStopResp); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_friend_friend_msg_proto_msgTypes[48].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*FriendQiecuonotifyPush); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_friend_friend_msg_proto_msgTypes[49].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*RPCFriendNumReq); i {
|
||||
switch v := v.(*FriendAddAgreePush); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
@ -3413,7 +2944,7 @@ func file_friend_friend_msg_proto_init() {
|
||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||
RawDescriptor: file_friend_friend_msg_proto_rawDesc,
|
||||
NumEnums: 0,
|
||||
NumMessages: 50,
|
||||
NumMessages: 43,
|
||||
NumExtensions: 0,
|
||||
NumServices: 0,
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user