diff options
Diffstat (limited to 'src/server/proto/Client/api')
5 files changed, 96 insertions, 47 deletions
diff --git a/src/server/proto/Client/api/client/v1/channel_id.pb.cc b/src/server/proto/Client/api/client/v1/channel_id.pb.cc index b8f0c3c24b9..56a9abb9df0 100644 --- a/src/server/proto/Client/api/client/v1/channel_id.pb.cc +++ b/src/server/proto/Client/api/client/v1/channel_id.pb.cc @@ -36,10 +36,11 @@ void protobuf_AssignDesc_api_2fclient_2fv1_2fchannel_5fid_2eproto() { "api/client/v1/channel_id.proto"); GOOGLE_CHECK(file != NULL); ChannelId_descriptor_ = file->message_type(0); - static const int ChannelId_offsets_[3] = { + static const int ChannelId_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChannelId, type_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChannelId, host_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChannelId, id_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChannelId, region_), }; ChannelId_reflection_ = new ::google::protobuf::internal::GeneratedMessageReflection( @@ -84,10 +85,10 @@ void protobuf_AddDesc_api_2fclient_2fv1_2fchannel_5fid_2eproto() { ::bgs::protocol::protobuf_AddDesc_rpc_5ftypes_2eproto(); ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( "\n\036api/client/v1/channel_id.proto\022\027bgs.pr" - "otocol.channel.v1\032\017rpc_types.proto\"T\n\tCh" + "otocol.channel.v1\032\017rpc_types.proto\"d\n\tCh" "annelId\022\014\n\004type\030\001 \001(\r\022%\n\004host\030\002 \001(\0132\027.bg" - "s.protocol.ProcessId\022\n\n\002id\030\003 \001(\007:\006\202\371+\002\010\001" - "B\002H\002", 164); + "s.protocol.ProcessId\022\n\n\002id\030\003 \001(\007\022\016\n\006regi" + "on\030\004 \001(\r:\006\202\371+\002\010\001B\002H\002", 180); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "api/client/v1/channel_id.proto", &protobuf_RegisterTypes); ChannelId::default_instance_ = new ChannelId(); @@ -107,6 +108,7 @@ struct StaticDescriptorInitializer_api_2fclient_2fv1_2fchannel_5fid_2eproto { const int ChannelId::kTypeFieldNumber; const int ChannelId::kHostFieldNumber; const int ChannelId::kIdFieldNumber; +const int ChannelId::kRegionFieldNumber; #endif // !_MSC_VER ChannelId::ChannelId() @@ -131,6 +133,7 @@ void ChannelId::SharedCtor() { type_ = 0u; host_ = NULL; id_ = 0u; + region_ = 0u; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } diff --git a/src/server/proto/Client/api/client/v1/channel_id.pb.h b/src/server/proto/Client/api/client/v1/channel_id.pb.h index 0628bd757fb..392776ca3f6 100644 --- a/src/server/proto/Client/api/client/v1/channel_id.pb.h +++ b/src/server/proto/Client/api/client/v1/channel_id.pb.h @@ -105,6 +105,13 @@ class TC_PROTO_API ChannelId : public ::google::protobuf::Message { inline ::google::protobuf::uint32 id() const; inline void set_id(::google::protobuf::uint32 value); + // optional uint32 region = 4; + inline bool has_region() const; + inline void clear_region(); + static const int kRegionFieldNumber = 4; + inline ::google::protobuf::uint32 region() const; + inline void set_region(::google::protobuf::uint32 value); + // @@protoc_insertion_point(class_scope:bgs.protocol.channel.v1.ChannelId) private: inline void set_has_type(); @@ -113,6 +120,8 @@ class TC_PROTO_API ChannelId : public ::google::protobuf::Message { inline void clear_has_host(); inline void set_has_id(); inline void clear_has_id(); + inline void set_has_region(); + inline void clear_has_region(); ::google::protobuf::UnknownFieldSet _unknown_fields_; @@ -121,6 +130,7 @@ class TC_PROTO_API ChannelId : public ::google::protobuf::Message { ::bgs::protocol::ProcessId* host_; ::google::protobuf::uint32 type_; ::google::protobuf::uint32 id_; + ::google::protobuf::uint32 region_; friend void TC_PROTO_API protobuf_AddDesc_api_2fclient_2fv1_2fchannel_5fid_2eproto(); friend void protobuf_AssignDesc_api_2fclient_2fv1_2fchannel_5fid_2eproto(); friend void protobuf_ShutdownFile_api_2fclient_2fv1_2fchannel_5fid_2eproto(); @@ -225,6 +235,30 @@ inline void ChannelId::set_id(::google::protobuf::uint32 value) { // @@protoc_insertion_point(field_set:bgs.protocol.channel.v1.ChannelId.id) } +// optional uint32 region = 4; +inline bool ChannelId::has_region() const { + return (_has_bits_[0] & 0x00000008u) != 0; +} +inline void ChannelId::set_has_region() { + _has_bits_[0] |= 0x00000008u; +} +inline void ChannelId::clear_has_region() { + _has_bits_[0] &= ~0x00000008u; +} +inline void ChannelId::clear_region() { + region_ = 0u; + clear_has_region(); +} +inline ::google::protobuf::uint32 ChannelId::region() const { + // @@protoc_insertion_point(field_get:bgs.protocol.channel.v1.ChannelId.region) + return region_; +} +inline void ChannelId::set_region(::google::protobuf::uint32 value) { + set_has_region(); + region_ = value; + // @@protoc_insertion_point(field_set:bgs.protocol.channel.v1.ChannelId.region) +} + // @@protoc_insertion_point(namespace_scope) } // namespace v1 diff --git a/src/server/proto/Client/api/client/v2/report_service.pb.cc b/src/server/proto/Client/api/client/v2/report_service.pb.cc index ff7797245dd..12bdd22653d 100644 --- a/src/server/proto/Client/api/client/v2/report_service.pb.cc +++ b/src/server/proto/Client/api/client/v2/report_service.pb.cc @@ -102,19 +102,20 @@ void protobuf_AddDesc_api_2fclient_2fv2_2freport_5fservice_2eproto() { "\n\"api/client/v2/report_service.proto\022\026bg" "s.protocol.report.v2\032\023account_types.prot" "o\032 api/client/v2/report_types.proto\032\017rpc" - "_types.proto\"\250\002\n\023SubmitReportRequest\0224\n\010" + "_types.proto\"\260\002\n\023SubmitReportRequest\0224\n\010" "agent_id\030\001 \001(\0132\".bgs.protocol.account.v1" ".AccountId\022\030\n\020user_description\030\002 \001(\t\022;\n\014" "user_options\030\n \001(\0132#.bgs.protocol.report" ".v2.UserOptionsH\000\022;\n\014club_options\030\013 \001(\0132" "#.bgs.protocol.report.v2.ClubOptionsH\000\022\?" "\n\016entity_options\030\024 \001(\0132%.bgs.protocol.re" - "port.v2.EntityOptionsH\000B\006\n\004type2\245\001\n\rRepo" - "rtService\022Y\n\014SubmitReport\022+.bgs.protocol" - ".report.v2.SubmitReportRequest\032\024.bgs.pro" - "tocol.NoData\"\006\202\371+\002\010\001\0329\202\371+/\n%bnet.protoco" - "l.report.v2.ReportService*\006report\212\371+\002\020\001B" - "\005H\002\200\001\000", 606); + "port.v2.EntityOptionsH\000:\006\202\371+\002\010\001B\006\n\004type2" + "\302\001\n\rReportService\022t\n\014SubmitReport\022+.bgs." + "protocol.report.v2.SubmitReportRequest\032\024" + ".bgs.protocol.NoData\"!\202\371+\035\010\001B\031ResolveSub" + "mitReportRegion\032;\202\371+1\n%bnet.protocol.rep" + "ort.v2.ReportService*\006reportH\001\212\371+\002\020\001B\005H\002" + "\200\001\000", 643); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "api/client/v2/report_service.proto", &protobuf_RegisterTypes); SubmitReportRequest::default_instance_ = new SubmitReportRequest(); diff --git a/src/server/proto/Client/api/client/v2/report_types.pb.cc b/src/server/proto/Client/api/client/v2/report_types.pb.cc index 4ced87b4f59..33794e7fe54 100644 --- a/src/server/proto/Client/api/client/v2/report_types.pb.cc +++ b/src/server/proto/Client/api/client/v2/report_types.pb.cc @@ -169,41 +169,44 @@ void protobuf_AddDesc_api_2fclient_2fv2_2freport_5ftypes_2eproto() { ::bgs::protocol::v2::protobuf_AddDesc_api_2fclient_2fv2_2fattribute_5ftypes_2eproto(); ::bgs::protocol::account::v1::protobuf_AddDesc_account_5ftypes_2eproto(); - ::bgs::protocol::protobuf_AddDesc_rpc_5ftypes_2eproto(); ::bgs::protocol::protobuf_AddDesc_message_5ftypes_2eproto(); + ::bgs::protocol::protobuf_AddDesc_global_5fextensions_2ffield_5foptions_2eproto(); ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( "\n api/client/v2/report_types.proto\022\026bgs." "protocol.report.v2\032#api/client/v2/attrib" - "ute_types.proto\032\023account_types.proto\032\017rp" - "c_types.proto\032\023message_types.proto\"C\n\nRe" - "portItem\022-\n\nmessage_id\030\001 \001(\0132\027.bgs.proto" - "col.MessageIdH\000B\006\n\004type\"\333\001\n\013UserOptions\022" - "5\n\ttarget_id\030\001 \001(\0132\".bgs.protocol.accoun" - "t.v1.AccountId\022/\n\004type\030\002 \001(\0162!.bgs.proto" - "col.report.v2.IssueType\0222\n\006source\030\003 \001(\0162" - "\".bgs.protocol.report.v2.UserSource\0220\n\004i" - "tem\030\004 \001(\0132\".bgs.protocol.report.v2.Repor" - "tItem\"\310\001\n\013ClubOptions\022\017\n\007club_id\030\001 \001(\004\022\021" - "\n\tstream_id\030\002 \001(\004\022/\n\004type\030\003 \001(\0162!.bgs.pr" - "otocol.report.v2.IssueType\0222\n\006source\030\004 \001" - "(\0162\".bgs.protocol.report.v2.ClubSource\0220" - "\n\004item\030\005 \001(\0132\".bgs.protocol.report.v2.Re" - "portItem\"\203\001\n\rEntityOptions\022 \n\tentity_id\030" - "\001 \001(\tB\r\212\371+\t\"\007\n\005\010\001\020\310\001\022!\n\013entity_type\030\002 \001(" - "\tB\014\212\371+\010\"\006\n\004\010\001\020d\022-\n\tattribute\030\005 \003(\0132\032.bgs" - ".protocol.v2.Attribute*\215\001\n\tIssueType\022\023\n\017" - "ISSUE_TYPE_SPAM\020\000\022\031\n\025ISSUE_TYPE_HARASSME" - "NT\020\001\022 \n\034ISSUE_TYPE_OFFENSIVE_CONTENT\020\003\022\026" - "\n\022ISSUE_TYPE_HACKING\020\004\022\026\n\022ISSUE_TYPE_BOT" - "TING\020\005*\301\001\n\nUserSource\022\025\n\021USER_SOURCE_OTH" - "ER\020\000\022\027\n\023USER_SOURCE_WHISPER\020\001\022\027\n\023USER_SO" - "URCE_PROFILE\020\002\022\032\n\026USER_SOURCE_BATTLE_TAG" - "\020\003\022\024\n\020USER_SOURCE_CHAT\020\004\022!\n\035USER_SOURCE_" - "FRIEND_INVITATION\020\005\022\025\n\021USER_SOURCE_VOICE" - "\020\006*t\n\nClubSource\022\025\n\021CLUB_SOURCE_OTHER\020\000\022" - "\027\n\023CLUB_SOURCE_MESSAGE\020\001\022\031\n\025CLUB_SOURCE_" - "CLUB_NAME\020\002\022\033\n\027CLUB_SOURCE_STREAM_NAME\020\003" - "B\005H\002\200\001\000", 1247); + "ute_types.proto\032\023account_types.proto\032\023me" + "ssage_types.proto\032%global_extensions/fie" + "ld_options.proto\"C\n\nReportItem\022-\n\nmessag" + "e_id\030\001 \001(\0132\027.bgs.protocol.MessageIdH\000B\006\n" + "\004type\"\333\001\n\013UserOptions\0225\n\ttarget_id\030\001 \001(\013" + "2\".bgs.protocol.account.v1.AccountId\022/\n\004" + "type\030\002 \001(\0162!.bgs.protocol.report.v2.Issu" + "eType\0222\n\006source\030\003 \001(\0162\".bgs.protocol.rep" + "ort.v2.UserSource\0220\n\004item\030\004 \001(\0132\".bgs.pr" + "otocol.report.v2.ReportItem\"\310\001\n\013ClubOpti" + "ons\022\017\n\007club_id\030\001 \001(\004\022\021\n\tstream_id\030\002 \001(\004\022" + "/\n\004type\030\003 \001(\0162!.bgs.protocol.report.v2.I" + "ssueType\0222\n\006source\030\004 \001(\0162\".bgs.protocol." + "report.v2.ClubSource\0220\n\004item\030\005 \001(\0132\".bgs" + ".protocol.report.v2.ReportItem\"\203\001\n\rEntit" + "yOptions\022 \n\tentity_id\030\001 \001(\tB\r\212\371+\t\"\007\n\005\010\001\020" + "\310\001\022!\n\013entity_type\030\002 \001(\tB\014\212\371+\010\"\006\n\004\010\001\020d\022-\n" + "\tattribute\030\005 \003(\0132\032.bgs.protocol.v2.Attri" + "bute*\215\001\n\tIssueType\022\023\n\017ISSUE_TYPE_SPAM\020\000\022" + "\031\n\025ISSUE_TYPE_HARASSMENT\020\001\022 \n\034ISSUE_TYPE" + "_OFFENSIVE_CONTENT\020\003\022\026\n\022ISSUE_TYPE_HACKI" + "NG\020\004\022\026\n\022ISSUE_TYPE_BOTTING\020\005*\301\001\n\nUserSou" + "rce\022\025\n\021USER_SOURCE_OTHER\020\000\022\027\n\023USER_SOURC" + "E_WHISPER\020\001\022\027\n\023USER_SOURCE_PROFILE\020\002\022\032\n\026" + "USER_SOURCE_BATTLE_TAG\020\003\022\024\n\020USER_SOURCE_" + "CHAT\020\004\022!\n\035USER_SOURCE_FRIEND_INVITATION\020" + "\005\022\025\n\021USER_SOURCE_VOICE\020\006*\361\001\n\nClubSource\022" + "\024\n\020CLUB_SOURCE_NONE\020\000\022\027\n\023CLUB_SOURCE_MES" + "SAGE\020\001\022\031\n\025CLUB_SOURCE_CLUB_NAME\020\002\022\033\n\027CLU" + "B_SOURCE_STREAM_NAME\020\003\022\031\n\025CLUB_SOURCE_BR" + "OADCAST\020\004\022\037\n\033CLUB_SOURCE_CLUB_SHORT_NAME" + "\020\005\022 \n\034CLUB_SOURCE_CLUB_DESCRIPTION\020\006\022\036\n\032" + "CLUB_SOURCE_STREAM_SUBJECT\020\007B\005H\002\200\001\000", 1395); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "api/client/v2/report_types.proto", &protobuf_RegisterTypes); ReportItem::default_instance_ = new ReportItem(); @@ -270,6 +273,10 @@ bool ClubSource_IsValid(int value) { case 1: case 2: case 3: + case 4: + case 5: + case 6: + case 7: return true; default: return false; diff --git a/src/server/proto/Client/api/client/v2/report_types.pb.h b/src/server/proto/Client/api/client/v2/report_types.pb.h index 77dac294ebc..3a03f338658 100644 --- a/src/server/proto/Client/api/client/v2/report_types.pb.h +++ b/src/server/proto/Client/api/client/v2/report_types.pb.h @@ -27,8 +27,8 @@ #include <google/protobuf/unknown_field_set.h> #include "api/client/v2/attribute_types.pb.h" #include "account_types.pb.h" -#include "rpc_types.pb.h" #include "message_types.pb.h" +#include "global_extensions/field_options.pb.h" #include "Define.h" // for TC_PROTO_API // @@protoc_insertion_point(includes) @@ -94,14 +94,18 @@ inline bool UserSource_Parse( UserSource_descriptor(), name, value); } enum ClubSource { - CLUB_SOURCE_OTHER = 0, + CLUB_SOURCE_NONE = 0, CLUB_SOURCE_MESSAGE = 1, CLUB_SOURCE_CLUB_NAME = 2, - CLUB_SOURCE_STREAM_NAME = 3 + CLUB_SOURCE_STREAM_NAME = 3, + CLUB_SOURCE_BROADCAST = 4, + CLUB_SOURCE_CLUB_SHORT_NAME = 5, + CLUB_SOURCE_CLUB_DESCRIPTION = 6, + CLUB_SOURCE_STREAM_SUBJECT = 7 }; TC_PROTO_API bool ClubSource_IsValid(int value); -const ClubSource ClubSource_MIN = CLUB_SOURCE_OTHER; -const ClubSource ClubSource_MAX = CLUB_SOURCE_STREAM_NAME; +const ClubSource ClubSource_MIN = CLUB_SOURCE_NONE; +const ClubSource ClubSource_MAX = CLUB_SOURCE_STREAM_SUBJECT; const int ClubSource_ARRAYSIZE = ClubSource_MAX + 1; TC_PROTO_API const ::google::protobuf::EnumDescriptor* ClubSource_descriptor(); |