From 710b28fbc09038e95bcf534486cfde22bd400fb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B7=E5=8B=87?= Date: Wed, 30 Aug 2023 19:21:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/imserver/cs/cs.auto_gen.go | 116 ++++- server/imserver/cs/cs_msgid.pb.go | 212 +++++---- server/imserver/cs/cs_proto.pb.go | 656 ++++++++++++++++++++------- server/imserver/guild.go | 2 +- server/imserver/guilddbmgr.go | 12 +- server/imserver/guildmgr.go | 82 ++-- server/imserver/player.go | 38 +- server/imserver/proto/cs_msgid.proto | 9 + server/imserver/proto/cs_proto.proto | 34 +- 9 files changed, 865 insertions(+), 296 deletions(-) diff --git a/server/imserver/cs/cs.auto_gen.go b/server/imserver/cs/cs.auto_gen.go index 68fb532b..9a1a778a 100644 --- a/server/imserver/cs/cs.auto_gen.go +++ b/server/imserver/cs/cs.auto_gen.go @@ -49,11 +49,14 @@ type MsgHandler interface { CMDeleteFriendShip(*f5.MsgHdr, *CMDeleteFriendShip) CMAddBlacklist(*f5.MsgHdr, *CMAddBlacklist) CMRemoveBlacklist(*f5.MsgHdr, *CMRemoveBlacklist) - CMSetCurrPrivateChatTarget(*f5.MsgHdr, *CMSetCurrPrivateChatTarget) CMSendChatMsg(*f5.MsgHdr, *CMSendChatMsg) + CMReadMsgAndOpenChatNotify(*f5.MsgHdr, *CMReadMsgAndOpenChatNotify) + CMSetCurrPrivateChatTarget(*f5.MsgHdr, *CMSetCurrPrivateChatTarget) + CMCloseChatNotify(*f5.MsgHdr, *CMCloseChatNotify) CMGuildInfo(*f5.MsgHdr, *CMGuildInfo) CMCreateGuild(*f5.MsgHdr, *CMCreateGuild) CMApplyToGuild(*f5.MsgHdr, *CMApplyToGuild) + CMApplyList(*f5.MsgHdr, *CMApplyList) CMApprove(*f5.MsgHdr, *CMApprove) CMReject(*f5.MsgHdr, *CMReject) CMLeaveGuild(*f5.MsgHdr, *CMLeaveGuild) @@ -62,6 +65,7 @@ type MsgHandler interface { CMDemoteMember(*f5.MsgHdr, *CMDemoteMember) CMDisband(*f5.MsgHdr, *CMDisband) CMSearchGuilds(*f5.MsgHdr, *CMSearchGuilds) + CMGuildLogs(*f5.MsgHdr, *CMGuildLogs) } func (this *MsgHandlerImpl) CMPing(hdr *f5.MsgHdr, msg *CMPing) { @@ -106,10 +110,16 @@ func (this *MsgHandlerImpl) CMAddBlacklist(hdr *f5.MsgHdr, msg *CMAddBlacklist) func (this *MsgHandlerImpl) CMRemoveBlacklist(hdr *f5.MsgHdr, msg *CMRemoveBlacklist) { } +func (this *MsgHandlerImpl) CMSendChatMsg(hdr *f5.MsgHdr, msg *CMSendChatMsg) { +} + +func (this *MsgHandlerImpl) CMReadMsgAndOpenChatNotify(hdr *f5.MsgHdr, msg *CMReadMsgAndOpenChatNotify) { +} + func (this *MsgHandlerImpl) CMSetCurrPrivateChatTarget(hdr *f5.MsgHdr, msg *CMSetCurrPrivateChatTarget) { } -func (this *MsgHandlerImpl) CMSendChatMsg(hdr *f5.MsgHdr, msg *CMSendChatMsg) { +func (this *MsgHandlerImpl) CMCloseChatNotify(hdr *f5.MsgHdr, msg *CMCloseChatNotify) { } func (this *MsgHandlerImpl) CMGuildInfo(hdr *f5.MsgHdr, msg *CMGuildInfo) { @@ -121,6 +131,9 @@ func (this *MsgHandlerImpl) CMCreateGuild(hdr *f5.MsgHdr, msg *CMCreateGuild) { func (this *MsgHandlerImpl) CMApplyToGuild(hdr *f5.MsgHdr, msg *CMApplyToGuild) { } +func (this *MsgHandlerImpl) CMApplyList(hdr *f5.MsgHdr, msg *CMApplyList) { +} + func (this *MsgHandlerImpl) CMApprove(hdr *f5.MsgHdr, msg *CMApprove) { } @@ -145,6 +158,9 @@ func (this *MsgHandlerImpl) CMDisband(hdr *f5.MsgHdr, msg *CMDisband) { func (this *MsgHandlerImpl) CMSearchGuilds(hdr *f5.MsgHdr, msg *CMSearchGuilds) { } +func (this *MsgHandlerImpl) CMGuildLogs(hdr *f5.MsgHdr, msg *CMGuildLogs) { +} + func (this *CMPing) GetNetMsgId() uint16 { return uint16(CMMessageIdE__CMPing) } @@ -261,12 +277,20 @@ func (this *SMRemoveBlacklist) GetNetMsgId() uint16 { return uint16(SMMessageIdE__SMRemoveBlacklist) } +func (this *CMSendChatMsg) GetNetMsgId() uint16 { + return uint16(CMMessageIdE__CMSendChatMsg) +} + +func (this *CMReadMsgAndOpenChatNotify) GetNetMsgId() uint16 { + return uint16(CMMessageIdE__CMReadMsgAndOpenChatNotify) +} + func (this *CMSetCurrPrivateChatTarget) GetNetMsgId() uint16 { return uint16(CMMessageIdE__CMSetCurrPrivateChatTarget) } -func (this *CMSendChatMsg) GetNetMsgId() uint16 { - return uint16(CMMessageIdE__CMSendChatMsg) +func (this *CMCloseChatNotify) GetNetMsgId() uint16 { + return uint16(CMMessageIdE__CMCloseChatNotify) } func (this *SMUpdateChatRedPointNotify) GetNetMsgId() uint16 { @@ -277,6 +301,18 @@ func (this *SMChatMsgNotify) GetNetMsgId() uint16 { return uint16(SMMessageIdE__SMChatMsgNotify) } +func (this *SMUpdateRedPointNotify) GetNetMsgId() uint16 { + return uint16(SMMessageIdE__SMUpdateRedPointNotify) +} + +func (this *SMUpdatePrivateChatRedPointNotify) GetNetMsgId() uint16 { + return uint16(SMMessageIdE__SMUpdatePrivateChatRedPointNotify) +} + +func (this *SMUpdateChatChannelLastId) GetNetMsgId() uint16 { + return uint16(SMMessageIdE__SMUpdateChatChannelLastId) +} + func (this *CMGuildInfo) GetNetMsgId() uint16 { return uint16(CMMessageIdE__CMGuildInfo) } @@ -301,6 +337,14 @@ func (this *SMApplyToGuild) GetNetMsgId() uint16 { return uint16(SMMessageIdE__SMApplyToGuild) } +func (this *CMApplyList) GetNetMsgId() uint16 { + return uint16(CMMessageIdE__CMApplyList) +} + +func (this *SMApplyList) GetNetMsgId() uint16 { + return uint16(SMMessageIdE__SMApplyList) +} + func (this *CMApprove) GetNetMsgId() uint16 { return uint16(CMMessageIdE__CMApprove) } @@ -365,6 +409,14 @@ func (this *SMSearchGuilds) GetNetMsgId() uint16 { return uint16(SMMessageIdE__SMSearchGuilds) } +func (this *CMGuildLogs) GetNetMsgId() uint16 { + return uint16(CMMessageIdE__CMGuildLogs) +} + +func (this *SMGuildLogs) GetNetMsgId() uint16 { + return uint16(SMMessageIdE__SMGuildLogs) +} + func init() { handlers[int(CMMessageIdE__CMPing)] = &CsNetMsgHandler{ @@ -535,6 +587,30 @@ func init() { }, } + handlers[int(CMMessageIdE__CMSendChatMsg)] = &CsNetMsgHandler{ + MsgId: int(CMMessageIdE__CMSendChatMsg), + ParseCb: func (data []byte) interface{} { + msg := &CMSendChatMsg{} + proto.Unmarshal(data, msg) + return msg + }, + Cb: func (hdr *f5.MsgHdr, handler MsgHandler) { + handler.CMSendChatMsg(hdr, hdr.Msg.(*CMSendChatMsg)) + }, + } + + handlers[int(CMMessageIdE__CMReadMsgAndOpenChatNotify)] = &CsNetMsgHandler{ + MsgId: int(CMMessageIdE__CMReadMsgAndOpenChatNotify), + ParseCb: func (data []byte) interface{} { + msg := &CMReadMsgAndOpenChatNotify{} + proto.Unmarshal(data, msg) + return msg + }, + Cb: func (hdr *f5.MsgHdr, handler MsgHandler) { + handler.CMReadMsgAndOpenChatNotify(hdr, hdr.Msg.(*CMReadMsgAndOpenChatNotify)) + }, + } + handlers[int(CMMessageIdE__CMSetCurrPrivateChatTarget)] = &CsNetMsgHandler{ MsgId: int(CMMessageIdE__CMSetCurrPrivateChatTarget), ParseCb: func (data []byte) interface{} { @@ -547,15 +623,15 @@ func init() { }, } - handlers[int(CMMessageIdE__CMSendChatMsg)] = &CsNetMsgHandler{ - MsgId: int(CMMessageIdE__CMSendChatMsg), + handlers[int(CMMessageIdE__CMCloseChatNotify)] = &CsNetMsgHandler{ + MsgId: int(CMMessageIdE__CMCloseChatNotify), ParseCb: func (data []byte) interface{} { - msg := &CMSendChatMsg{} + msg := &CMCloseChatNotify{} proto.Unmarshal(data, msg) return msg }, Cb: func (hdr *f5.MsgHdr, handler MsgHandler) { - handler.CMSendChatMsg(hdr, hdr.Msg.(*CMSendChatMsg)) + handler.CMCloseChatNotify(hdr, hdr.Msg.(*CMCloseChatNotify)) }, } @@ -595,6 +671,18 @@ func init() { }, } + handlers[int(CMMessageIdE__CMApplyList)] = &CsNetMsgHandler{ + MsgId: int(CMMessageIdE__CMApplyList), + ParseCb: func (data []byte) interface{} { + msg := &CMApplyList{} + proto.Unmarshal(data, msg) + return msg + }, + Cb: func (hdr *f5.MsgHdr, handler MsgHandler) { + handler.CMApplyList(hdr, hdr.Msg.(*CMApplyList)) + }, + } + handlers[int(CMMessageIdE__CMApprove)] = &CsNetMsgHandler{ MsgId: int(CMMessageIdE__CMApprove), ParseCb: func (data []byte) interface{} { @@ -691,4 +779,16 @@ func init() { }, } + handlers[int(CMMessageIdE__CMGuildLogs)] = &CsNetMsgHandler{ + MsgId: int(CMMessageIdE__CMGuildLogs), + ParseCb: func (data []byte) interface{} { + msg := &CMGuildLogs{} + proto.Unmarshal(data, msg) + return msg + }, + Cb: func (hdr *f5.MsgHdr, handler MsgHandler) { + handler.CMGuildLogs(hdr, hdr.Msg.(*CMGuildLogs)) + }, + } + } \ No newline at end of file diff --git a/server/imserver/cs/cs_msgid.pb.go b/server/imserver/cs/cs_msgid.pb.go index 672b59c5..fcb1fc5c 100644 --- a/server/imserver/cs/cs_msgid.pb.go +++ b/server/imserver/cs/cs_msgid.pb.go @@ -42,6 +42,8 @@ const ( // 聊天相关 CMMessageIdE__CMSetCurrPrivateChatTarget CMMessageIdE = 200 CMMessageIdE__CMSendChatMsg CMMessageIdE = 201 + CMMessageIdE__CMReadMsgAndOpenChatNotify CMMessageIdE = 202 + CMMessageIdE__CMCloseChatNotify CMMessageIdE = 203 // 公会相关 CMMessageIdE__CMGuildInfo CMMessageIdE = 120 CMMessageIdE__CMCreateGuild CMMessageIdE = 121 @@ -54,6 +56,8 @@ const ( CMMessageIdE__CMDemoteMember CMMessageIdE = 128 CMMessageIdE__CMDisband CMMessageIdE = 129 CMMessageIdE__CMSearchGuilds CMMessageIdE = 130 + CMMessageIdE__CMApplyList CMMessageIdE = 131 + CMMessageIdE__CMGuildLogs CMMessageIdE = 132 ) // Enum value maps for CMMessageIdE. @@ -75,6 +79,8 @@ var ( 115: "_CMFriendInfo", 200: "_CMSetCurrPrivateChatTarget", 201: "_CMSendChatMsg", + 202: "_CMReadMsgAndOpenChatNotify", + 203: "_CMCloseChatNotify", 120: "_CMGuildInfo", 121: "_CMCreateGuild", 122: "_CMApplyToGuild", @@ -86,6 +92,8 @@ var ( 128: "_CMDemoteMember", 129: "_CMDisband", 130: "_CMSearchGuilds", + 131: "_CMApplyList", + 132: "_CMGuildLogs", } CMMessageIdE_value = map[string]int32{ "_CMPing": 101, @@ -104,6 +112,8 @@ var ( "_CMFriendInfo": 115, "_CMSetCurrPrivateChatTarget": 200, "_CMSendChatMsg": 201, + "_CMReadMsgAndOpenChatNotify": 202, + "_CMCloseChatNotify": 203, "_CMGuildInfo": 120, "_CMCreateGuild": 121, "_CMApplyToGuild": 122, @@ -115,6 +125,8 @@ var ( "_CMDemoteMember": 128, "_CMDisband": 129, "_CMSearchGuilds": 130, + "_CMApplyList": 131, + "_CMGuildLogs": 132, } ) @@ -185,9 +197,14 @@ const ( SMMessageIdE__SMDemoteMember SMMessageIdE = 128 SMMessageIdE__SMDisband SMMessageIdE = 129 SMMessageIdE__SMSearchGuilds SMMessageIdE = 130 + SMMessageIdE__SMApplyList SMMessageIdE = 131 + SMMessageIdE__SMGuildLogs SMMessageIdE = 132 // 聊天相关 - SMMessageIdE__SMUpdateChatRedPointNotify SMMessageIdE = 200 - SMMessageIdE__SMChatMsgNotify SMMessageIdE = 201 + SMMessageIdE__SMUpdateChatRedPointNotify SMMessageIdE = 200 + SMMessageIdE__SMChatMsgNotify SMMessageIdE = 201 + SMMessageIdE__SMUpdateRedPointNotify SMMessageIdE = 202 + SMMessageIdE__SMUpdatePrivateChatRedPointNotify SMMessageIdE = 203 + SMMessageIdE__SMUpdateChatChannelLastId SMMessageIdE = 204 ) // Enum value maps for SMMessageIdE. @@ -219,38 +236,48 @@ var ( 128: "_SMDemoteMember", 129: "_SMDisband", 130: "_SMSearchGuilds", + 131: "_SMApplyList", + 132: "_SMGuildLogs", 200: "_SMUpdateChatRedPointNotify", 201: "_SMChatMsgNotify", + 202: "_SMUpdateRedPointNotify", + 203: "_SMUpdatePrivateChatRedPointNotify", + 204: "_SMUpdateChatChannelLastId", } SMMessageIdE_value = map[string]int32{ - "_SMPing": 101, - "_SMRpcError": 102, - "_SMLogin": 103, - "_SMReconnect": 104, - "_SMSearchUserByAccountId": 105, - "_SMSearchUser": 106, - "_SMAddFriendRequest": 107, - "_SMAcceptFriendRequest": 108, - "_SMRejectFriendRequest": 109, - "_SMListPendingFriendRequest": 110, - "_SMListFriend": 111, - "_SMDeleteFriendShip": 112, - "_SMAddBlacklist": 113, - "_SMRemoveBlacklist": 114, - "_SMFriendInfo": 115, - "_SMGuildInfo": 120, - "_SMCreateGuild": 121, - "_SMApplyToGuild": 122, - "_SMApprove": 123, - "_SMReject": 124, - "_SMLeaveGuild": 125, - "_SMDismissMember": 126, - "_SMPromoteMember": 127, - "_SMDemoteMember": 128, - "_SMDisband": 129, - "_SMSearchGuilds": 130, - "_SMUpdateChatRedPointNotify": 200, - "_SMChatMsgNotify": 201, + "_SMPing": 101, + "_SMRpcError": 102, + "_SMLogin": 103, + "_SMReconnect": 104, + "_SMSearchUserByAccountId": 105, + "_SMSearchUser": 106, + "_SMAddFriendRequest": 107, + "_SMAcceptFriendRequest": 108, + "_SMRejectFriendRequest": 109, + "_SMListPendingFriendRequest": 110, + "_SMListFriend": 111, + "_SMDeleteFriendShip": 112, + "_SMAddBlacklist": 113, + "_SMRemoveBlacklist": 114, + "_SMFriendInfo": 115, + "_SMGuildInfo": 120, + "_SMCreateGuild": 121, + "_SMApplyToGuild": 122, + "_SMApprove": 123, + "_SMReject": 124, + "_SMLeaveGuild": 125, + "_SMDismissMember": 126, + "_SMPromoteMember": 127, + "_SMDemoteMember": 128, + "_SMDisband": 129, + "_SMSearchGuilds": 130, + "_SMApplyList": 131, + "_SMGuildLogs": 132, + "_SMUpdateChatRedPointNotify": 200, + "_SMChatMsgNotify": 201, + "_SMUpdateRedPointNotify": 202, + "_SMUpdatePrivateChatRedPointNotify": 203, + "_SMUpdateChatChannelLastId": 204, } ) @@ -295,7 +322,7 @@ var File_cs_msgid_proto protoreflect.FileDescriptor var file_cs_msgid_proto_rawDesc = []byte{ 0x0a, 0x0e, 0x63, 0x73, 0x5f, 0x6d, 0x73, 0x67, 0x69, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x12, 0x02, 0x63, 0x73, 0x2a, 0xd8, 0x04, 0x0a, 0x0d, 0x43, 0x4d, 0x4d, 0x65, 0x73, 0x73, 0x61, + 0x12, 0x02, 0x63, 0x73, 0x2a, 0xb9, 0x05, 0x0a, 0x0d, 0x43, 0x4d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x64, 0x5f, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x5f, 0x43, 0x4d, 0x50, 0x69, 0x6e, 0x67, 0x10, 0x65, 0x12, 0x0c, 0x0a, 0x08, 0x5f, 0x43, 0x4d, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x10, 0x67, 0x12, 0x10, 0x0a, 0x0c, 0x5f, 0x43, 0x4d, 0x52, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, @@ -319,60 +346,75 @@ var file_cs_msgid_proto_rawDesc = []byte{ 0x10, 0x73, 0x12, 0x20, 0x0a, 0x1b, 0x5f, 0x43, 0x4d, 0x53, 0x65, 0x74, 0x43, 0x75, 0x72, 0x72, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x10, 0xc8, 0x01, 0x12, 0x13, 0x0a, 0x0e, 0x5f, 0x43, 0x4d, 0x53, 0x65, 0x6e, 0x64, 0x43, - 0x68, 0x61, 0x74, 0x4d, 0x73, 0x67, 0x10, 0xc9, 0x01, 0x12, 0x10, 0x0a, 0x0c, 0x5f, 0x43, 0x4d, - 0x47, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0x78, 0x12, 0x12, 0x0a, 0x0e, 0x5f, - 0x43, 0x4d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x10, 0x79, 0x12, - 0x13, 0x0a, 0x0f, 0x5f, 0x43, 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x54, 0x6f, 0x47, 0x75, 0x69, - 0x6c, 0x64, 0x10, 0x7a, 0x12, 0x0e, 0x0a, 0x0a, 0x5f, 0x43, 0x4d, 0x41, 0x70, 0x70, 0x72, 0x6f, - 0x76, 0x65, 0x10, 0x7b, 0x12, 0x0d, 0x0a, 0x09, 0x5f, 0x43, 0x4d, 0x52, 0x65, 0x6a, 0x65, 0x63, - 0x74, 0x10, 0x7c, 0x12, 0x11, 0x0a, 0x0d, 0x5f, 0x43, 0x4d, 0x4c, 0x65, 0x61, 0x76, 0x65, 0x47, - 0x75, 0x69, 0x6c, 0x64, 0x10, 0x7d, 0x12, 0x14, 0x0a, 0x10, 0x5f, 0x43, 0x4d, 0x44, 0x69, 0x73, - 0x6d, 0x69, 0x73, 0x73, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0x7e, 0x12, 0x14, 0x0a, 0x10, - 0x5f, 0x43, 0x4d, 0x50, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, - 0x10, 0x7f, 0x12, 0x14, 0x0a, 0x0f, 0x5f, 0x43, 0x4d, 0x44, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x4d, - 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0x80, 0x01, 0x12, 0x0f, 0x0a, 0x0a, 0x5f, 0x43, 0x4d, 0x44, - 0x69, 0x73, 0x62, 0x61, 0x6e, 0x64, 0x10, 0x81, 0x01, 0x12, 0x14, 0x0a, 0x0f, 0x5f, 0x43, 0x4d, - 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x10, 0x82, 0x01, 0x2a, - 0xeb, 0x04, 0x0a, 0x0d, 0x53, 0x4d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x64, 0x5f, - 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x5f, 0x53, 0x4d, 0x50, 0x69, 0x6e, 0x67, 0x10, 0x65, 0x12, 0x0f, - 0x0a, 0x0b, 0x5f, 0x53, 0x4d, 0x52, 0x70, 0x63, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x66, 0x12, - 0x0c, 0x0a, 0x08, 0x5f, 0x53, 0x4d, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x10, 0x67, 0x12, 0x10, 0x0a, - 0x0c, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x10, 0x68, 0x12, - 0x1c, 0x0a, 0x18, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x55, 0x73, 0x65, 0x72, - 0x42, 0x79, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x10, 0x69, 0x12, 0x11, 0x0a, - 0x0d, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x55, 0x73, 0x65, 0x72, 0x10, 0x6a, - 0x12, 0x17, 0x0a, 0x13, 0x5f, 0x53, 0x4d, 0x41, 0x64, 0x64, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x6b, 0x12, 0x1a, 0x0a, 0x16, 0x5f, 0x53, 0x4d, - 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x10, 0x6c, 0x12, 0x1a, 0x0a, 0x16, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6a, 0x65, - 0x63, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x10, - 0x6d, 0x12, 0x1f, 0x0a, 0x1b, 0x5f, 0x53, 0x4d, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x65, 0x6e, 0x64, - 0x69, 0x6e, 0x67, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x10, 0x6e, 0x12, 0x11, 0x0a, 0x0d, 0x5f, 0x53, 0x4d, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x72, 0x69, - 0x65, 0x6e, 0x64, 0x10, 0x6f, 0x12, 0x17, 0x0a, 0x13, 0x5f, 0x53, 0x4d, 0x44, 0x65, 0x6c, 0x65, - 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x68, 0x69, 0x70, 0x10, 0x70, 0x12, 0x13, - 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x41, 0x64, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x6c, 0x69, 0x73, - 0x74, 0x10, 0x71, 0x12, 0x16, 0x0a, 0x12, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, - 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x10, 0x72, 0x12, 0x11, 0x0a, 0x0d, 0x5f, - 0x53, 0x4d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0x73, 0x12, 0x10, - 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0x78, - 0x12, 0x12, 0x0a, 0x0e, 0x5f, 0x53, 0x4d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x47, 0x75, 0x69, - 0x6c, 0x64, 0x10, 0x79, 0x12, 0x13, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, - 0x54, 0x6f, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x10, 0x7a, 0x12, 0x0e, 0x0a, 0x0a, 0x5f, 0x53, 0x4d, - 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x10, 0x7b, 0x12, 0x0d, 0x0a, 0x09, 0x5f, 0x53, 0x4d, - 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x10, 0x7c, 0x12, 0x11, 0x0a, 0x0d, 0x5f, 0x53, 0x4d, 0x4c, - 0x65, 0x61, 0x76, 0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x10, 0x7d, 0x12, 0x14, 0x0a, 0x10, 0x5f, - 0x53, 0x4d, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, - 0x7e, 0x12, 0x14, 0x0a, 0x10, 0x5f, 0x53, 0x4d, 0x50, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x4d, - 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0x7f, 0x12, 0x14, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x44, 0x65, - 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0x80, 0x01, 0x12, 0x0f, 0x0a, - 0x0a, 0x5f, 0x53, 0x4d, 0x44, 0x69, 0x73, 0x62, 0x61, 0x6e, 0x64, 0x10, 0x81, 0x01, 0x12, 0x14, - 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x47, 0x75, 0x69, 0x6c, 0x64, - 0x73, 0x10, 0x82, 0x01, 0x12, 0x20, 0x0a, 0x1b, 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74, - 0x65, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4e, 0x6f, 0x74, - 0x69, 0x66, 0x79, 0x10, 0xc8, 0x01, 0x12, 0x15, 0x0a, 0x10, 0x5f, 0x53, 0x4d, 0x43, 0x68, 0x61, - 0x74, 0x4d, 0x73, 0x67, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, 0xc9, 0x01, 0x42, 0x06, 0x5a, - 0x04, 0x2e, 0x3b, 0x63, 0x73, + 0x68, 0x61, 0x74, 0x4d, 0x73, 0x67, 0x10, 0xc9, 0x01, 0x12, 0x20, 0x0a, 0x1b, 0x5f, 0x43, 0x4d, + 0x52, 0x65, 0x61, 0x64, 0x4d, 0x73, 0x67, 0x41, 0x6e, 0x64, 0x4f, 0x70, 0x65, 0x6e, 0x43, 0x68, + 0x61, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, 0xca, 0x01, 0x12, 0x17, 0x0a, 0x12, 0x5f, + 0x43, 0x4d, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x43, 0x68, 0x61, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, + 0x79, 0x10, 0xcb, 0x01, 0x12, 0x10, 0x0a, 0x0c, 0x5f, 0x43, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, + 0x49, 0x6e, 0x66, 0x6f, 0x10, 0x78, 0x12, 0x12, 0x0a, 0x0e, 0x5f, 0x43, 0x4d, 0x43, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x10, 0x79, 0x12, 0x13, 0x0a, 0x0f, 0x5f, 0x43, + 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x54, 0x6f, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x10, 0x7a, 0x12, + 0x0e, 0x0a, 0x0a, 0x5f, 0x43, 0x4d, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x10, 0x7b, 0x12, + 0x0d, 0x0a, 0x09, 0x5f, 0x43, 0x4d, 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x10, 0x7c, 0x12, 0x11, + 0x0a, 0x0d, 0x5f, 0x43, 0x4d, 0x4c, 0x65, 0x61, 0x76, 0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x10, + 0x7d, 0x12, 0x14, 0x0a, 0x10, 0x5f, 0x43, 0x4d, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x4d, + 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0x7e, 0x12, 0x14, 0x0a, 0x10, 0x5f, 0x43, 0x4d, 0x50, 0x72, + 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0x7f, 0x12, 0x14, 0x0a, + 0x0f, 0x5f, 0x43, 0x4d, 0x44, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, + 0x10, 0x80, 0x01, 0x12, 0x0f, 0x0a, 0x0a, 0x5f, 0x43, 0x4d, 0x44, 0x69, 0x73, 0x62, 0x61, 0x6e, + 0x64, 0x10, 0x81, 0x01, 0x12, 0x14, 0x0a, 0x0f, 0x5f, 0x43, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, + 0x68, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x10, 0x82, 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x43, + 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x10, 0x83, 0x01, 0x12, 0x11, 0x0a, + 0x0c, 0x5f, 0x43, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x6f, 0x67, 0x73, 0x10, 0x84, 0x01, + 0x2a, 0xf9, 0x05, 0x0a, 0x0d, 0x53, 0x4d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x64, + 0x5f, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x5f, 0x53, 0x4d, 0x50, 0x69, 0x6e, 0x67, 0x10, 0x65, 0x12, + 0x0f, 0x0a, 0x0b, 0x5f, 0x53, 0x4d, 0x52, 0x70, 0x63, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x66, + 0x12, 0x0c, 0x0a, 0x08, 0x5f, 0x53, 0x4d, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x10, 0x67, 0x12, 0x10, + 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x10, 0x68, + 0x12, 0x1c, 0x0a, 0x18, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x55, 0x73, 0x65, + 0x72, 0x42, 0x79, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x10, 0x69, 0x12, 0x11, + 0x0a, 0x0d, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x55, 0x73, 0x65, 0x72, 0x10, + 0x6a, 0x12, 0x17, 0x0a, 0x13, 0x5f, 0x53, 0x4d, 0x41, 0x64, 0x64, 0x46, 0x72, 0x69, 0x65, 0x6e, + 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x10, 0x6b, 0x12, 0x1a, 0x0a, 0x16, 0x5f, 0x53, + 0x4d, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x10, 0x6c, 0x12, 0x1a, 0x0a, 0x16, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6a, + 0x65, 0x63, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x10, 0x6d, 0x12, 0x1f, 0x0a, 0x1b, 0x5f, 0x53, 0x4d, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x65, 0x6e, + 0x64, 0x69, 0x6e, 0x67, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x10, 0x6e, 0x12, 0x11, 0x0a, 0x0d, 0x5f, 0x53, 0x4d, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x72, + 0x69, 0x65, 0x6e, 0x64, 0x10, 0x6f, 0x12, 0x17, 0x0a, 0x13, 0x5f, 0x53, 0x4d, 0x44, 0x65, 0x6c, + 0x65, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x68, 0x69, 0x70, 0x10, 0x70, 0x12, + 0x13, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x41, 0x64, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x6c, 0x69, + 0x73, 0x74, 0x10, 0x71, 0x12, 0x16, 0x0a, 0x12, 0x5f, 0x53, 0x4d, 0x52, 0x65, 0x6d, 0x6f, 0x76, + 0x65, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x10, 0x72, 0x12, 0x11, 0x0a, 0x0d, + 0x5f, 0x53, 0x4d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0x73, 0x12, + 0x10, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x10, + 0x78, 0x12, 0x12, 0x0a, 0x0e, 0x5f, 0x53, 0x4d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x47, 0x75, + 0x69, 0x6c, 0x64, 0x10, 0x79, 0x12, 0x13, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x6c, + 0x79, 0x54, 0x6f, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x10, 0x7a, 0x12, 0x0e, 0x0a, 0x0a, 0x5f, 0x53, + 0x4d, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x10, 0x7b, 0x12, 0x0d, 0x0a, 0x09, 0x5f, 0x53, + 0x4d, 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x10, 0x7c, 0x12, 0x11, 0x0a, 0x0d, 0x5f, 0x53, 0x4d, + 0x4c, 0x65, 0x61, 0x76, 0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x10, 0x7d, 0x12, 0x14, 0x0a, 0x10, + 0x5f, 0x53, 0x4d, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, + 0x10, 0x7e, 0x12, 0x14, 0x0a, 0x10, 0x5f, 0x53, 0x4d, 0x50, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, + 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0x7f, 0x12, 0x14, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x44, + 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0x80, 0x01, 0x12, 0x0f, + 0x0a, 0x0a, 0x5f, 0x53, 0x4d, 0x44, 0x69, 0x73, 0x62, 0x61, 0x6e, 0x64, 0x10, 0x81, 0x01, 0x12, + 0x14, 0x0a, 0x0f, 0x5f, 0x53, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x47, 0x75, 0x69, 0x6c, + 0x64, 0x73, 0x10, 0x82, 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x6c, + 0x79, 0x4c, 0x69, 0x73, 0x74, 0x10, 0x83, 0x01, 0x12, 0x11, 0x0a, 0x0c, 0x5f, 0x53, 0x4d, 0x47, + 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x6f, 0x67, 0x73, 0x10, 0x84, 0x01, 0x12, 0x20, 0x0a, 0x1b, 0x5f, + 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x64, 0x50, + 0x6f, 0x69, 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, 0xc8, 0x01, 0x12, 0x15, 0x0a, + 0x10, 0x5f, 0x53, 0x4d, 0x43, 0x68, 0x61, 0x74, 0x4d, 0x73, 0x67, 0x4e, 0x6f, 0x74, 0x69, 0x66, + 0x79, 0x10, 0xc9, 0x01, 0x12, 0x1c, 0x0a, 0x17, 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x52, 0x65, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, + 0xca, 0x01, 0x12, 0x27, 0x0a, 0x22, 0x5f, 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, + 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x52, 0x65, 0x64, 0x50, 0x6f, 0x69, + 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x10, 0xcb, 0x01, 0x12, 0x1f, 0x0a, 0x1a, 0x5f, + 0x53, 0x4d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6e, + 0x6e, 0x65, 0x6c, 0x4c, 0x61, 0x73, 0x74, 0x49, 0x64, 0x10, 0xcc, 0x01, 0x42, 0x06, 0x5a, 0x04, + 0x2e, 0x3b, 0x63, 0x73, } var ( diff --git a/server/imserver/cs/cs_proto.pb.go b/server/imserver/cs/cs_proto.pb.go index 4610a463..1e5b0f31 100644 --- a/server/imserver/cs/cs_proto.pb.go +++ b/server/imserver/cs/cs_proto.pb.go @@ -2722,7 +2722,7 @@ func (x *CMApplyToGuild) GetGuildId() int64 { return 0 } -// 回复创建公会 +// 回复申请加入公会 type SMApplyToGuild struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -2770,6 +2770,93 @@ func (x *SMApplyToGuild) GetErrMsg() string { return "" } +// 请求申请者列表 +type CMApplyList struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *CMApplyList) Reset() { + *x = CMApplyList{} + if protoimpl.UnsafeEnabled { + mi := &file_cs_proto_proto_msgTypes[50] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CMApplyList) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CMApplyList) ProtoMessage() {} + +func (x *CMApplyList) ProtoReflect() protoreflect.Message { + mi := &file_cs_proto_proto_msgTypes[50] + 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 CMApplyList.ProtoReflect.Descriptor instead. +func (*CMApplyList) Descriptor() ([]byte, []int) { + return file_cs_proto_proto_rawDescGZIP(), []int{50} +} + +// 回复申请者列表 +type SMApplyList struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + AccountId []string `protobuf:"bytes,1,rep,name=account_id,json=accountId" json:"account_id,omitempty"` +} + +func (x *SMApplyList) Reset() { + *x = SMApplyList{} + if protoimpl.UnsafeEnabled { + mi := &file_cs_proto_proto_msgTypes[51] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SMApplyList) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SMApplyList) ProtoMessage() {} + +func (x *SMApplyList) ProtoReflect() protoreflect.Message { + mi := &file_cs_proto_proto_msgTypes[51] + 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 SMApplyList.ProtoReflect.Descriptor instead. +func (*SMApplyList) Descriptor() ([]byte, []int) { + return file_cs_proto_proto_rawDescGZIP(), []int{51} +} + +func (x *SMApplyList) GetAccountId() []string { + if x != nil { + return x.AccountId + } + return nil +} + // 请求批准申请加入公会 type CMApprove struct { state protoimpl.MessageState @@ -2783,7 +2870,7 @@ type CMApprove struct { func (x *CMApprove) Reset() { *x = CMApprove{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[50] + mi := &file_cs_proto_proto_msgTypes[52] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2796,7 +2883,7 @@ func (x *CMApprove) String() string { func (*CMApprove) ProtoMessage() {} func (x *CMApprove) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[50] + mi := &file_cs_proto_proto_msgTypes[52] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2809,7 +2896,7 @@ func (x *CMApprove) ProtoReflect() protoreflect.Message { // Deprecated: Use CMApprove.ProtoReflect.Descriptor instead. func (*CMApprove) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{50} + return file_cs_proto_proto_rawDescGZIP(), []int{52} } func (x *CMApprove) GetGuildId() int64 { @@ -2838,7 +2925,7 @@ type SMApprove struct { func (x *SMApprove) Reset() { *x = SMApprove{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[51] + mi := &file_cs_proto_proto_msgTypes[53] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2851,7 +2938,7 @@ func (x *SMApprove) String() string { func (*SMApprove) ProtoMessage() {} func (x *SMApprove) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[51] + mi := &file_cs_proto_proto_msgTypes[53] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2864,7 +2951,7 @@ func (x *SMApprove) ProtoReflect() protoreflect.Message { // Deprecated: Use SMApprove.ProtoReflect.Descriptor instead. func (*SMApprove) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{51} + return file_cs_proto_proto_rawDescGZIP(), []int{53} } func (x *SMApprove) GetErrMsg() string { @@ -2874,7 +2961,7 @@ func (x *SMApprove) GetErrMsg() string { return "" } -// 请求批准申请加入公会 +// 请求拒绝加入公会 type CMReject struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -2887,7 +2974,7 @@ type CMReject struct { func (x *CMReject) Reset() { *x = CMReject{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[52] + mi := &file_cs_proto_proto_msgTypes[54] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2900,7 +2987,7 @@ func (x *CMReject) String() string { func (*CMReject) ProtoMessage() {} func (x *CMReject) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[52] + mi := &file_cs_proto_proto_msgTypes[54] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2913,7 +3000,7 @@ func (x *CMReject) ProtoReflect() protoreflect.Message { // Deprecated: Use CMReject.ProtoReflect.Descriptor instead. func (*CMReject) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{52} + return file_cs_proto_proto_rawDescGZIP(), []int{54} } func (x *CMReject) GetGuildId() int64 { @@ -2930,7 +3017,7 @@ func (x *CMReject) GetApplicantAccountId() string { return "" } -// 回复批准申请加入公会 +// 回复拒绝加入公会 type SMReject struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -2942,7 +3029,7 @@ type SMReject struct { func (x *SMReject) Reset() { *x = SMReject{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[53] + mi := &file_cs_proto_proto_msgTypes[55] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2955,7 +3042,7 @@ func (x *SMReject) String() string { func (*SMReject) ProtoMessage() {} func (x *SMReject) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[53] + mi := &file_cs_proto_proto_msgTypes[55] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2968,7 +3055,7 @@ func (x *SMReject) ProtoReflect() protoreflect.Message { // Deprecated: Use SMReject.ProtoReflect.Descriptor instead. func (*SMReject) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{53} + return file_cs_proto_proto_rawDescGZIP(), []int{55} } func (x *SMReject) GetErrMsg() string { @@ -2990,7 +3077,7 @@ type CMLeaveGuild struct { func (x *CMLeaveGuild) Reset() { *x = CMLeaveGuild{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[54] + mi := &file_cs_proto_proto_msgTypes[56] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3003,7 +3090,7 @@ func (x *CMLeaveGuild) String() string { func (*CMLeaveGuild) ProtoMessage() {} func (x *CMLeaveGuild) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[54] + mi := &file_cs_proto_proto_msgTypes[56] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3016,7 +3103,7 @@ func (x *CMLeaveGuild) ProtoReflect() protoreflect.Message { // Deprecated: Use CMLeaveGuild.ProtoReflect.Descriptor instead. func (*CMLeaveGuild) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{54} + return file_cs_proto_proto_rawDescGZIP(), []int{56} } func (x *CMLeaveGuild) GetGuildId() int64 { @@ -3038,7 +3125,7 @@ type SMLeaveGuild struct { func (x *SMLeaveGuild) Reset() { *x = SMLeaveGuild{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[55] + mi := &file_cs_proto_proto_msgTypes[57] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3051,7 +3138,7 @@ func (x *SMLeaveGuild) String() string { func (*SMLeaveGuild) ProtoMessage() {} func (x *SMLeaveGuild) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[55] + mi := &file_cs_proto_proto_msgTypes[57] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3064,7 +3151,7 @@ func (x *SMLeaveGuild) ProtoReflect() protoreflect.Message { // Deprecated: Use SMLeaveGuild.ProtoReflect.Descriptor instead. func (*SMLeaveGuild) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{55} + return file_cs_proto_proto_rawDescGZIP(), []int{57} } func (x *SMLeaveGuild) GetErrMsg() string { @@ -3087,7 +3174,7 @@ type CMDismissMember struct { func (x *CMDismissMember) Reset() { *x = CMDismissMember{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[56] + mi := &file_cs_proto_proto_msgTypes[58] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3100,7 +3187,7 @@ func (x *CMDismissMember) String() string { func (*CMDismissMember) ProtoMessage() {} func (x *CMDismissMember) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[56] + mi := &file_cs_proto_proto_msgTypes[58] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3113,7 +3200,7 @@ func (x *CMDismissMember) ProtoReflect() protoreflect.Message { // Deprecated: Use CMDismissMember.ProtoReflect.Descriptor instead. func (*CMDismissMember) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{56} + return file_cs_proto_proto_rawDescGZIP(), []int{58} } func (x *CMDismissMember) GetGuildId() int64 { @@ -3142,7 +3229,7 @@ type SMDismissMember struct { func (x *SMDismissMember) Reset() { *x = SMDismissMember{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[57] + mi := &file_cs_proto_proto_msgTypes[59] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3155,7 +3242,7 @@ func (x *SMDismissMember) String() string { func (*SMDismissMember) ProtoMessage() {} func (x *SMDismissMember) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[57] + mi := &file_cs_proto_proto_msgTypes[59] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3168,7 +3255,7 @@ func (x *SMDismissMember) ProtoReflect() protoreflect.Message { // Deprecated: Use SMDismissMember.ProtoReflect.Descriptor instead. func (*SMDismissMember) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{57} + return file_cs_proto_proto_rawDescGZIP(), []int{59} } func (x *SMDismissMember) GetErrMsg() string { @@ -3191,7 +3278,7 @@ type CMPromoteMember struct { func (x *CMPromoteMember) Reset() { *x = CMPromoteMember{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[58] + mi := &file_cs_proto_proto_msgTypes[60] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3204,7 +3291,7 @@ func (x *CMPromoteMember) String() string { func (*CMPromoteMember) ProtoMessage() {} func (x *CMPromoteMember) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[58] + mi := &file_cs_proto_proto_msgTypes[60] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3217,7 +3304,7 @@ func (x *CMPromoteMember) ProtoReflect() protoreflect.Message { // Deprecated: Use CMPromoteMember.ProtoReflect.Descriptor instead. func (*CMPromoteMember) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{58} + return file_cs_proto_proto_rawDescGZIP(), []int{60} } func (x *CMPromoteMember) GetGuildId() int64 { @@ -3246,7 +3333,7 @@ type SMPromoteMember struct { func (x *SMPromoteMember) Reset() { *x = SMPromoteMember{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[59] + mi := &file_cs_proto_proto_msgTypes[61] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3259,7 +3346,7 @@ func (x *SMPromoteMember) String() string { func (*SMPromoteMember) ProtoMessage() {} func (x *SMPromoteMember) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[59] + mi := &file_cs_proto_proto_msgTypes[61] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3272,7 +3359,7 @@ func (x *SMPromoteMember) ProtoReflect() protoreflect.Message { // Deprecated: Use SMPromoteMember.ProtoReflect.Descriptor instead. func (*SMPromoteMember) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{59} + return file_cs_proto_proto_rawDescGZIP(), []int{61} } func (x *SMPromoteMember) GetErrMsg() string { @@ -3295,7 +3382,7 @@ type CMDemoteMember struct { func (x *CMDemoteMember) Reset() { *x = CMDemoteMember{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[60] + mi := &file_cs_proto_proto_msgTypes[62] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3308,7 +3395,7 @@ func (x *CMDemoteMember) String() string { func (*CMDemoteMember) ProtoMessage() {} func (x *CMDemoteMember) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[60] + mi := &file_cs_proto_proto_msgTypes[62] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3321,7 +3408,7 @@ func (x *CMDemoteMember) ProtoReflect() protoreflect.Message { // Deprecated: Use CMDemoteMember.ProtoReflect.Descriptor instead. func (*CMDemoteMember) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{60} + return file_cs_proto_proto_rawDescGZIP(), []int{62} } func (x *CMDemoteMember) GetGuildId() int64 { @@ -3350,7 +3437,7 @@ type SMDemoteMember struct { func (x *SMDemoteMember) Reset() { *x = SMDemoteMember{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[61] + mi := &file_cs_proto_proto_msgTypes[63] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3363,7 +3450,7 @@ func (x *SMDemoteMember) String() string { func (*SMDemoteMember) ProtoMessage() {} func (x *SMDemoteMember) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[61] + mi := &file_cs_proto_proto_msgTypes[63] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3376,7 +3463,7 @@ func (x *SMDemoteMember) ProtoReflect() protoreflect.Message { // Deprecated: Use SMDemoteMember.ProtoReflect.Descriptor instead. func (*SMDemoteMember) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{61} + return file_cs_proto_proto_rawDescGZIP(), []int{63} } func (x *SMDemoteMember) GetErrMsg() string { @@ -3398,7 +3485,7 @@ type CMDisband struct { func (x *CMDisband) Reset() { *x = CMDisband{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[62] + mi := &file_cs_proto_proto_msgTypes[64] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3411,7 +3498,7 @@ func (x *CMDisband) String() string { func (*CMDisband) ProtoMessage() {} func (x *CMDisband) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[62] + mi := &file_cs_proto_proto_msgTypes[64] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3424,7 +3511,7 @@ func (x *CMDisband) ProtoReflect() protoreflect.Message { // Deprecated: Use CMDisband.ProtoReflect.Descriptor instead. func (*CMDisband) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{62} + return file_cs_proto_proto_rawDescGZIP(), []int{64} } func (x *CMDisband) GetGuildId() int64 { @@ -3446,7 +3533,7 @@ type SMDisband struct { func (x *SMDisband) Reset() { *x = SMDisband{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[63] + mi := &file_cs_proto_proto_msgTypes[65] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3459,7 +3546,7 @@ func (x *SMDisband) String() string { func (*SMDisband) ProtoMessage() {} func (x *SMDisband) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[63] + mi := &file_cs_proto_proto_msgTypes[65] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3472,7 +3559,7 @@ func (x *SMDisband) ProtoReflect() protoreflect.Message { // Deprecated: Use SMDisband.ProtoReflect.Descriptor instead. func (*SMDisband) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{63} + return file_cs_proto_proto_rawDescGZIP(), []int{65} } func (x *SMDisband) GetErrMsg() string { @@ -3494,7 +3581,7 @@ type CMSearchGuilds struct { func (x *CMSearchGuilds) Reset() { *x = CMSearchGuilds{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[64] + mi := &file_cs_proto_proto_msgTypes[66] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3507,7 +3594,7 @@ func (x *CMSearchGuilds) String() string { func (*CMSearchGuilds) ProtoMessage() {} func (x *CMSearchGuilds) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[64] + mi := &file_cs_proto_proto_msgTypes[66] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3520,7 +3607,7 @@ func (x *CMSearchGuilds) ProtoReflect() protoreflect.Message { // Deprecated: Use CMSearchGuilds.ProtoReflect.Descriptor instead. func (*CMSearchGuilds) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{64} + return file_cs_proto_proto_rawDescGZIP(), []int{66} } func (x *CMSearchGuilds) GetKeyword() string { @@ -3542,7 +3629,7 @@ type SMSearchGuilds struct { func (x *SMSearchGuilds) Reset() { *x = SMSearchGuilds{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[65] + mi := &file_cs_proto_proto_msgTypes[67] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3555,7 +3642,7 @@ func (x *SMSearchGuilds) String() string { func (*SMSearchGuilds) ProtoMessage() {} func (x *SMSearchGuilds) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[65] + mi := &file_cs_proto_proto_msgTypes[67] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3568,7 +3655,7 @@ func (x *SMSearchGuilds) ProtoReflect() protoreflect.Message { // Deprecated: Use SMSearchGuilds.ProtoReflect.Descriptor instead. func (*SMSearchGuilds) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{65} + return file_cs_proto_proto_rawDescGZIP(), []int{67} } func (x *SMSearchGuilds) GetGuilds() []*MFGuild { @@ -3593,7 +3680,7 @@ type MFGuild struct { func (x *MFGuild) Reset() { *x = MFGuild{} if protoimpl.UnsafeEnabled { - mi := &file_cs_proto_proto_msgTypes[66] + mi := &file_cs_proto_proto_msgTypes[68] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3606,7 +3693,7 @@ func (x *MFGuild) String() string { func (*MFGuild) ProtoMessage() {} func (x *MFGuild) ProtoReflect() protoreflect.Message { - mi := &file_cs_proto_proto_msgTypes[66] + mi := &file_cs_proto_proto_msgTypes[68] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3619,7 +3706,7 @@ func (x *MFGuild) ProtoReflect() protoreflect.Message { // Deprecated: Use MFGuild.ProtoReflect.Descriptor instead. func (*MFGuild) Descriptor() ([]byte, []int) { - return file_cs_proto_proto_rawDescGZIP(), []int{66} + return file_cs_proto_proto_rawDescGZIP(), []int{68} } func (x *MFGuild) GetGuildId() int64 { @@ -3657,6 +3744,164 @@ func (x *MFGuild) GetMaxMembers() int32 { return 0 } +// 请求公会日志 +type CMGuildLogs struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *CMGuildLogs) Reset() { + *x = CMGuildLogs{} + if protoimpl.UnsafeEnabled { + mi := &file_cs_proto_proto_msgTypes[69] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CMGuildLogs) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CMGuildLogs) ProtoMessage() {} + +func (x *CMGuildLogs) ProtoReflect() protoreflect.Message { + mi := &file_cs_proto_proto_msgTypes[69] + 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 CMGuildLogs.ProtoReflect.Descriptor instead. +func (*CMGuildLogs) Descriptor() ([]byte, []int) { + return file_cs_proto_proto_rawDescGZIP(), []int{69} +} + +// 回复公会日志 +type SMGuildLogs struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + GuildLogs []*MFGuildLog `protobuf:"bytes,1,rep,name=guildLogs" json:"guildLogs,omitempty"` +} + +func (x *SMGuildLogs) Reset() { + *x = SMGuildLogs{} + if protoimpl.UnsafeEnabled { + mi := &file_cs_proto_proto_msgTypes[70] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SMGuildLogs) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SMGuildLogs) ProtoMessage() {} + +func (x *SMGuildLogs) ProtoReflect() protoreflect.Message { + mi := &file_cs_proto_proto_msgTypes[70] + 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 SMGuildLogs.ProtoReflect.Descriptor instead. +func (*SMGuildLogs) Descriptor() ([]byte, []int) { + return file_cs_proto_proto_rawDescGZIP(), []int{70} +} + +func (x *SMGuildLogs) GetGuildLogs() []*MFGuildLog { + if x != nil { + return x.GuildLogs + } + return nil +} + +type MFGuildLog struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + GuildId *int64 `protobuf:"varint,1,opt,name=guild_id,json=guildId" json:"guild_id,omitempty"` + AccountId *string `protobuf:"bytes,2,opt,name=account_id,json=accountId" json:"account_id,omitempty"` + LogType *int32 `protobuf:"varint,3,opt,name=log_type,json=logType" json:"log_type,omitempty"` + Content *string `protobuf:"bytes,4,opt,name=content" json:"content,omitempty"` +} + +func (x *MFGuildLog) Reset() { + *x = MFGuildLog{} + if protoimpl.UnsafeEnabled { + mi := &file_cs_proto_proto_msgTypes[71] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *MFGuildLog) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*MFGuildLog) ProtoMessage() {} + +func (x *MFGuildLog) ProtoReflect() protoreflect.Message { + mi := &file_cs_proto_proto_msgTypes[71] + 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 MFGuildLog.ProtoReflect.Descriptor instead. +func (*MFGuildLog) Descriptor() ([]byte, []int) { + return file_cs_proto_proto_rawDescGZIP(), []int{71} +} + +func (x *MFGuildLog) GetGuildId() int64 { + if x != nil && x.GuildId != nil { + return *x.GuildId + } + return 0 +} + +func (x *MFGuildLog) GetAccountId() string { + if x != nil && x.AccountId != nil { + return *x.AccountId + } + return "" +} + +func (x *MFGuildLog) GetLogType() int32 { + if x != nil && x.LogType != nil { + return *x.LogType + } + return 0 +} + +func (x *MFGuildLog) GetContent() string { + if x != nil && x.Content != nil { + return *x.Content + } + return "" +} + var File_cs_proto_proto protoreflect.FileDescriptor var file_cs_proto_proto_rawDesc = []byte{ @@ -3894,75 +4139,92 @@ var file_cs_proto_proto_rawDesc = []byte{ 0x69, 0x6c, 0x64, 0x49, 0x64, 0x22, 0x29, 0x0a, 0x0e, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x54, 0x6f, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, - 0x22, 0x58, 0x0a, 0x09, 0x43, 0x4d, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x12, 0x19, 0x0a, - 0x08, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x64, 0x12, 0x30, 0x0a, 0x14, 0x61, 0x70, 0x70, 0x6c, - 0x69, 0x63, 0x61, 0x6e, 0x74, 0x5f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x69, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x6e, - 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x22, 0x24, 0x0a, 0x09, 0x53, 0x4d, - 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x5f, 0x6d, - 0x73, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, - 0x22, 0x57, 0x0a, 0x08, 0x43, 0x4d, 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x19, 0x0a, 0x08, - 0x67, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, - 0x67, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x64, 0x12, 0x30, 0x0a, 0x14, 0x61, 0x70, 0x70, 0x6c, 0x69, - 0x63, 0x61, 0x6e, 0x74, 0x5f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x6e, 0x74, - 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x22, 0x23, 0x0a, 0x08, 0x53, 0x4d, 0x52, - 0x65, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x22, 0x29, - 0x0a, 0x0c, 0x43, 0x4d, 0x4c, 0x65, 0x61, 0x76, 0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x12, 0x19, - 0x0a, 0x08, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x64, 0x22, 0x27, 0x0a, 0x0c, 0x53, 0x4d, 0x4c, - 0x65, 0x61, 0x76, 0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x65, 0x72, 0x72, - 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, - 0x73, 0x67, 0x22, 0x58, 0x0a, 0x0f, 0x43, 0x4d, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x4d, - 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x19, 0x0a, 0x08, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x64, - 0x12, 0x2a, 0x0a, 0x10, 0x64, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x41, 0x63, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x64, 0x69, 0x73, 0x6d, - 0x69, 0x73, 0x73, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x22, 0x2a, 0x0a, 0x0f, - 0x53, 0x4d, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, - 0x17, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x22, 0x58, 0x0a, 0x0f, 0x43, 0x4d, 0x50, 0x72, - 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x19, 0x0a, 0x08, 0x67, + 0x22, 0x0d, 0x0a, 0x0b, 0x43, 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x22, + 0x2c, 0x0a, 0x0b, 0x53, 0x4d, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1d, + 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x09, 0x52, 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x22, 0x58, 0x0a, + 0x09, 0x43, 0x4d, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x67, 0x75, + 0x69, 0x6c, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x67, 0x75, + 0x69, 0x6c, 0x64, 0x49, 0x64, 0x12, 0x30, 0x0a, 0x14, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, + 0x6e, 0x74, 0x5f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x12, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x6e, 0x74, 0x41, 0x63, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x22, 0x24, 0x0a, 0x09, 0x53, 0x4d, 0x41, 0x70, 0x70, + 0x72, 0x6f, 0x76, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x22, 0x57, 0x0a, + 0x08, 0x43, 0x4d, 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x19, 0x0a, 0x08, 0x67, 0x75, 0x69, + 0x6c, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x67, 0x75, 0x69, + 0x6c, 0x64, 0x49, 0x64, 0x12, 0x30, 0x0a, 0x14, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x6e, + 0x74, 0x5f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x12, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x6e, 0x74, 0x41, 0x63, 0x63, + 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x22, 0x23, 0x0a, 0x08, 0x53, 0x4d, 0x52, 0x65, 0x6a, 0x65, + 0x63, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x22, 0x29, 0x0a, 0x0c, 0x43, + 0x4d, 0x4c, 0x65, 0x61, 0x76, 0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x12, 0x19, 0x0a, 0x08, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x67, - 0x75, 0x69, 0x6c, 0x64, 0x49, 0x64, 0x12, 0x2a, 0x0a, 0x10, 0x70, 0x72, 0x6f, 0x6d, 0x6f, 0x74, - 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x10, 0x70, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x49, 0x64, 0x22, 0x2a, 0x0a, 0x0f, 0x53, 0x4d, 0x50, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x4d, - 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x17, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x22, 0x55, - 0x0a, 0x0e, 0x43, 0x4d, 0x44, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, - 0x12, 0x19, 0x0a, 0x08, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x0f, 0x64, - 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x64, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x63, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x49, 0x64, 0x22, 0x29, 0x0a, 0x0e, 0x53, 0x4d, 0x44, 0x65, 0x6d, 0x6f, 0x74, - 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x17, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x5f, 0x6d, - 0x73, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, - 0x22, 0x26, 0x0a, 0x09, 0x43, 0x4d, 0x44, 0x69, 0x73, 0x62, 0x61, 0x6e, 0x64, 0x12, 0x19, 0x0a, + 0x75, 0x69, 0x6c, 0x64, 0x49, 0x64, 0x22, 0x27, 0x0a, 0x0c, 0x53, 0x4d, 0x4c, 0x65, 0x61, 0x76, + 0x65, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, + 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x22, + 0x58, 0x0a, 0x0f, 0x43, 0x4d, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x4d, 0x65, 0x6d, 0x62, + 0x65, 0x72, 0x12, 0x19, 0x0a, 0x08, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x64, 0x12, 0x2a, 0x0a, + 0x10, 0x64, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, + 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x64, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, + 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x22, 0x2a, 0x0a, 0x0f, 0x53, 0x4d, 0x44, + 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x17, 0x0a, 0x07, + 0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, + 0x72, 0x72, 0x4d, 0x73, 0x67, 0x22, 0x58, 0x0a, 0x0f, 0x43, 0x4d, 0x50, 0x72, 0x6f, 0x6d, 0x6f, + 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x19, 0x0a, 0x08, 0x67, 0x75, 0x69, 0x6c, + 0x64, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, + 0x64, 0x49, 0x64, 0x12, 0x2a, 0x0a, 0x10, 0x70, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x63, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x70, + 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x22, + 0x2a, 0x0a, 0x0f, 0x53, 0x4d, 0x50, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, + 0x65, 0x72, 0x12, 0x17, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x22, 0x55, 0x0a, 0x0e, 0x43, + 0x4d, 0x44, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x19, 0x0a, 0x08, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x64, 0x22, 0x24, 0x0a, 0x09, 0x53, 0x4d, 0x44, 0x69, - 0x73, 0x62, 0x61, 0x6e, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x22, 0x2a, - 0x0a, 0x0e, 0x43, 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x73, - 0x12, 0x18, 0x0a, 0x07, 0x6b, 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x07, 0x6b, 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x22, 0x35, 0x0a, 0x0e, 0x53, 0x4d, - 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x12, 0x23, 0x0a, 0x06, - 0x67, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x63, - 0x73, 0x2e, 0x4d, 0x46, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x06, 0x67, 0x75, 0x69, 0x6c, 0x64, - 0x73, 0x22, 0x90, 0x01, 0x0a, 0x07, 0x4d, 0x46, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x12, 0x19, 0x0a, - 0x08, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1b, 0x0a, 0x09, - 0x6c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x08, 0x6c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x6d, - 0x62, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x65, 0x6d, 0x62, - 0x65, 0x72, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x6d, 0x61, 0x78, 0x5f, 0x6d, 0x65, 0x6d, 0x62, 0x65, - 0x72, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6d, 0x61, 0x78, 0x4d, 0x65, 0x6d, - 0x62, 0x65, 0x72, 0x73, 0x2a, 0x22, 0x0a, 0x0a, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, - 0x5f, 0x65, 0x12, 0x14, 0x0a, 0x0c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x56, 0x65, 0x72, 0x73, 0x69, - 0x6f, 0x6e, 0x10, 0xd1, 0xa2, 0xd5, 0xc4, 0x07, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x63, 0x73, + 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x0f, 0x64, 0x65, 0x6d, 0x6f, + 0x74, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0f, 0x64, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, + 0x49, 0x64, 0x22, 0x29, 0x0a, 0x0e, 0x53, 0x4d, 0x44, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x4d, 0x65, + 0x6d, 0x62, 0x65, 0x72, 0x12, 0x17, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x22, 0x26, 0x0a, + 0x09, 0x43, 0x4d, 0x44, 0x69, 0x73, 0x62, 0x61, 0x6e, 0x64, 0x12, 0x19, 0x0a, 0x08, 0x67, 0x75, + 0x69, 0x6c, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x67, 0x75, + 0x69, 0x6c, 0x64, 0x49, 0x64, 0x22, 0x24, 0x0a, 0x09, 0x53, 0x4d, 0x44, 0x69, 0x73, 0x62, 0x61, + 0x6e, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x22, 0x2a, 0x0a, 0x0e, 0x43, + 0x4d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x12, 0x18, 0x0a, + 0x07, 0x6b, 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, + 0x6b, 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x22, 0x35, 0x0a, 0x0e, 0x53, 0x4d, 0x53, 0x65, 0x61, + 0x72, 0x63, 0x68, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x12, 0x23, 0x0a, 0x06, 0x67, 0x75, 0x69, + 0x6c, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x63, 0x73, 0x2e, 0x4d, + 0x46, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x06, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x73, 0x22, 0x90, + 0x01, 0x0a, 0x07, 0x4d, 0x46, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x12, 0x19, 0x0a, 0x08, 0x67, 0x75, + 0x69, 0x6c, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x67, 0x75, + 0x69, 0x6c, 0x64, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x6c, 0x65, 0x61, + 0x64, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x65, + 0x61, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, + 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, + 0x12, 0x1f, 0x0a, 0x0b, 0x6d, 0x61, 0x78, 0x5f, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x18, + 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6d, 0x61, 0x78, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, + 0x73, 0x22, 0x0d, 0x0a, 0x0b, 0x43, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x6f, 0x67, 0x73, + 0x22, 0x3b, 0x0a, 0x0b, 0x53, 0x4d, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x6f, 0x67, 0x73, 0x12, + 0x2c, 0x0a, 0x09, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x6f, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x63, 0x73, 0x2e, 0x4d, 0x46, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4c, + 0x6f, 0x67, 0x52, 0x09, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x6f, 0x67, 0x73, 0x22, 0x7b, 0x0a, + 0x0a, 0x4d, 0x46, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x4c, 0x6f, 0x67, 0x12, 0x19, 0x0a, 0x08, 0x67, + 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x67, + 0x75, 0x69, 0x6c, 0x64, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x63, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x19, 0x0a, 0x08, 0x6c, 0x6f, 0x67, 0x5f, 0x74, 0x79, 0x70, + 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x6f, 0x67, 0x54, 0x79, 0x70, 0x65, + 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2a, 0x22, 0x0a, 0x0a, 0x43, 0x6f, + 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x5f, 0x65, 0x12, 0x14, 0x0a, 0x0c, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x10, 0xd1, 0xa2, 0xd5, 0xc4, 0x07, 0x42, 0x06, + 0x5a, 0x04, 0x2e, 0x3b, 0x63, 0x73, } var ( @@ -3978,7 +4240,7 @@ func file_cs_proto_proto_rawDescGZIP() []byte { } var file_cs_proto_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_cs_proto_proto_msgTypes = make([]protoimpl.MessageInfo, 67) +var file_cs_proto_proto_msgTypes = make([]protoimpl.MessageInfo, 72) var file_cs_proto_proto_goTypes = []interface{}{ (ConstantE)(0), // 0: cs.Constant_e (*CMPing)(nil), // 1: cs.CMPing @@ -4031,23 +4293,28 @@ var file_cs_proto_proto_goTypes = []interface{}{ (*SMCreateGuild)(nil), // 48: cs.SMCreateGuild (*CMApplyToGuild)(nil), // 49: cs.CMApplyToGuild (*SMApplyToGuild)(nil), // 50: cs.SMApplyToGuild - (*CMApprove)(nil), // 51: cs.CMApprove - (*SMApprove)(nil), // 52: cs.SMApprove - (*CMReject)(nil), // 53: cs.CMReject - (*SMReject)(nil), // 54: cs.SMReject - (*CMLeaveGuild)(nil), // 55: cs.CMLeaveGuild - (*SMLeaveGuild)(nil), // 56: cs.SMLeaveGuild - (*CMDismissMember)(nil), // 57: cs.CMDismissMember - (*SMDismissMember)(nil), // 58: cs.SMDismissMember - (*CMPromoteMember)(nil), // 59: cs.CMPromoteMember - (*SMPromoteMember)(nil), // 60: cs.SMPromoteMember - (*CMDemoteMember)(nil), // 61: cs.CMDemoteMember - (*SMDemoteMember)(nil), // 62: cs.SMDemoteMember - (*CMDisband)(nil), // 63: cs.CMDisband - (*SMDisband)(nil), // 64: cs.SMDisband - (*CMSearchGuilds)(nil), // 65: cs.CMSearchGuilds - (*SMSearchGuilds)(nil), // 66: cs.SMSearchGuilds - (*MFGuild)(nil), // 67: cs.MFGuild + (*CMApplyList)(nil), // 51: cs.CMApplyList + (*SMApplyList)(nil), // 52: cs.SMApplyList + (*CMApprove)(nil), // 53: cs.CMApprove + (*SMApprove)(nil), // 54: cs.SMApprove + (*CMReject)(nil), // 55: cs.CMReject + (*SMReject)(nil), // 56: cs.SMReject + (*CMLeaveGuild)(nil), // 57: cs.CMLeaveGuild + (*SMLeaveGuild)(nil), // 58: cs.SMLeaveGuild + (*CMDismissMember)(nil), // 59: cs.CMDismissMember + (*SMDismissMember)(nil), // 60: cs.SMDismissMember + (*CMPromoteMember)(nil), // 61: cs.CMPromoteMember + (*SMPromoteMember)(nil), // 62: cs.SMPromoteMember + (*CMDemoteMember)(nil), // 63: cs.CMDemoteMember + (*SMDemoteMember)(nil), // 64: cs.SMDemoteMember + (*CMDisband)(nil), // 65: cs.CMDisband + (*SMDisband)(nil), // 66: cs.SMDisband + (*CMSearchGuilds)(nil), // 67: cs.CMSearchGuilds + (*SMSearchGuilds)(nil), // 68: cs.SMSearchGuilds + (*MFGuild)(nil), // 69: cs.MFGuild + (*CMGuildLogs)(nil), // 70: cs.CMGuildLogs + (*SMGuildLogs)(nil), // 71: cs.SMGuildLogs + (*MFGuildLog)(nil), // 72: cs.MFGuildLog } var file_cs_proto_proto_depIdxs = []int32{ 34, // 0: cs.SMSearchUser.users:type_name -> cs.MFUser @@ -4055,14 +4322,15 @@ var file_cs_proto_proto_depIdxs = []int32{ 5, // 2: cs.CMReadMsgAndOpenChatNotify.last_ids:type_name -> cs.MFPair64 44, // 3: cs.SMChatMsgNotify.msg_list:type_name -> cs.MFChatMsg 5, // 4: cs.SMUpdateChatChannelLastId.last_ids:type_name -> cs.MFPair64 - 67, // 5: cs.SMGuildInfo.guild:type_name -> cs.MFGuild - 67, // 6: cs.SMGuildInfo.random_guilds:type_name -> cs.MFGuild - 67, // 7: cs.SMSearchGuilds.guilds:type_name -> cs.MFGuild - 8, // [8:8] is the sub-list for method output_type - 8, // [8:8] is the sub-list for method input_type - 8, // [8:8] is the sub-list for extension type_name - 8, // [8:8] is the sub-list for extension extendee - 0, // [0:8] is the sub-list for field type_name + 69, // 5: cs.SMGuildInfo.guild:type_name -> cs.MFGuild + 69, // 6: cs.SMGuildInfo.random_guilds:type_name -> cs.MFGuild + 69, // 7: cs.SMSearchGuilds.guilds:type_name -> cs.MFGuild + 72, // 8: cs.SMGuildLogs.guildLogs:type_name -> cs.MFGuildLog + 9, // [9:9] is the sub-list for method output_type + 9, // [9:9] is the sub-list for method input_type + 9, // [9:9] is the sub-list for extension type_name + 9, // [9:9] is the sub-list for extension extendee + 0, // [0:9] is the sub-list for field type_name } func init() { file_cs_proto_proto_init() } @@ -4672,7 +4940,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[50].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CMApprove); i { + switch v := v.(*CMApplyList); i { case 0: return &v.state case 1: @@ -4684,7 +4952,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[51].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMApprove); i { + switch v := v.(*SMApplyList); i { case 0: return &v.state case 1: @@ -4696,7 +4964,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[52].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CMReject); i { + switch v := v.(*CMApprove); i { case 0: return &v.state case 1: @@ -4708,7 +4976,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[53].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMReject); i { + switch v := v.(*SMApprove); i { case 0: return &v.state case 1: @@ -4720,7 +4988,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[54].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CMLeaveGuild); i { + switch v := v.(*CMReject); i { case 0: return &v.state case 1: @@ -4732,7 +5000,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[55].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMLeaveGuild); i { + switch v := v.(*SMReject); i { case 0: return &v.state case 1: @@ -4744,7 +5012,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[56].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CMDismissMember); i { + switch v := v.(*CMLeaveGuild); i { case 0: return &v.state case 1: @@ -4756,7 +5024,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[57].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMDismissMember); i { + switch v := v.(*SMLeaveGuild); i { case 0: return &v.state case 1: @@ -4768,7 +5036,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[58].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CMPromoteMember); i { + switch v := v.(*CMDismissMember); i { case 0: return &v.state case 1: @@ -4780,7 +5048,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[59].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMPromoteMember); i { + switch v := v.(*SMDismissMember); i { case 0: return &v.state case 1: @@ -4792,7 +5060,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[60].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CMDemoteMember); i { + switch v := v.(*CMPromoteMember); i { case 0: return &v.state case 1: @@ -4804,7 +5072,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[61].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMDemoteMember); i { + switch v := v.(*SMPromoteMember); i { case 0: return &v.state case 1: @@ -4816,7 +5084,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[62].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CMDisband); i { + switch v := v.(*CMDemoteMember); i { case 0: return &v.state case 1: @@ -4828,7 +5096,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[63].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMDisband); i { + switch v := v.(*SMDemoteMember); i { case 0: return &v.state case 1: @@ -4840,7 +5108,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[64].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CMSearchGuilds); i { + switch v := v.(*CMDisband); i { case 0: return &v.state case 1: @@ -4852,7 +5120,7 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[65].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SMSearchGuilds); i { + switch v := v.(*SMDisband); i { case 0: return &v.state case 1: @@ -4864,6 +5132,30 @@ func file_cs_proto_proto_init() { } } file_cs_proto_proto_msgTypes[66].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CMSearchGuilds); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_cs_proto_proto_msgTypes[67].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*SMSearchGuilds); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_cs_proto_proto_msgTypes[68].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MFGuild); i { case 0: return &v.state @@ -4875,6 +5167,42 @@ func file_cs_proto_proto_init() { return nil } } + file_cs_proto_proto_msgTypes[69].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CMGuildLogs); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_cs_proto_proto_msgTypes[70].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*SMGuildLogs); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_cs_proto_proto_msgTypes[71].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*MFGuildLog); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -4882,7 +5210,7 @@ func file_cs_proto_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_cs_proto_proto_rawDesc, NumEnums: 1, - NumMessages: 67, + NumMessages: 72, NumExtensions: 0, NumServices: 0, }, diff --git a/server/imserver/guild.go b/server/imserver/guild.go index 0946476f..7f8154c1 100644 --- a/server/imserver/guild.go +++ b/server/imserver/guild.go @@ -22,7 +22,7 @@ type Guild struct { type GuildLog struct { GuildId int64 AccountId string - LogType uint16 + LogType int32 Content string } diff --git a/server/imserver/guilddbmgr.go b/server/imserver/guilddbmgr.go index e2955267..16c5d009 100644 --- a/server/imserver/guilddbmgr.go +++ b/server/imserver/guilddbmgr.go @@ -43,7 +43,7 @@ func (gm *GuildMgr) loadGuildFromDBResult(err error, rows *f5.DataSet) { MaxMembers: maxMembers, } // push to gm.guilds - gm.Guilds[guildId] = newGuild + gm.guilds[guildId] = newGuild // init pendingReqs gm.pendingReqs[guildId] = make(map[string]bool) } @@ -83,7 +83,7 @@ func (gm *GuildMgr) loadGuildMemberFromDBResult(err error, rows *f5.DataSet) { AccountId: accountId, Level: level, } - if guild, ok := gm.Guilds[guildId]; ok { + if guild, ok := gm.guilds[guildId]; ok { err := guild.AddMember(guildMember) if err != nil { f5.GetSysLog().Info("Guild:%d member is full\n", guildId) @@ -152,15 +152,15 @@ func (gm *GuildMgr) loadGuildLogsFromDBResult(err error, pagination *f5.Paginati var ( guildId int64 accountId string - logType uint16 + logType int32 content string ) - gm.Logs[guildId] = make([]*GuildLog, DefaultLogs) + gm.guildLogs[guildId] = make([]*GuildLog, DefaultLogs) for pagination.Rows.Next() { guildId = q5.ToInt64(*pagination.Rows.GetByIndex(0)) accountId = q5.ToString(*pagination.Rows.GetByIndex(1)) - logType = uint16(q5.ToInt32(*pagination.Rows.GetByIndex(2))) + logType = q5.ToInt32(*pagination.Rows.GetByIndex(2)) content = q5.ToString(*pagination.Rows.GetByIndex(3)) guildLog := &GuildLog{ @@ -169,7 +169,7 @@ func (gm *GuildMgr) loadGuildLogsFromDBResult(err error, pagination *f5.Paginati LogType: logType, Content: content, } - gm.Logs[guildId] = append(gm.Logs[guildId], guildLog) + gm.guildLogs[guildId] = append(gm.guildLogs[guildId], guildLog) } q5.UnSetBitFlag(&gm.loadedFlags, LoadGuildLogFlag) } diff --git a/server/imserver/guildmgr.go b/server/imserver/guildmgr.go index a264fa51..7c590c35 100644 --- a/server/imserver/guildmgr.go +++ b/server/imserver/guildmgr.go @@ -17,18 +17,18 @@ const ( type GuildMgr struct { cs.MsgHandlerImpl - Guilds map[int64]*Guild // 公会ID -> 公会列表 + guilds map[int64]*Guild // 公会ID -> 公会列表 pendingReqs map[int64]map[string]bool // 公会ID -> 申请者账户ID -> bool - Logs map[int64][]*GuildLog // 公会ID -> 公会日志 + guildLogs map[int64][]*GuildLog // 公会ID -> 公会日志 loadedFlags int64 guildIds []int64 // 公会ids } func NewGuildMgr() *GuildMgr { return &GuildMgr{ - Guilds: make(map[int64]*Guild), + guilds: make(map[int64]*Guild), pendingReqs: make(map[int64]map[string]bool), - Logs: make(map[int64][]*GuildLog), + guildLogs: make(map[int64][]*GuildLog), } } @@ -65,7 +65,7 @@ func (gm *GuildMgr) CreateGuild(name string, leaderId string) (int64, error) { } guildId := f5.GetApp().NewUuid() - if _, exists := gm.Guilds[guildId]; exists { + if _, exists := gm.guilds[guildId]; exists { return 0, fmt.Errorf("CreateGuild fail") } @@ -84,7 +84,7 @@ func (gm *GuildMgr) CreateGuild(name string, leaderId string) (int64, error) { gm.createGuildDB(guild) gm.upsertGuildMember(guildId, &newMember) - gm.Guilds[guildId] = guild + gm.guilds[guildId] = guild gm.addGuildIds(guildId) return guildId, nil @@ -179,8 +179,8 @@ func (gm *GuildMgr) Reject(guildId int64, applicantAccountId string) error { // JoinGuild 直接加入公会 func (gm *GuildMgr) JoinGuild(guildId int64, accountId string) error { - guild, exists := gm.Guilds[guildId] - if !exists { + guild := gm.GetGuild(guildId) + if guild == nil { return fmt.Errorf("guild not found") } @@ -384,13 +384,14 @@ func (gm *GuildMgr) Disband(guildId int64, accountId string) error { gm.updateAllPendingReqs(guildId, PendingReqIsJoinGuildStatusDisband) guild.Members = nil - gm.Guilds[guildId] = nil + gm.guilds[guildId] = nil gm.pendingReqs[guildId] = nil - gm.Logs[guildId] = nil - delete(gm.Guilds, guildId) + gm.guildLogs[guildId] = nil + delete(gm.guilds, guildId) delete(gm.pendingReqs, guildId) - delete(gm.Logs, guildId) + delete(gm.guildLogs, guildId) + gm.RemoveGuildsId(guildId) logContent := fmt.Sprintf("GuildDisbanded[%d-%s]", guildId, guildName) gm.WriteLog(guildId, accountId, LogTypeDisband, logContent) @@ -398,16 +399,31 @@ func (gm *GuildMgr) Disband(guildId int64, accountId string) error { return nil } +func (gm *GuildMgr) RemoveGuildsId(guildId int64) { + guildIndex := -1 + for i, gId := range gm.guildIds { + if gId == guildId { + guildIndex = i + } + } + if guildIndex < 0 { + return + } + copy(gm.guildIds[guildIndex:], gm.guildIds[guildIndex+1:]) + gm.guildIds[len(gm.guildIds)-1] = 0 + gm.guildIds = gm.guildIds[:len(gm.guildIds)-1] +} + // WriteLog 记录公会日志 -func (gm *GuildMgr) WriteLog(guildId int64, accountId string, logType uint16, content string) { +func (gm *GuildMgr) WriteLog(guildId int64, accountId string, logType int32, content string) { guild := gm.GetGuild(guildId) if guild == nil { return } - _, exists := gm.Logs[guildId] + _, exists := gm.guildLogs[guildId] if !exists { - gm.Logs[guildId] = make([]*GuildLog, DefaultLogs) + gm.guildLogs[guildId] = make([]*GuildLog, DefaultLogs) } log := &GuildLog{ GuildId: guildId, @@ -415,18 +431,18 @@ func (gm *GuildMgr) WriteLog(guildId int64, accountId string, logType uint16, co LogType: logType, Content: content, } - gm.Logs[guildId] = append(gm.Logs[guildId], log) + gm.guildLogs[guildId] = append(gm.guildLogs[guildId], log) gm.insertGuildLog(log) } func (gm *GuildMgr) GetLogs(guildID int64) []*GuildLog { - return gm.Logs[guildID] + return gm.guildLogs[guildID] } // SearchGuilds 根据关键字搜索公会 func (gm *GuildMgr) SearchGuilds(keyword string) []*Guild { var results []*Guild - for _, guild := range gm.Guilds { + for _, guild := range gm.guilds { if containsSubstring(guild.Name, keyword) { results = append(results, guild) } @@ -436,12 +452,12 @@ func (gm *GuildMgr) SearchGuilds(keyword string) []*Guild { // RandomGuilds 随机10个公会 func (gm *GuildMgr) RandomGuilds() []*Guild { - count := len(gm.Guilds) + count := len(gm.guilds) var results []*Guild if count <= RandomGuildCount { for _, guildId := range gm.guildIds { - results = append(results, gm.Guilds[guildId]) + results = append(results, gm.guilds[guildId]) } return results } @@ -452,13 +468,13 @@ func (gm *GuildMgr) RandomGuilds() []*Guild { } for i := 0; i < RandomGuildCount; i++ { randGuildId := gm.guildIds[i] - results = append(results, gm.Guilds[randGuildId]) + results = append(results, gm.guilds[randGuildId]) } return results } func (gm *GuildMgr) GetGuild(guildId int64) *Guild { - if guild, exists := gm.Guilds[guildId]; exists { + if guild, exists := gm.guilds[guildId]; exists { return guild } return nil @@ -466,7 +482,7 @@ func (gm *GuildMgr) GetGuild(guildId int64) *Guild { // GetGuildByAccountId 查询我的工会 func (gm *GuildMgr) GetGuildByAccountId(accountId string) *Guild { - for _, guild := range gm.Guilds { + for _, guild := range gm.guilds { for _, member := range guild.Members { if accountId == member.AccountId { return guild @@ -484,7 +500,7 @@ func (gm *GuildMgr) Info(accountId string) (*Guild, map[string]bool, []*GuildLog if guild != nil { guildId := guild.GuildId pendingReqs = gm.pendingReqs[guildId] - guildLogs = gm.Logs[guildId] + guildLogs = gm.guildLogs[guildId] } return guild, pendingReqs, guildLogs @@ -515,8 +531,8 @@ func (gm *GuildMgr) GetGuildIdByAccountId(accountId string) int64 { } func (gm *GuildMgr) loadGuildIds() { - gm.guildIds = make([]int64, 0, len(gm.Guilds)) - for guildId, _ := range gm.Guilds { + gm.guildIds = make([]int64, 0, len(gm.guilds)) + for guildId := range gm.guilds { gm.guildIds = append(gm.guildIds, guildId) } } @@ -528,3 +544,17 @@ func (gm *GuildMgr) addGuildIds(guildId int64) { func containsSubstring(s, substr string) bool { return len(s) >= len(substr) && s[len(s)-len(substr):] == substr } + +func (gm *GuildMgr) GetAllPendingReqs(guildId int64) map[string]bool { + if pendingReq, exists := gm.pendingReqs[guildId]; exists { + return pendingReq + } + return nil +} + +func (gm *GuildMgr) GetGuildLogs(guildId int64) []*GuildLog { + if logs, exists := gm.guildLogs[guildId]; exists { + return logs + } + return nil +} diff --git a/server/imserver/player.go b/server/imserver/player.go index b4edade2..03a2b99e 100644 --- a/server/imserver/player.go +++ b/server/imserver/player.go @@ -328,7 +328,7 @@ func (p *Player) CMCreateGuild(hdr *f5.MsgHdr, msg *cs.CMCreateGuild) { wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg) } -// CMApplyToGuild 同意申请者加入公会 +// CMApplyToGuild 申请者加入公会 func (p *Player) CMApplyToGuild(hdr *f5.MsgHdr, msg *cs.CMApplyToGuild) { rspMsg := new(cs.SMApplyToGuild) err := guildMgr.ApplyToGuild( @@ -344,6 +344,22 @@ func (p *Player) CMApplyToGuild(hdr *f5.MsgHdr, msg *cs.CMApplyToGuild) { wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg) } +// CMApplyList 请求申请者列表 +func (p *Player) CMApplyList(hdr *f5.MsgHdr, msg *cs.CMApplyList) { + rspMsg := new(cs.SMApplyList) + guild := guildMgr.GetGuildByAccountId(p.accountId) + if guild == nil { + wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg) + return + } + for accountId, isPending := range guildMgr.GetAllPendingReqs(guild.GetGuildId()) { + if isPending { + rspMsg.AccountId = append(rspMsg.AccountId, accountId) + } + } + wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg) +} + // CMApprove 同意申请者加入公会 func (p *Player) CMApprove(hdr *f5.MsgHdr, msg *cs.CMApprove) { rspMsg := new(cs.SMApprove) @@ -471,6 +487,26 @@ func (p *Player) CMSearchGuilds(hdr *f5.MsgHdr, msg *cs.CMSearchGuilds) { wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg) } +// CMGuildLogs 请求公会日志 +func (p *Player) CMGuildLogs(hdr *f5.MsgHdr, msg *cs.CMGuildLogs) { + rspMsg := new(cs.SMGuildLogs) + guild := guildMgr.GetGuildByAccountId(p.accountId) + if guild == nil { + wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg) + return + } + for _, g := range guildMgr.GetGuildLogs(guild.GetGuildId()) { + guildLog := &cs.MFGuildLog{ + GuildId: &g.GuildId, + AccountId: &g.AccountId, + LogType: &g.LogType, + Content: &g.Content, + } + rspMsg.GuildLogs = append(rspMsg.GuildLogs, guildLog) + } + wspListener.sendProxyMsg(hdr.Conn, hdr.SocketHandle, rspMsg) +} + // FillGuild 填充公共列表 func (p *Player) FillGuild(guilds []*Guild) []*cs.MFGuild { var resGuilds []*cs.MFGuild diff --git a/server/imserver/proto/cs_msgid.proto b/server/imserver/proto/cs_msgid.proto index 37ddf3d7..0ebaf5d6 100644 --- a/server/imserver/proto/cs_msgid.proto +++ b/server/imserver/proto/cs_msgid.proto @@ -25,6 +25,8 @@ enum CMMessageId_e // 聊天相关 _CMSetCurrPrivateChatTarget = 200; _CMSendChatMsg = 201; + _CMReadMsgAndOpenChatNotify = 202; + _CMCloseChatNotify = 203; // 公会相关 @@ -39,6 +41,8 @@ enum CMMessageId_e _CMDemoteMember = 128; _CMDisband = 129; _CMSearchGuilds = 130; + _CMApplyList = 131; + _CMGuildLogs = 132; } enum SMMessageId_e @@ -72,8 +76,13 @@ enum SMMessageId_e _SMDemoteMember = 128; _SMDisband = 129; _SMSearchGuilds = 130; + _SMApplyList = 131; + _SMGuildLogs = 132; // 聊天相关 _SMUpdateChatRedPointNotify = 200; _SMChatMsgNotify = 201; + _SMUpdateRedPointNotify = 202; + _SMUpdatePrivateChatRedPointNotify = 203; + _SMUpdateChatChannelLastId = 204; } diff --git a/server/imserver/proto/cs_proto.proto b/server/imserver/proto/cs_proto.proto index 2ba57b15..f7d2d6eb 100644 --- a/server/imserver/proto/cs_proto.proto +++ b/server/imserver/proto/cs_proto.proto @@ -365,19 +365,27 @@ message SMCreateGuild optional string err_msg = 2; } - // 请求申请加入公会 message CMApplyToGuild { optional int64 guild_id = 1; } -// 回复创建公会 +// 回复申请加入公会 message SMApplyToGuild { optional string err_msg = 1; } +// 请求申请者列表 +message CMApplyList{} + +// 回复申请者列表 +message SMApplyList +{ + repeated string account_id = 1; +} + // 请求批准申请加入公会 message CMApprove { @@ -391,14 +399,14 @@ message SMApprove optional string err_msg = 1; } -// 请求批准申请加入公会 +// 请求拒绝加入公会 message CMReject { optional int64 guild_id = 1; optional string applicant_account_id = 2; } -// 回复批准申请加入公会 +// 回复拒绝加入公会 message SMReject { optional string err_msg = 1; @@ -484,4 +492,20 @@ message MFGuild { optional string leader_id = 3; optional int32 members = 4; optional int32 max_members = 5; -} \ No newline at end of file +} + +// 请求公会日志 +message CMGuildLogs{} + +// 回复公会日志 +message SMGuildLogs +{ + repeated MFGuildLog guildLogs = 1; +} + +message MFGuildLog { + optional int64 guild_id = 1; + optional string account_id = 2; + optional int32 log_type = 3; + optional string content = 4; +}