diff options
49 files changed, 11151 insertions, 7373 deletions
diff --git a/src/server/proto/Client/account_service.pb.cc b/src/server/proto/Client/account_service.pb.cc index 7a144fa2403..4f729fcd000 100644 --- a/src/server/proto/Client/account_service.pb.cc +++ b/src/server/proto/Client/account_service.pb.cc @@ -93,9 +93,6 @@ const ::google::protobuf::internal::GeneratedMessageReflection* const ::google::protobuf::Descriptor* GetAuthorizedDataResponse_descriptor_ = NULL; const ::google::protobuf::internal::GeneratedMessageReflection* GetAuthorizedDataResponse_reflection_ = NULL; -const ::google::protobuf::Descriptor* UpdateParentalControlsAndCAISRequest_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - UpdateParentalControlsAndCAISRequest_reflection_ = NULL; const ::google::protobuf::Descriptor* AccountStateNotification_descriptor_ = NULL; const ::google::protobuf::internal::GeneratedMessageReflection* AccountStateNotification_reflection_ = NULL; @@ -471,27 +468,7 @@ void protobuf_AssignDesc_account_5fservice_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(GetAuthorizedDataResponse)); - UpdateParentalControlsAndCAISRequest_descriptor_ = file->message_type(22); - static const int UpdateParentalControlsAndCAISRequest_offsets_[6] = { - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateParentalControlsAndCAISRequest, account_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateParentalControlsAndCAISRequest, parental_control_info_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateParentalControlsAndCAISRequest, cais_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateParentalControlsAndCAISRequest, session_start_time_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateParentalControlsAndCAISRequest, start_time_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateParentalControlsAndCAISRequest, end_time_), - }; - UpdateParentalControlsAndCAISRequest_reflection_ = - new ::google::protobuf::internal::GeneratedMessageReflection( - UpdateParentalControlsAndCAISRequest_descriptor_, - UpdateParentalControlsAndCAISRequest::default_instance_, - UpdateParentalControlsAndCAISRequest_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateParentalControlsAndCAISRequest, _has_bits_[0]), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateParentalControlsAndCAISRequest, _unknown_fields_), - -1, - ::google::protobuf::DescriptorPool::generated_pool(), - ::google::protobuf::MessageFactory::generated_factory(), - sizeof(UpdateParentalControlsAndCAISRequest)); - AccountStateNotification_descriptor_ = file->message_type(23); + AccountStateNotification_descriptor_ = file->message_type(22); static const int AccountStateNotification_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountStateNotification, account_state_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountStateNotification, subscriber_id_), @@ -509,7 +486,7 @@ void protobuf_AssignDesc_account_5fservice_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(AccountStateNotification)); - GameAccountStateNotification_descriptor_ = file->message_type(24); + GameAccountStateNotification_descriptor_ = file->message_type(23); static const int GameAccountStateNotification_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameAccountStateNotification, game_account_state_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameAccountStateNotification, subscriber_id_), @@ -527,7 +504,7 @@ void protobuf_AssignDesc_account_5fservice_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(GameAccountStateNotification)); - GameAccountNotification_descriptor_ = file->message_type(25); + GameAccountNotification_descriptor_ = file->message_type(24); static const int GameAccountNotification_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameAccountNotification, game_accounts_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameAccountNotification, subscriber_id_), @@ -544,7 +521,7 @@ void protobuf_AssignDesc_account_5fservice_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(GameAccountNotification)); - GameAccountSessionNotification_descriptor_ = file->message_type(26); + GameAccountSessionNotification_descriptor_ = file->message_type(25); static const int GameAccountSessionNotification_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameAccountSessionNotification, game_account_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GameAccountSessionNotification, session_info_), @@ -619,8 +596,6 @@ void protobuf_RegisterTypes(const ::std::string&) { ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( GetAuthorizedDataResponse_descriptor_, &GetAuthorizedDataResponse::default_instance()); ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - UpdateParentalControlsAndCAISRequest_descriptor_, &UpdateParentalControlsAndCAISRequest::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( AccountStateNotification_descriptor_, &AccountStateNotification::default_instance()); ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( GameAccountStateNotification_descriptor_, &GameAccountStateNotification::default_instance()); @@ -677,8 +652,6 @@ void protobuf_ShutdownFile_account_5fservice_2eproto() { delete GetAuthorizedDataRequest_reflection_; delete GetAuthorizedDataResponse::default_instance_; delete GetAuthorizedDataResponse_reflection_; - delete UpdateParentalControlsAndCAISRequest::default_instance_; - delete UpdateParentalControlsAndCAISRequest_reflection_; delete AccountStateNotification::default_instance_; delete AccountStateNotification_reflection_; delete GameAccountStateNotification::default_instance_; @@ -764,86 +737,80 @@ void protobuf_AddDesc_account_5fservice_2eproto() { " \001(\0132\026.bgs.protocol.EntityId\022\013\n\003tag\030\002 \003(" "\t\022\032\n\022privileged_network\030\003 \001(\010\"R\n\031GetAuth" "orizedDataResponse\0225\n\004data\030\001 \003(\0132\'.bgs.p" - "rotocol.account.v1.AuthorizedData\"\373\001\n$Up" - "dateParentalControlsAndCAISRequest\0223\n\007ac" - "count\030\001 \001(\0132\".bgs.protocol.account.v1.Ac" - "countId\022K\n\025parental_control_info\030\002 \001(\0132," - ".bgs.protocol.account.v1.ParentalControl" - "Info\022\017\n\007cais_id\030\003 \001(\t\022\032\n\022session_start_t" - "ime\030\004 \001(\004\022\022\n\nstart_time\030\005 \001(\004\022\020\n\010end_tim" - "e\030\006 \001(\004\"\324\001\n\030AccountStateNotification\022<\n\r" - "account_state\030\001 \001(\0132%.bgs.protocol.accou" - "nt.v1.AccountState\022\031\n\rsubscriber_id\030\002 \001(" - "\004B\002\030\001\022\?\n\014account_tags\030\003 \001(\0132).bgs.protoc" - "ol.account.v1.AccountFieldTags\022\036\n\026subscr" - "iption_completed\030\004 \001(\010\"\352\001\n\034GameAccountSt" - "ateNotification\022E\n\022game_account_state\030\001 " - "\001(\0132).bgs.protocol.account.v1.GameAccoun" - "tState\022\031\n\rsubscriber_id\030\002 \001(\004B\002\030\001\022H\n\021gam" - "e_account_tags\030\003 \001(\0132-.bgs.protocol.acco" - "unt.v1.GameAccountFieldTags\022\036\n\026subscript" - "ion_completed\030\004 \001(\010\"\262\001\n\027GameAccountNotif" - "ication\022\?\n\rgame_accounts\030\001 \003(\0132(.bgs.pro" - "tocol.account.v1.GameAccountList\022\025\n\rsubs" - "criber_id\030\002 \001(\004\022\?\n\014account_tags\030\003 \001(\0132)." - "bgs.protocol.account.v1.AccountFieldTags" - "\"\250\001\n\036GameAccountSessionNotification\022@\n\014g" - "ame_account\030\001 \001(\0132*.bgs.protocol.account" - ".v1.GameAccountHandle\022D\n\014session_info\030\002 " - "\001(\0132..bgs.protocol.account.v1.GameSessio" - "nUpdateInfo2\240\014\n\016AccountService\022y\n\016Resolv" - "eAccount\022..bgs.protocol.account.v1.Resol" - "veAccountRequest\032/.bgs.protocol.account." - "v1.ResolveAccountResponse\"\006\202\371+\002\010\r\022]\n\014IsI" - "grAddress\022,.bgs.protocol.account.v1.IsIg" - "rAddressRequest\032\024.bgs.protocol.NoData\"\t\210" - "\002\001\202\371+\002\010\017\022|\n\tSubscribe\0222.bgs.protocol.acc" - "ount.v1.SubscriptionUpdateRequest\0323.bgs." - "protocol.account.v1.SubscriptionUpdateRe" - "sponse\"\006\202\371+\002\010\031\022_\n\013Unsubscribe\0222.bgs.prot" - "ocol.account.v1.SubscriptionUpdateReques" - "t\032\024.bgs.protocol.NoData\"\006\202\371+\002\010\032\022|\n\017GetAc" - "countState\022/.bgs.protocol.account.v1.Get" - "AccountStateRequest\0320.bgs.protocol.accou" - "nt.v1.GetAccountStateResponse\"\006\202\371+\002\010\036\022\210\001" - "\n\023GetGameAccountState\0223.bgs.protocol.acc" - "ount.v1.GetGameAccountStateRequest\0324.bgs" - ".protocol.account.v1.GetGameAccountState" - "Response\"\006\202\371+\002\010\037\022p\n\013GetLicenses\022+.bgs.pr" - "otocol.account.v1.GetLicensesRequest\032,.b" - "gs.protocol.account.v1.GetLicensesRespon" - "se\"\006\202\371+\002\010 \022\227\001\n\030GetGameTimeRemainingInfo\022" - "8.bgs.protocol.account.v1.GetGameTimeRem" - "ainingInfoRequest\0329.bgs.protocol.account" - ".v1.GetGameTimeRemainingInfoResponse\"\006\202\371" - "+\002\010!\022\205\001\n\022GetGameSessionInfo\0222.bgs.protoc" - "ol.account.v1.GetGameSessionInfoRequest\032" - "3.bgs.protocol.account.v1.GetGameSession" - "InfoResponse\"\006\202\371+\002\010\"\022p\n\013GetCAISInfo\022+.bg" - "s.protocol.account.v1.GetCAISInfoRequest" - "\032,.bgs.protocol.account.v1.GetCAISInfoRe" - "sponse\"\006\202\371+\002\010#\022\202\001\n\021GetAuthorizedData\0221.b" - "gs.protocol.account.v1.GetAuthorizedData" - "Request\0322.bgs.protocol.account.v1.GetAut" - "horizedDataResponse\"\006\202\371+\002\010%\022\216\001\n\025GetSigne" - "dAccountState\0225.bgs.protocol.account.v1." - "GetSignedAccountStateRequest\0326.bgs.proto" - "col.account.v1.GetSignedAccountStateResp" - "onse\"\006\202\371+\002\010,\0320\202\371+&\n$bnet.protocol.accoun" - "t.AccountService\212\371+\002\020\0012\220\004\n\017AccountListen" - "er\022m\n\025OnAccountStateUpdated\0221.bgs.protoc" - "ol.account.v1.AccountStateNotification\032\031" - ".bgs.protocol.NO_RESPONSE\"\006\202\371+\002\010\001\022u\n\031OnG" - "ameAccountStateUpdated\0225.bgs.protocol.ac" - "count.v1.GameAccountStateNotification\032\031." - "bgs.protocol.NO_RESPONSE\"\006\202\371+\002\010\002\022o\n\025OnGa" - "meAccountsUpdated\0220.bgs.protocol.account" - ".v1.GameAccountNotification\032\031.bgs.protoc" - "ol.NO_RESPONSE\"\t\210\002\001\202\371+\002\010\003\022u\n\024OnGameSessi" - "onUpdated\0227.bgs.protocol.account.v1.Game" - "AccountSessionNotification\032\031.bgs.protoco" - "l.NO_RESPONSE\"\t\210\002\001\202\371+\002\010\004\032/\202\371+%\n#bnet.pro" - "tocol.account.AccountNotify\212\371+\002\010\001B\005H\001\200\001\000", 5800); + "rotocol.account.v1.AuthorizedData\"\324\001\n\030Ac" + "countStateNotification\022<\n\raccount_state\030" + "\001 \001(\0132%.bgs.protocol.account.v1.AccountS" + "tate\022\031\n\rsubscriber_id\030\002 \001(\004B\002\030\001\022\?\n\014accou" + "nt_tags\030\003 \001(\0132).bgs.protocol.account.v1." + "AccountFieldTags\022\036\n\026subscription_complet" + "ed\030\004 \001(\010\"\352\001\n\034GameAccountStateNotificatio" + "n\022E\n\022game_account_state\030\001 \001(\0132).bgs.prot" + "ocol.account.v1.GameAccountState\022\031\n\rsubs" + "criber_id\030\002 \001(\004B\002\030\001\022H\n\021game_account_tags" + "\030\003 \001(\0132-.bgs.protocol.account.v1.GameAcc" + "ountFieldTags\022\036\n\026subscription_completed\030" + "\004 \001(\010\"\262\001\n\027GameAccountNotification\022\?\n\rgam" + "e_accounts\030\001 \003(\0132(.bgs.protocol.account." + "v1.GameAccountList\022\025\n\rsubscriber_id\030\002 \001(" + "\004\022\?\n\014account_tags\030\003 \001(\0132).bgs.protocol.a" + "ccount.v1.AccountFieldTags\"\250\001\n\036GameAccou" + "ntSessionNotification\022@\n\014game_account\030\001 " + "\001(\0132*.bgs.protocol.account.v1.GameAccoun" + "tHandle\022D\n\014session_info\030\002 \001(\0132..bgs.prot" + "ocol.account.v1.GameSessionUpdateInfo2\251\014" + "\n\016AccountService\022y\n\016ResolveAccount\022..bgs" + ".protocol.account.v1.ResolveAccountReque" + "st\032/.bgs.protocol.account.v1.ResolveAcco" + "untResponse\"\006\202\371+\002\010\r\022]\n\014IsIgrAddress\022,.bg" + "s.protocol.account.v1.IsIgrAddressReques" + "t\032\024.bgs.protocol.NoData\"\t\210\002\001\202\371+\002\010\017\022|\n\tSu" + "bscribe\0222.bgs.protocol.account.v1.Subscr" + "iptionUpdateRequest\0323.bgs.protocol.accou" + "nt.v1.SubscriptionUpdateResponse\"\006\202\371+\002\010\031" + "\022_\n\013Unsubscribe\0222.bgs.protocol.account.v" + "1.SubscriptionUpdateRequest\032\024.bgs.protoc" + "ol.NoData\"\006\202\371+\002\010\032\022|\n\017GetAccountState\022/.b" + "gs.protocol.account.v1.GetAccountStateRe" + "quest\0320.bgs.protocol.account.v1.GetAccou" + "ntStateResponse\"\006\202\371+\002\010\036\022\210\001\n\023GetGameAccou" + "ntState\0223.bgs.protocol.account.v1.GetGam" + "eAccountStateRequest\0324.bgs.protocol.acco" + "unt.v1.GetGameAccountStateResponse\"\006\202\371+\002" + "\010\037\022p\n\013GetLicenses\022+.bgs.protocol.account" + ".v1.GetLicensesRequest\032,.bgs.protocol.ac" + "count.v1.GetLicensesResponse\"\006\202\371+\002\010 \022\227\001\n" + "\030GetGameTimeRemainingInfo\0228.bgs.protocol" + ".account.v1.GetGameTimeRemainingInfoRequ" + "est\0329.bgs.protocol.account.v1.GetGameTim" + "eRemainingInfoResponse\"\006\202\371+\002\010!\022\205\001\n\022GetGa" + "meSessionInfo\0222.bgs.protocol.account.v1." + "GetGameSessionInfoRequest\0323.bgs.protocol" + ".account.v1.GetGameSessionInfoResponse\"\006" + "\202\371+\002\010\"\022p\n\013GetCAISInfo\022+.bgs.protocol.acc" + "ount.v1.GetCAISInfoRequest\032,.bgs.protoco" + "l.account.v1.GetCAISInfoResponse\"\006\202\371+\002\010#" + "\022\202\001\n\021GetAuthorizedData\0221.bgs.protocol.ac" + "count.v1.GetAuthorizedDataRequest\0322.bgs." + "protocol.account.v1.GetAuthorizedDataRes" + "ponse\"\006\202\371+\002\010%\022\216\001\n\025GetSignedAccountState\022" + "5.bgs.protocol.account.v1.GetSignedAccou" + "ntStateRequest\0326.bgs.protocol.account.v1" + ".GetSignedAccountStateResponse\"\006\202\371+\002\010,\0329" + "\202\371+/\n$bnet.protocol.account.AccountServi" + "ce*\007account\212\371+\002\020\0012\220\004\n\017AccountListener\022m\n" + "\025OnAccountStateUpdated\0221.bgs.protocol.ac" + "count.v1.AccountStateNotification\032\031.bgs." + "protocol.NO_RESPONSE\"\006\202\371+\002\010\001\022u\n\031OnGameAc" + "countStateUpdated\0225.bgs.protocol.account" + ".v1.GameAccountStateNotification\032\031.bgs.p" + "rotocol.NO_RESPONSE\"\006\202\371+\002\010\002\022o\n\025OnGameAcc" + "ountsUpdated\0220.bgs.protocol.account.v1.G" + "ameAccountNotification\032\031.bgs.protocol.NO" + "_RESPONSE\"\t\210\002\001\202\371+\002\010\003\022u\n\024OnGameSessionUpd" + "ated\0227.bgs.protocol.account.v1.GameAccou" + "ntSessionNotification\032\031.bgs.protocol.NO_" + "RESPONSE\"\t\210\002\001\202\371+\002\010\004\032/\202\371+%\n#bnet.protocol" + ".account.AccountNotify\212\371+\002\010\001B\005H\001\200\001\000", 5555); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "account_service.proto", &protobuf_RegisterTypes); ResolveAccountRequest::default_instance_ = new ResolveAccountRequest(); @@ -868,7 +835,6 @@ void protobuf_AddDesc_account_5fservice_2eproto() { GetCAISInfoResponse::default_instance_ = new GetCAISInfoResponse(); GetAuthorizedDataRequest::default_instance_ = new GetAuthorizedDataRequest(); GetAuthorizedDataResponse::default_instance_ = new GetAuthorizedDataResponse(); - UpdateParentalControlsAndCAISRequest::default_instance_ = new UpdateParentalControlsAndCAISRequest(); AccountStateNotification::default_instance_ = new AccountStateNotification(); GameAccountStateNotification::default_instance_ = new GameAccountStateNotification(); GameAccountNotification::default_instance_ = new GameAccountNotification(); @@ -895,7 +861,6 @@ void protobuf_AddDesc_account_5fservice_2eproto() { GetCAISInfoResponse::default_instance_->InitAsDefaultInstance(); GetAuthorizedDataRequest::default_instance_->InitAsDefaultInstance(); GetAuthorizedDataResponse::default_instance_->InitAsDefaultInstance(); - UpdateParentalControlsAndCAISRequest::default_instance_->InitAsDefaultInstance(); AccountStateNotification::default_instance_->InitAsDefaultInstance(); GameAccountStateNotification::default_instance_->InitAsDefaultInstance(); GameAccountNotification::default_instance_->InitAsDefaultInstance(); @@ -6869,471 +6834,6 @@ void GetAuthorizedDataResponse::Swap(GetAuthorizedDataResponse* other) { // =================================================================== #ifndef _MSC_VER -const int UpdateParentalControlsAndCAISRequest::kAccountFieldNumber; -const int UpdateParentalControlsAndCAISRequest::kParentalControlInfoFieldNumber; -const int UpdateParentalControlsAndCAISRequest::kCaisIdFieldNumber; -const int UpdateParentalControlsAndCAISRequest::kSessionStartTimeFieldNumber; -const int UpdateParentalControlsAndCAISRequest::kStartTimeFieldNumber; -const int UpdateParentalControlsAndCAISRequest::kEndTimeFieldNumber; -#endif // !_MSC_VER - -UpdateParentalControlsAndCAISRequest::UpdateParentalControlsAndCAISRequest() - : ::google::protobuf::Message() { - SharedCtor(); - // @@protoc_insertion_point(constructor:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest) -} - -void UpdateParentalControlsAndCAISRequest::InitAsDefaultInstance() { - account_ = const_cast< ::bgs::protocol::account::v1::AccountId*>(&::bgs::protocol::account::v1::AccountId::default_instance()); - parental_control_info_ = const_cast< ::bgs::protocol::account::v1::ParentalControlInfo*>(&::bgs::protocol::account::v1::ParentalControlInfo::default_instance()); -} - -UpdateParentalControlsAndCAISRequest::UpdateParentalControlsAndCAISRequest(const UpdateParentalControlsAndCAISRequest& from) - : ::google::protobuf::Message() { - SharedCtor(); - MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest) -} - -void UpdateParentalControlsAndCAISRequest::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); - _cached_size_ = 0; - account_ = NULL; - parental_control_info_ = NULL; - cais_id_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - session_start_time_ = GOOGLE_ULONGLONG(0); - start_time_ = GOOGLE_ULONGLONG(0); - end_time_ = GOOGLE_ULONGLONG(0); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); -} - -UpdateParentalControlsAndCAISRequest::~UpdateParentalControlsAndCAISRequest() { - // @@protoc_insertion_point(destructor:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest) - SharedDtor(); -} - -void UpdateParentalControlsAndCAISRequest::SharedDtor() { - if (cais_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { - delete cais_id_; - } - if (this != default_instance_) { - delete account_; - delete parental_control_info_; - } -} - -void UpdateParentalControlsAndCAISRequest::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const ::google::protobuf::Descriptor* UpdateParentalControlsAndCAISRequest::descriptor() { - protobuf_AssignDescriptorsOnce(); - return UpdateParentalControlsAndCAISRequest_descriptor_; -} - -const UpdateParentalControlsAndCAISRequest& UpdateParentalControlsAndCAISRequest::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_account_5fservice_2eproto(); - return *default_instance_; -} - -UpdateParentalControlsAndCAISRequest* UpdateParentalControlsAndCAISRequest::default_instance_ = NULL; - -UpdateParentalControlsAndCAISRequest* UpdateParentalControlsAndCAISRequest::New() const { - return new UpdateParentalControlsAndCAISRequest; -} - -void UpdateParentalControlsAndCAISRequest::Clear() { -#define OFFSET_OF_FIELD_(f) (reinterpret_cast<char*>( \ - &reinterpret_cast<UpdateParentalControlsAndCAISRequest*>(16)->f) - \ - reinterpret_cast<char*>(16)) - -#define ZR_(first, last) do { \ - size_t f = OFFSET_OF_FIELD_(first); \ - size_t n = OFFSET_OF_FIELD_(last) - f + sizeof(last); \ - ::memset(&first, 0, n); \ - } while (0) - - if (_has_bits_[0 / 32] & 63) { - ZR_(session_start_time_, end_time_); - if (has_account()) { - if (account_ != NULL) account_->::bgs::protocol::account::v1::AccountId::Clear(); - } - if (has_parental_control_info()) { - if (parental_control_info_ != NULL) parental_control_info_->::bgs::protocol::account::v1::ParentalControlInfo::Clear(); - } - if (has_cais_id()) { - if (cais_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { - cais_id_->clear(); - } - } - } - -#undef OFFSET_OF_FIELD_ -#undef ZR_ - - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - mutable_unknown_fields()->Clear(); -} - -bool UpdateParentalControlsAndCAISRequest::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest) - for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // optional .bgs.protocol.account.v1.AccountId account = 1; - case 1: { - if (tag == 10) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_account())); - } else { - goto handle_unusual; - } - if (input->ExpectTag(18)) goto parse_parental_control_info; - break; - } - - // optional .bgs.protocol.account.v1.ParentalControlInfo parental_control_info = 2; - case 2: { - if (tag == 18) { - parse_parental_control_info: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_parental_control_info())); - } else { - goto handle_unusual; - } - if (input->ExpectTag(26)) goto parse_cais_id; - break; - } - - // optional string cais_id = 3; - case 3: { - if (tag == 26) { - parse_cais_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_cais_id())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->cais_id().data(), this->cais_id().length(), - ::google::protobuf::internal::WireFormat::PARSE, - "cais_id"); - } else { - goto handle_unusual; - } - if (input->ExpectTag(32)) goto parse_session_start_time; - break; - } - - // optional uint64 session_start_time = 4; - case 4: { - if (tag == 32) { - parse_session_start_time: - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>( - input, &session_start_time_))); - set_has_session_start_time(); - } else { - goto handle_unusual; - } - if (input->ExpectTag(40)) goto parse_start_time; - break; - } - - // optional uint64 start_time = 5; - case 5: { - if (tag == 40) { - parse_start_time: - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>( - input, &start_time_))); - set_has_start_time(); - } else { - goto handle_unusual; - } - if (input->ExpectTag(48)) goto parse_end_time; - break; - } - - // optional uint64 end_time = 6; - case 6: { - if (tag == 48) { - parse_end_time: - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>( - input, &end_time_))); - set_has_end_time(); - } else { - goto handle_unusual; - } - if (input->ExpectAtEnd()) goto success; - break; - } - - default: { - handle_unusual: - if (tag == 0 || - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { - goto success; - } - DO_(::google::protobuf::internal::WireFormat::SkipField( - input, tag, mutable_unknown_fields())); - break; - } - } - } -success: - // @@protoc_insertion_point(parse_success:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest) - return true; -failure: - // @@protoc_insertion_point(parse_failure:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest) - return false; -#undef DO_ -} - -void UpdateParentalControlsAndCAISRequest::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest) - // optional .bgs.protocol.account.v1.AccountId account = 1; - if (has_account()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 1, this->account(), output); - } - - // optional .bgs.protocol.account.v1.ParentalControlInfo parental_control_info = 2; - if (has_parental_control_info()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->parental_control_info(), output); - } - - // optional string cais_id = 3; - if (has_cais_id()) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->cais_id().data(), this->cais_id().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, - "cais_id"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 3, this->cais_id(), output); - } - - // optional uint64 session_start_time = 4; - if (has_session_start_time()) { - ::google::protobuf::internal::WireFormatLite::WriteUInt64(4, this->session_start_time(), output); - } - - // optional uint64 start_time = 5; - if (has_start_time()) { - ::google::protobuf::internal::WireFormatLite::WriteUInt64(5, this->start_time(), output); - } - - // optional uint64 end_time = 6; - if (has_end_time()) { - ::google::protobuf::internal::WireFormatLite::WriteUInt64(6, this->end_time(), output); - } - - if (!unknown_fields().empty()) { - ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - unknown_fields(), output); - } - // @@protoc_insertion_point(serialize_end:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest) -} - -::google::protobuf::uint8* UpdateParentalControlsAndCAISRequest::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest) - // optional .bgs.protocol.account.v1.AccountId account = 1; - if (has_account()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 1, this->account(), target); - } - - // optional .bgs.protocol.account.v1.ParentalControlInfo parental_control_info = 2; - if (has_parental_control_info()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->parental_control_info(), target); - } - - // optional string cais_id = 3; - if (has_cais_id()) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->cais_id().data(), this->cais_id().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, - "cais_id"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 3, this->cais_id(), target); - } - - // optional uint64 session_start_time = 4; - if (has_session_start_time()) { - target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(4, this->session_start_time(), target); - } - - // optional uint64 start_time = 5; - if (has_start_time()) { - target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(5, this->start_time(), target); - } - - // optional uint64 end_time = 6; - if (has_end_time()) { - target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(6, this->end_time(), target); - } - - if (!unknown_fields().empty()) { - target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - unknown_fields(), target); - } - // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest) - return target; -} - -int UpdateParentalControlsAndCAISRequest::ByteSize() const { - int total_size = 0; - - if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // optional .bgs.protocol.account.v1.AccountId account = 1; - if (has_account()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->account()); - } - - // optional .bgs.protocol.account.v1.ParentalControlInfo parental_control_info = 2; - if (has_parental_control_info()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->parental_control_info()); - } - - // optional string cais_id = 3; - if (has_cais_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->cais_id()); - } - - // optional uint64 session_start_time = 4; - if (has_session_start_time()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::UInt64Size( - this->session_start_time()); - } - - // optional uint64 start_time = 5; - if (has_start_time()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::UInt64Size( - this->start_time()); - } - - // optional uint64 end_time = 6; - if (has_end_time()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::UInt64Size( - this->end_time()); - } - - } - if (!unknown_fields().empty()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); - } - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); - return total_size; -} - -void UpdateParentalControlsAndCAISRequest::MergeFrom(const ::google::protobuf::Message& from) { - GOOGLE_CHECK_NE(&from, this); - const UpdateParentalControlsAndCAISRequest* source = - ::google::protobuf::internal::dynamic_cast_if_available<const UpdateParentalControlsAndCAISRequest*>( - &from); - if (source == NULL) { - ::google::protobuf::internal::ReflectionOps::Merge(from, this); - } else { - MergeFrom(*source); - } -} - -void UpdateParentalControlsAndCAISRequest::MergeFrom(const UpdateParentalControlsAndCAISRequest& from) { - GOOGLE_CHECK_NE(&from, this); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { - if (from.has_account()) { - mutable_account()->::bgs::protocol::account::v1::AccountId::MergeFrom(from.account()); - } - if (from.has_parental_control_info()) { - mutable_parental_control_info()->::bgs::protocol::account::v1::ParentalControlInfo::MergeFrom(from.parental_control_info()); - } - if (from.has_cais_id()) { - set_cais_id(from.cais_id()); - } - if (from.has_session_start_time()) { - set_session_start_time(from.session_start_time()); - } - if (from.has_start_time()) { - set_start_time(from.start_time()); - } - if (from.has_end_time()) { - set_end_time(from.end_time()); - } - } - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); -} - -void UpdateParentalControlsAndCAISRequest::CopyFrom(const ::google::protobuf::Message& from) { - if (&from == this) return; - Clear(); - MergeFrom(from); -} - -void UpdateParentalControlsAndCAISRequest::CopyFrom(const UpdateParentalControlsAndCAISRequest& from) { - if (&from == this) return; - Clear(); - MergeFrom(from); -} - -bool UpdateParentalControlsAndCAISRequest::IsInitialized() const { - - if (has_account()) { - if (!this->account().IsInitialized()) return false; - } - return true; -} - -void UpdateParentalControlsAndCAISRequest::Swap(UpdateParentalControlsAndCAISRequest* other) { - if (other != this) { - std::swap(account_, other->account_); - std::swap(parental_control_info_, other->parental_control_info_); - std::swap(cais_id_, other->cais_id_); - std::swap(session_start_time_, other->session_start_time_); - std::swap(start_time_, other->start_time_); - std::swap(end_time_, other->end_time_); - std::swap(_has_bits_[0], other->_has_bits_[0]); - _unknown_fields_.Swap(&other->_unknown_fields_); - std::swap(_cached_size_, other->_cached_size_); - } -} - -::google::protobuf::Metadata UpdateParentalControlsAndCAISRequest::GetMetadata() const { - protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = UpdateParentalControlsAndCAISRequest_descriptor_; - metadata.reflection = UpdateParentalControlsAndCAISRequest_reflection_; - return metadata; -} - - -// =================================================================== - -#ifndef _MSC_VER const int AccountStateNotification::kAccountStateFieldNumber; const int AccountStateNotification::kSubscriberIdFieldNumber; const int AccountStateNotification::kAccountTagsFieldNumber; diff --git a/src/server/proto/Client/account_service.pb.h b/src/server/proto/Client/account_service.pb.h index 3522f351b72..16ac00ab718 100644 --- a/src/server/proto/Client/account_service.pb.h +++ b/src/server/proto/Client/account_service.pb.h @@ -65,7 +65,6 @@ class GetCAISInfoRequest; class GetCAISInfoResponse; class GetAuthorizedDataRequest; class GetAuthorizedDataResponse; -class UpdateParentalControlsAndCAISRequest; class AccountStateNotification; class GameAccountStateNotification; class GameAccountNotification; @@ -2098,144 +2097,6 @@ class TC_PROTO_API GetAuthorizedDataResponse : public ::google::protobuf::Messag }; // ------------------------------------------------------------------- -class TC_PROTO_API UpdateParentalControlsAndCAISRequest : public ::google::protobuf::Message { - public: - UpdateParentalControlsAndCAISRequest(); - virtual ~UpdateParentalControlsAndCAISRequest(); - - UpdateParentalControlsAndCAISRequest(const UpdateParentalControlsAndCAISRequest& from); - - inline UpdateParentalControlsAndCAISRequest& operator=(const UpdateParentalControlsAndCAISRequest& from) { - CopyFrom(from); - return *this; - } - - inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { - return _unknown_fields_; - } - - inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { - return &_unknown_fields_; - } - - static const ::google::protobuf::Descriptor* descriptor(); - static const UpdateParentalControlsAndCAISRequest& default_instance(); - - void Swap(UpdateParentalControlsAndCAISRequest* other); - - // implements Message ---------------------------------------------- - - UpdateParentalControlsAndCAISRequest* New() const; - void CopyFrom(const ::google::protobuf::Message& from); - void MergeFrom(const ::google::protobuf::Message& from); - void CopyFrom(const UpdateParentalControlsAndCAISRequest& from); - void MergeFrom(const UpdateParentalControlsAndCAISRequest& from); - void Clear(); - bool IsInitialized() const; - - int ByteSize() const; - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input); - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const; - ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; - int GetCachedSize() const { return _cached_size_; } - private: - void SharedCtor(); - void SharedDtor(); - void SetCachedSize(int size) const; - public: - ::google::protobuf::Metadata GetMetadata() const; - - // nested types ---------------------------------------------------- - - // accessors ------------------------------------------------------- - - // optional .bgs.protocol.account.v1.AccountId account = 1; - inline bool has_account() const; - inline void clear_account(); - static const int kAccountFieldNumber = 1; - inline const ::bgs::protocol::account::v1::AccountId& account() const; - inline ::bgs::protocol::account::v1::AccountId* mutable_account(); - inline ::bgs::protocol::account::v1::AccountId* release_account(); - inline void set_allocated_account(::bgs::protocol::account::v1::AccountId* account); - - // optional .bgs.protocol.account.v1.ParentalControlInfo parental_control_info = 2; - inline bool has_parental_control_info() const; - inline void clear_parental_control_info(); - static const int kParentalControlInfoFieldNumber = 2; - inline const ::bgs::protocol::account::v1::ParentalControlInfo& parental_control_info() const; - inline ::bgs::protocol::account::v1::ParentalControlInfo* mutable_parental_control_info(); - inline ::bgs::protocol::account::v1::ParentalControlInfo* release_parental_control_info(); - inline void set_allocated_parental_control_info(::bgs::protocol::account::v1::ParentalControlInfo* parental_control_info); - - // optional string cais_id = 3; - inline bool has_cais_id() const; - inline void clear_cais_id(); - static const int kCaisIdFieldNumber = 3; - inline const ::std::string& cais_id() const; - inline void set_cais_id(const ::std::string& value); - inline void set_cais_id(const char* value); - inline void set_cais_id(const char* value, size_t size); - inline ::std::string* mutable_cais_id(); - inline ::std::string* release_cais_id(); - inline void set_allocated_cais_id(::std::string* cais_id); - - // optional uint64 session_start_time = 4; - inline bool has_session_start_time() const; - inline void clear_session_start_time(); - static const int kSessionStartTimeFieldNumber = 4; - inline ::google::protobuf::uint64 session_start_time() const; - inline void set_session_start_time(::google::protobuf::uint64 value); - - // optional uint64 start_time = 5; - inline bool has_start_time() const; - inline void clear_start_time(); - static const int kStartTimeFieldNumber = 5; - inline ::google::protobuf::uint64 start_time() const; - inline void set_start_time(::google::protobuf::uint64 value); - - // optional uint64 end_time = 6; - inline bool has_end_time() const; - inline void clear_end_time(); - static const int kEndTimeFieldNumber = 6; - inline ::google::protobuf::uint64 end_time() const; - inline void set_end_time(::google::protobuf::uint64 value); - - // @@protoc_insertion_point(class_scope:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest) - private: - inline void set_has_account(); - inline void clear_has_account(); - inline void set_has_parental_control_info(); - inline void clear_has_parental_control_info(); - inline void set_has_cais_id(); - inline void clear_has_cais_id(); - inline void set_has_session_start_time(); - inline void clear_has_session_start_time(); - inline void set_has_start_time(); - inline void clear_has_start_time(); - inline void set_has_end_time(); - inline void clear_has_end_time(); - - ::google::protobuf::UnknownFieldSet _unknown_fields_; - - ::google::protobuf::uint32 _has_bits_[1]; - mutable int _cached_size_; - ::bgs::protocol::account::v1::AccountId* account_; - ::bgs::protocol::account::v1::ParentalControlInfo* parental_control_info_; - ::std::string* cais_id_; - ::google::protobuf::uint64 session_start_time_; - ::google::protobuf::uint64 start_time_; - ::google::protobuf::uint64 end_time_; - friend void TC_PROTO_API protobuf_AddDesc_account_5fservice_2eproto(); - friend void protobuf_AssignDesc_account_5fservice_2eproto(); - friend void protobuf_ShutdownFile_account_5fservice_2eproto(); - - void InitAsDefaultInstance(); - static UpdateParentalControlsAndCAISRequest* default_instance_; -}; -// ------------------------------------------------------------------- - class TC_PROTO_API AccountStateNotification : public ::google::protobuf::Message { public: AccountStateNotification(); @@ -4436,240 +4297,6 @@ GetAuthorizedDataResponse::mutable_data() { // ------------------------------------------------------------------- -// UpdateParentalControlsAndCAISRequest - -// optional .bgs.protocol.account.v1.AccountId account = 1; -inline bool UpdateParentalControlsAndCAISRequest::has_account() const { - return (_has_bits_[0] & 0x00000001u) != 0; -} -inline void UpdateParentalControlsAndCAISRequest::set_has_account() { - _has_bits_[0] |= 0x00000001u; -} -inline void UpdateParentalControlsAndCAISRequest::clear_has_account() { - _has_bits_[0] &= ~0x00000001u; -} -inline void UpdateParentalControlsAndCAISRequest::clear_account() { - if (account_ != NULL) account_->::bgs::protocol::account::v1::AccountId::Clear(); - clear_has_account(); -} -inline const ::bgs::protocol::account::v1::AccountId& UpdateParentalControlsAndCAISRequest::account() const { - // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest.account) - return account_ != NULL ? *account_ : *default_instance_->account_; -} -inline ::bgs::protocol::account::v1::AccountId* UpdateParentalControlsAndCAISRequest::mutable_account() { - set_has_account(); - if (account_ == NULL) account_ = new ::bgs::protocol::account::v1::AccountId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest.account) - return account_; -} -inline ::bgs::protocol::account::v1::AccountId* UpdateParentalControlsAndCAISRequest::release_account() { - clear_has_account(); - ::bgs::protocol::account::v1::AccountId* temp = account_; - account_ = NULL; - return temp; -} -inline void UpdateParentalControlsAndCAISRequest::set_allocated_account(::bgs::protocol::account::v1::AccountId* account) { - delete account_; - account_ = account; - if (account) { - set_has_account(); - } else { - clear_has_account(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest.account) -} - -// optional .bgs.protocol.account.v1.ParentalControlInfo parental_control_info = 2; -inline bool UpdateParentalControlsAndCAISRequest::has_parental_control_info() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void UpdateParentalControlsAndCAISRequest::set_has_parental_control_info() { - _has_bits_[0] |= 0x00000002u; -} -inline void UpdateParentalControlsAndCAISRequest::clear_has_parental_control_info() { - _has_bits_[0] &= ~0x00000002u; -} -inline void UpdateParentalControlsAndCAISRequest::clear_parental_control_info() { - if (parental_control_info_ != NULL) parental_control_info_->::bgs::protocol::account::v1::ParentalControlInfo::Clear(); - clear_has_parental_control_info(); -} -inline const ::bgs::protocol::account::v1::ParentalControlInfo& UpdateParentalControlsAndCAISRequest::parental_control_info() const { - // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest.parental_control_info) - return parental_control_info_ != NULL ? *parental_control_info_ : *default_instance_->parental_control_info_; -} -inline ::bgs::protocol::account::v1::ParentalControlInfo* UpdateParentalControlsAndCAISRequest::mutable_parental_control_info() { - set_has_parental_control_info(); - if (parental_control_info_ == NULL) parental_control_info_ = new ::bgs::protocol::account::v1::ParentalControlInfo; - // @@protoc_insertion_point(field_mutable:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest.parental_control_info) - return parental_control_info_; -} -inline ::bgs::protocol::account::v1::ParentalControlInfo* UpdateParentalControlsAndCAISRequest::release_parental_control_info() { - clear_has_parental_control_info(); - ::bgs::protocol::account::v1::ParentalControlInfo* temp = parental_control_info_; - parental_control_info_ = NULL; - return temp; -} -inline void UpdateParentalControlsAndCAISRequest::set_allocated_parental_control_info(::bgs::protocol::account::v1::ParentalControlInfo* parental_control_info) { - delete parental_control_info_; - parental_control_info_ = parental_control_info; - if (parental_control_info) { - set_has_parental_control_info(); - } else { - clear_has_parental_control_info(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest.parental_control_info) -} - -// optional string cais_id = 3; -inline bool UpdateParentalControlsAndCAISRequest::has_cais_id() const { - return (_has_bits_[0] & 0x00000004u) != 0; -} -inline void UpdateParentalControlsAndCAISRequest::set_has_cais_id() { - _has_bits_[0] |= 0x00000004u; -} -inline void UpdateParentalControlsAndCAISRequest::clear_has_cais_id() { - _has_bits_[0] &= ~0x00000004u; -} -inline void UpdateParentalControlsAndCAISRequest::clear_cais_id() { - if (cais_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { - cais_id_->clear(); - } - clear_has_cais_id(); -} -inline const ::std::string& UpdateParentalControlsAndCAISRequest::cais_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest.cais_id) - return *cais_id_; -} -inline void UpdateParentalControlsAndCAISRequest::set_cais_id(const ::std::string& value) { - set_has_cais_id(); - if (cais_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { - cais_id_ = new ::std::string; - } - cais_id_->assign(value); - // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest.cais_id) -} -inline void UpdateParentalControlsAndCAISRequest::set_cais_id(const char* value) { - set_has_cais_id(); - if (cais_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { - cais_id_ = new ::std::string; - } - cais_id_->assign(value); - // @@protoc_insertion_point(field_set_char:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest.cais_id) -} -inline void UpdateParentalControlsAndCAISRequest::set_cais_id(const char* value, size_t size) { - set_has_cais_id(); - if (cais_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { - cais_id_ = new ::std::string; - } - cais_id_->assign(reinterpret_cast<const char*>(value), size); - // @@protoc_insertion_point(field_set_pointer:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest.cais_id) -} -inline ::std::string* UpdateParentalControlsAndCAISRequest::mutable_cais_id() { - set_has_cais_id(); - if (cais_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { - cais_id_ = new ::std::string; - } - // @@protoc_insertion_point(field_mutable:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest.cais_id) - return cais_id_; -} -inline ::std::string* UpdateParentalControlsAndCAISRequest::release_cais_id() { - clear_has_cais_id(); - if (cais_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { - return NULL; - } else { - ::std::string* temp = cais_id_; - cais_id_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - return temp; - } -} -inline void UpdateParentalControlsAndCAISRequest::set_allocated_cais_id(::std::string* cais_id) { - if (cais_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { - delete cais_id_; - } - if (cais_id) { - set_has_cais_id(); - cais_id_ = cais_id; - } else { - clear_has_cais_id(); - cais_id_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest.cais_id) -} - -// optional uint64 session_start_time = 4; -inline bool UpdateParentalControlsAndCAISRequest::has_session_start_time() const { - return (_has_bits_[0] & 0x00000008u) != 0; -} -inline void UpdateParentalControlsAndCAISRequest::set_has_session_start_time() { - _has_bits_[0] |= 0x00000008u; -} -inline void UpdateParentalControlsAndCAISRequest::clear_has_session_start_time() { - _has_bits_[0] &= ~0x00000008u; -} -inline void UpdateParentalControlsAndCAISRequest::clear_session_start_time() { - session_start_time_ = GOOGLE_ULONGLONG(0); - clear_has_session_start_time(); -} -inline ::google::protobuf::uint64 UpdateParentalControlsAndCAISRequest::session_start_time() const { - // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest.session_start_time) - return session_start_time_; -} -inline void UpdateParentalControlsAndCAISRequest::set_session_start_time(::google::protobuf::uint64 value) { - set_has_session_start_time(); - session_start_time_ = value; - // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest.session_start_time) -} - -// optional uint64 start_time = 5; -inline bool UpdateParentalControlsAndCAISRequest::has_start_time() const { - return (_has_bits_[0] & 0x00000010u) != 0; -} -inline void UpdateParentalControlsAndCAISRequest::set_has_start_time() { - _has_bits_[0] |= 0x00000010u; -} -inline void UpdateParentalControlsAndCAISRequest::clear_has_start_time() { - _has_bits_[0] &= ~0x00000010u; -} -inline void UpdateParentalControlsAndCAISRequest::clear_start_time() { - start_time_ = GOOGLE_ULONGLONG(0); - clear_has_start_time(); -} -inline ::google::protobuf::uint64 UpdateParentalControlsAndCAISRequest::start_time() const { - // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest.start_time) - return start_time_; -} -inline void UpdateParentalControlsAndCAISRequest::set_start_time(::google::protobuf::uint64 value) { - set_has_start_time(); - start_time_ = value; - // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest.start_time) -} - -// optional uint64 end_time = 6; -inline bool UpdateParentalControlsAndCAISRequest::has_end_time() const { - return (_has_bits_[0] & 0x00000020u) != 0; -} -inline void UpdateParentalControlsAndCAISRequest::set_has_end_time() { - _has_bits_[0] |= 0x00000020u; -} -inline void UpdateParentalControlsAndCAISRequest::clear_has_end_time() { - _has_bits_[0] &= ~0x00000020u; -} -inline void UpdateParentalControlsAndCAISRequest::clear_end_time() { - end_time_ = GOOGLE_ULONGLONG(0); - clear_has_end_time(); -} -inline ::google::protobuf::uint64 UpdateParentalControlsAndCAISRequest::end_time() const { - // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest.end_time) - return end_time_; -} -inline void UpdateParentalControlsAndCAISRequest::set_end_time(::google::protobuf::uint64 value) { - set_has_end_time(); - end_time_ = value; - // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.UpdateParentalControlsAndCAISRequest.end_time) -} - -// ------------------------------------------------------------------- - // AccountStateNotification // optional .bgs.protocol.account.v1.AccountState account_state = 1; diff --git a/src/server/proto/Client/account_types.pb.cc b/src/server/proto/Client/account_types.pb.cc index fa7df436004..9eab9d474b0 100644 --- a/src/server/proto/Client/account_types.pb.cc +++ b/src/server/proto/Client/account_types.pb.cc @@ -126,11 +126,7 @@ struct IgrIdOneofInstance { const ::google::protobuf::Descriptor* IgrAddress_descriptor_ = NULL; const ::google::protobuf::internal::GeneratedMessageReflection* IgrAddress_reflection_ = NULL; -const ::google::protobuf::Descriptor* AccountRestriction_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - AccountRestriction_reflection_ = NULL; const ::google::protobuf::EnumDescriptor* IdentityVerificationStatus_descriptor_ = NULL; -const ::google::protobuf::EnumDescriptor* RestrictionType_descriptor_ = NULL; } // namespace @@ -209,10 +205,9 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() { ::google::protobuf::MessageFactory::generated_factory(), sizeof(AccountReference)); Identity_descriptor_ = file->message_type(4); - static const int Identity_offsets_[3] = { + static const int Identity_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Identity, account_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Identity, game_account_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Identity, process_), }; Identity_reflection_ = new ::google::protobuf::internal::GeneratedMessageReflection( @@ -371,8 +366,8 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountLevelInfo, email_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountLevelInfo, headless_account_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountLevelInfo, test_account_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountLevelInfo, restriction_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountLevelInfo, is_sms_protected_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountLevelInfo, ratings_board_minimum_age_), }; AccountLevelInfo_reflection_ = new ::google::protobuf::internal::GeneratedMessageReflection( @@ -727,28 +722,7 @@ void protobuf_AssignDesc_account_5ftypes_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(IgrAddress)); - AccountRestriction_descriptor_ = file->message_type(32); - static const int AccountRestriction_offsets_[6] = { - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountRestriction, restriction_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountRestriction, program_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountRestriction, type_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountRestriction, platform_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountRestriction, expire_time_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountRestriction, created_time_), - }; - AccountRestriction_reflection_ = - new ::google::protobuf::internal::GeneratedMessageReflection( - AccountRestriction_descriptor_, - AccountRestriction::default_instance_, - AccountRestriction_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountRestriction, _has_bits_[0]), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AccountRestriction, _unknown_fields_), - -1, - ::google::protobuf::DescriptorPool::generated_pool(), - ::google::protobuf::MessageFactory::generated_factory(), - sizeof(AccountRestriction)); IdentityVerificationStatus_descriptor_ = file->enum_type(0); - RestrictionType_descriptor_ = file->enum_type(1); } namespace { @@ -825,8 +799,6 @@ void protobuf_RegisterTypes(const ::std::string&) { IgrId_descriptor_, &IgrId::default_instance()); ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( IgrAddress_descriptor_, &IgrAddress::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - AccountRestriction_descriptor_, &AccountRestriction::default_instance()); } } // namespace @@ -897,8 +869,6 @@ void protobuf_ShutdownFile_account_5ftypes_2eproto() { delete IgrId_reflection_; delete IgrAddress::default_instance_; delete IgrAddress_reflection_; - delete AccountRestriction::default_instance_; - delete AccountRestriction_reflection_; } void protobuf_AddDesc_account_5ftypes_2eproto() { @@ -920,146 +890,136 @@ void protobuf_AddDesc_account_5ftypes_2eproto() { "\010\001\"\220\001\n\020AccountReference\022\n\n\002id\030\001 \001(\007\022\r\n\005e" "mail\030\002 \001(\t\022:\n\006handle\030\003 \001(\0132*.bgs.protoco" "l.account.v1.GameAccountHandle\022\022\n\nbattle" - "_tag\030\004 \001(\t\022\021\n\006region\030\n \001(\r:\0010\"\263\001\n\010Identi" + "_tag\030\004 \001(\t\022\021\n\006region\030\n \001(\r:\0010\"\211\001\n\010Identi" "ty\0223\n\007account\030\001 \001(\0132\".bgs.protocol.accou" "nt.v1.AccountId\022@\n\014game_account\030\002 \001(\0132*." "bgs.protocol.account.v1.GameAccountHandl" - "e\022(\n\007process\030\003 \001(\0132\027.bgs.protocol.Proces" - "sId:\006\202\371+\002\020\001\"*\n\nProgramTag\022\017\n\007program\030\001 \001" - "(\007\022\013\n\003tag\030\002 \001(\007\"(\n\tRegionTag\022\016\n\006region\030\001" - " \001(\007\022\013\n\003tag\030\002 \001(\007\"\260\002\n\020AccountFieldTags\022\036" - "\n\026account_level_info_tag\030\002 \001(\007\022\030\n\020privac" - "y_info_tag\030\003 \001(\007\022!\n\031parental_control_inf" - "o_tag\030\004 \001(\007\022A\n\024game_level_info_tags\030\007 \003(" - "\0132#.bgs.protocol.account.v1.ProgramTag\022=" - "\n\020game_status_tags\030\t \003(\0132#.bgs.protocol." - "account.v1.ProgramTag\022=\n\021game_account_ta" - "gs\030\013 \003(\0132\".bgs.protocol.account.v1.Regio" - "nTag\"~\n\024GameAccountFieldTags\022\033\n\023game_lev" - "el_info_tag\030\002 \001(\007\022\032\n\022game_time_info_tag\030" - "\003 \001(\007\022\027\n\017game_status_tag\030\004 \001(\007\022\024\n\014raf_in" - "fo_tag\030\005 \001(\007\"\343\001\n\023AccountFieldOptions\022\022\n\n" - "all_fields\030\001 \001(\010\022 \n\030field_account_level_" - "info\030\002 \001(\010\022\032\n\022field_privacy_info\030\003 \001(\010\022#" - "\n\033field_parental_control_info\030\004 \001(\010\022\035\n\025f" - "ield_game_level_info\030\006 \001(\010\022\031\n\021field_game" - "_status\030\007 \001(\010\022\033\n\023field_game_accounts\030\010 \001" - "(\010\"\235\001\n\027GameAccountFieldOptions\022\022\n\nall_fi" - "elds\030\001 \001(\010\022\035\n\025field_game_level_info\030\002 \001(" - "\010\022\034\n\024field_game_time_info\030\003 \001(\010\022\031\n\021field" - "_game_status\030\004 \001(\010\022\026\n\016field_raf_info\030\005 \001" - "(\010\"\222\003\n\023SubscriberReference\022\024\n\tobject_id\030" - "\001 \001(\004:\0010\022)\n\tentity_id\030\002 \001(\0132\026.bgs.protoc" - "ol.EntityId\022E\n\017account_options\030\003 \001(\0132,.b" - "gs.protocol.account.v1.AccountFieldOptio" - "ns\022\?\n\014account_tags\030\004 \001(\0132).bgs.protocol." - "account.v1.AccountFieldTags\022N\n\024game_acco" - "unt_options\030\005 \001(\01320.bgs.protocol.account" - ".v1.GameAccountFieldOptions\022H\n\021game_acco" - "unt_tags\030\006 \001(\0132-.bgs.protocol.account.v1" - ".GameAccountFieldTags\022\030\n\rsubscriber_id\030\007" - " \001(\004:\0010\"\350\003\n\020AccountLevelInfo\0229\n\010licenses" - "\030\003 \003(\0132\'.bgs.protocol.account.v1.Account" - "License\022\030\n\020default_currency\030\004 \001(\007\022\017\n\007cou" - "ntry\030\005 \001(\t\022\030\n\020preferred_region\030\006 \001(\r\022\021\n\t" - "full_name\030\007 \001(\t\022\022\n\nbattle_tag\030\010 \001(\t\022\r\n\005m" - "uted\030\t \001(\010\022\025\n\rmanual_review\030\n \001(\010\022\030\n\020acc" - "ount_paid_any\030\013 \001(\010\022R\n\025identity_check_st" - "atus\030\014 \001(\01623.bgs.protocol.account.v1.Ide" - "ntityVerificationStatus\022\r\n\005email\030\r \001(\t\022\030" - "\n\020headless_account\030\016 \001(\010\022\024\n\014test_account" - "\030\017 \001(\010\022@\n\013restriction\030\020 \003(\0132+.bgs.protoc" - "ol.account.v1.AccountRestriction\022\030\n\020is_s" - "ms_protected\030\021 \001(\010\"\302\002\n\013PrivacyInfo\022\024\n\014is" - "_using_rid\030\003 \001(\010\022#\n\033is_visible_for_view_" - "friends\030\004 \001(\010\022$\n\034is_hidden_from_friend_f" - "inder\030\005 \001(\010\022`\n\021game_info_privacy\030\006 \001(\01624" - ".bgs.protocol.account.v1.PrivacyInfo.Gam" - "eInfoPrivacy:\017PRIVACY_FRIENDS\022\"\n\032only_al" - "low_friend_whispers\030\007 \001(\010\"L\n\017GameInfoPri" - "vacy\022\016\n\nPRIVACY_ME\020\000\022\023\n\017PRIVACY_FRIENDS\020" - "\001\022\024\n\020PRIVACY_EVERYONE\020\002\"\325\001\n\023ParentalCont" - "rolInfo\022\020\n\010timezone\030\003 \001(\t\022\027\n\017minutes_per" - "_day\030\004 \001(\r\022\030\n\020minutes_per_week\030\005 \001(\r\022\031\n\021" - "can_receive_voice\030\006 \001(\010\022\026\n\016can_send_voic" - "e\030\007 \001(\010\022\025\n\rplay_schedule\030\010 \003(\010\022\026\n\016can_jo" - "in_group\030\t \001(\010\022\027\n\017can_use_profile\030\n \001(\010\"" - "\323\001\n\rGameLevelInfo\022\020\n\010is_trial\030\004 \001(\010\022\023\n\013i" - "s_lifetime\030\005 \001(\010\022\025\n\ris_restricted\030\006 \001(\010\022" - "\017\n\007is_beta\030\007 \001(\010\022\014\n\004name\030\010 \001(\t\022\017\n\007progra" - "m\030\t \001(\007\0229\n\010licenses\030\n \003(\0132\'.bgs.protocol" - ".account.v1.AccountLicense\022\031\n\021realm_perm" - "issions\030\013 \001(\r\"\205\001\n\014GameTimeInfo\022\036\n\026is_unl" - "imited_play_time\030\003 \001(\010\022\031\n\021play_time_expi" - "res\030\005 \001(\004\022\027\n\017is_subscription\030\006 \001(\010\022!\n\031is" - "_recurring_subscription\030\007 \001(\010\"\261\001\n\025GameTi" - "meRemainingInfo\022\031\n\021minutes_remaining\030\001 \001" - "(\r\022(\n parental_daily_minutes_remaining\030\002" - " \001(\r\022)\n!parental_weekly_minutes_remainin" - "g\030\003 \001(\r\022(\n\034seconds_remaining_until_kick\030" - "\004 \001(\rB\002\030\001\"\220\001\n\nGameStatus\022\024\n\014is_suspended" - "\030\004 \001(\010\022\021\n\tis_banned\030\005 \001(\010\022\032\n\022suspension_" - "expires\030\006 \001(\004\022\017\n\007program\030\007 \001(\007\022\021\n\tis_loc" - "ked\030\010 \001(\010\022\031\n\021is_bam_unlockable\030\t \001(\010\"\033\n\007" - "RAFInfo\022\020\n\010raf_info\030\001 \001(\014\"\201\002\n\017GameSessio" - "nInfo\022\026\n\nstart_time\030\003 \001(\rB\002\030\001\022>\n\010locatio" - "n\030\004 \001(\0132,.bgs.protocol.account.v1.GameSe" - "ssionLocation\022\026\n\016has_benefactor\030\005 \001(\010\022\024\n" - "\014is_using_igr\030\006 \001(\010\022 \n\030parental_controls" - "_active\030\007 \001(\010\022\026\n\016start_time_sec\030\010 \001(\004\022.\n" - "\006igr_id\030\t \001(\0132\036.bgs.protocol.account.v1." - "IgrId\"D\n\025GameSessionUpdateInfo\022+\n\004cais\030\010" - " \001(\0132\035.bgs.protocol.account.v1.CAIS\"H\n\023G" - "ameSessionLocation\022\022\n\nip_address\030\001 \001(\t\022\017" - "\n\007country\030\002 \001(\r\022\014\n\004city\030\003 \001(\t\"O\n\004CAIS\022\026\n" - "\016played_minutes\030\001 \001(\r\022\026\n\016rested_minutes\030" - "\002 \001(\r\022\027\n\017last_heard_time\030\003 \001(\004\"]\n\017GameAc" - "countList\022\016\n\006region\030\003 \001(\r\022:\n\006handle\030\004 \003(" - "\0132*.bgs.protocol.account.v1.GameAccountH" - "andle\"\232\003\n\014AccountState\022E\n\022account_level_" - "info\030\001 \001(\0132).bgs.protocol.account.v1.Acc" - "ountLevelInfo\022:\n\014privacy_info\030\002 \001(\0132$.bg" - "s.protocol.account.v1.PrivacyInfo\022K\n\025par" - "ental_control_info\030\003 \001(\0132,.bgs.protocol." - "account.v1.ParentalControlInfo\022\?\n\017game_l" - "evel_info\030\005 \003(\0132&.bgs.protocol.account.v" - "1.GameLevelInfo\0228\n\013game_status\030\006 \003(\0132#.b" - "gs.protocol.account.v1.GameStatus\022\?\n\rgam" - "e_accounts\030\007 \003(\0132(.bgs.protocol.account." - "v1.GameAccountList\"\223\001\n\022AccountStateTagge" - "d\022<\n\raccount_state\030\001 \001(\0132%.bgs.protocol." - "account.v1.AccountState\022\?\n\014account_tags\030" - "\002 \001(\0132).bgs.protocol.account.v1.AccountF" - "ieldTags\"\200\002\n\020GameAccountState\022\?\n\017game_le" - "vel_info\030\001 \001(\0132&.bgs.protocol.account.v1" - ".GameLevelInfo\022=\n\016game_time_info\030\002 \001(\0132%" - ".bgs.protocol.account.v1.GameTimeInfo\0228\n" - "\013game_status\030\003 \001(\0132#.bgs.protocol.accoun" - "t.v1.GameStatus\0222\n\010raf_info\030\004 \001(\0132 .bgs." - "protocol.account.v1.RAFInfo\"\251\001\n\026GameAcco" - "untStateTagged\022E\n\022game_account_state\030\001 \001" - "(\0132).bgs.protocol.account.v1.GameAccount" - "State\022H\n\021game_account_tags\030\002 \001(\0132-.bgs.p" - "rotocol.account.v1.GameAccountFieldTags\"" - "/\n\016AuthorizedData\022\014\n\004data\030\001 \001(\t\022\017\n\007licen" - "se\030\002 \003(\r\"j\n\005IgrId\022B\n\014game_account\030\001 \001(\0132" - "*.bgs.protocol.account.v1.GameAccountHan" - "dleH\000\022\025\n\013external_id\030\002 \001(\007H\000B\006\n\004type\"4\n\n" - "IgrAddress\022\026\n\016client_address\030\001 \001(\t\022\016\n\006re" - "gion\030\002 \001(\r\"\262\001\n\022AccountRestriction\022\026\n\016res" - "triction_id\030\001 \001(\r\022\017\n\007program\030\002 \001(\007\0226\n\004ty" - "pe\030\003 \001(\0162(.bgs.protocol.account.v1.Restr" - "ictionType\022\020\n\010platform\030\004 \003(\007\022\023\n\013expire_t" - "ime\030\005 \001(\004\022\024\n\014created_time\030\006 \001(\004*\265\001\n\032Iden" - "tityVerificationStatus\022\021\n\rIDENT_NO_DATA\020" - "\000\022\021\n\rIDENT_PENDING\020\001\022\021\n\rIDENT_OVER_18\020\002\022" - "\022\n\016IDENT_UNDER_18\020\003\022\020\n\014IDENT_FAILED\020\004\022\021\n" - "\rIDENT_SUCCESS\020\005\022\022\n\016IDENT_SUCC_MNL\020\006\022\021\n\r" - "IDENT_UNKNOWN\020\007*\232\001\n\017RestrictionType\022\013\n\007U" - "NKNOWN\020\000\022\027\n\023GAME_ACCOUNT_BANNED\020\001\022\032\n\026GAM" - "E_ACCOUNT_SUSPENDED\020\002\022\022\n\016ACCOUNT_LOCKED\020" - "\003\022\025\n\021ACCOUNT_SQUELCHED\020\004\022\032\n\026CLUB_MEMBERS" - "HIP_LOCKED\020\005B\002H\001", 5976); + "e:\006\202\371+\002\020\001\"*\n\nProgramTag\022\017\n\007program\030\001 \001(\007" + "\022\013\n\003tag\030\002 \001(\007\"(\n\tRegionTag\022\016\n\006region\030\001 \001" + "(\007\022\013\n\003tag\030\002 \001(\007\"\260\002\n\020AccountFieldTags\022\036\n\026" + "account_level_info_tag\030\002 \001(\007\022\030\n\020privacy_" + "info_tag\030\003 \001(\007\022!\n\031parental_control_info_" + "tag\030\004 \001(\007\022A\n\024game_level_info_tags\030\007 \003(\0132" + "#.bgs.protocol.account.v1.ProgramTag\022=\n\020" + "game_status_tags\030\t \003(\0132#.bgs.protocol.ac" + "count.v1.ProgramTag\022=\n\021game_account_tags" + "\030\013 \003(\0132\".bgs.protocol.account.v1.RegionT" + "ag\"~\n\024GameAccountFieldTags\022\033\n\023game_level" + "_info_tag\030\002 \001(\007\022\032\n\022game_time_info_tag\030\003 " + "\001(\007\022\027\n\017game_status_tag\030\004 \001(\007\022\024\n\014raf_info" + "_tag\030\005 \001(\007\"\343\001\n\023AccountFieldOptions\022\022\n\nal" + "l_fields\030\001 \001(\010\022 \n\030field_account_level_in" + "fo\030\002 \001(\010\022\032\n\022field_privacy_info\030\003 \001(\010\022#\n\033" + "field_parental_control_info\030\004 \001(\010\022\035\n\025fie" + "ld_game_level_info\030\006 \001(\010\022\031\n\021field_game_s" + "tatus\030\007 \001(\010\022\033\n\023field_game_accounts\030\010 \001(\010" + "\"\235\001\n\027GameAccountFieldOptions\022\022\n\nall_fiel" + "ds\030\001 \001(\010\022\035\n\025field_game_level_info\030\002 \001(\010\022" + "\034\n\024field_game_time_info\030\003 \001(\010\022\031\n\021field_g" + "ame_status\030\004 \001(\010\022\026\n\016field_raf_info\030\005 \001(\010" + "\"\222\003\n\023SubscriberReference\022\024\n\tobject_id\030\001 " + "\001(\004:\0010\022)\n\tentity_id\030\002 \001(\0132\026.bgs.protocol" + ".EntityId\022E\n\017account_options\030\003 \001(\0132,.bgs" + ".protocol.account.v1.AccountFieldOptions" + "\022\?\n\014account_tags\030\004 \001(\0132).bgs.protocol.ac" + "count.v1.AccountFieldTags\022N\n\024game_accoun" + "t_options\030\005 \001(\01320.bgs.protocol.account.v" + "1.GameAccountFieldOptions\022H\n\021game_accoun" + "t_tags\030\006 \001(\0132-.bgs.protocol.account.v1.G" + "ameAccountFieldTags\022\030\n\rsubscriber_id\030\007 \001" + "(\004:\0010\"\311\003\n\020AccountLevelInfo\0229\n\010licenses\030\003" + " \003(\0132\'.bgs.protocol.account.v1.AccountLi" + "cense\022\030\n\020default_currency\030\004 \001(\007\022\017\n\007count" + "ry\030\005 \001(\t\022\030\n\020preferred_region\030\006 \001(\r\022\021\n\tfu" + "ll_name\030\007 \001(\t\022\022\n\nbattle_tag\030\010 \001(\t\022\r\n\005mut" + "ed\030\t \001(\010\022\025\n\rmanual_review\030\n \001(\010\022\030\n\020accou" + "nt_paid_any\030\013 \001(\010\022R\n\025identity_check_stat" + "us\030\014 \001(\01623.bgs.protocol.account.v1.Ident" + "ityVerificationStatus\022\r\n\005email\030\r \001(\t\022\030\n\020" + "headless_account\030\016 \001(\010\022\024\n\014test_account\030\017" + " \001(\010\022\030\n\020is_sms_protected\030\021 \001(\010\022!\n\031rating" + "s_board_minimum_age\030\022 \001(\r\"\302\002\n\013PrivacyInf" + "o\022\024\n\014is_using_rid\030\003 \001(\010\022#\n\033is_visible_fo" + "r_view_friends\030\004 \001(\010\022$\n\034is_hidden_from_f" + "riend_finder\030\005 \001(\010\022`\n\021game_info_privacy\030" + "\006 \001(\01624.bgs.protocol.account.v1.PrivacyI" + "nfo.GameInfoPrivacy:\017PRIVACY_FRIENDS\022\"\n\032" + "only_allow_friend_whispers\030\007 \001(\010\"L\n\017Game" + "InfoPrivacy\022\016\n\nPRIVACY_ME\020\000\022\023\n\017PRIVACY_F" + "RIENDS\020\001\022\024\n\020PRIVACY_EVERYONE\020\002\"\325\001\n\023Paren" + "talControlInfo\022\020\n\010timezone\030\003 \001(\t\022\027\n\017minu" + "tes_per_day\030\004 \001(\r\022\030\n\020minutes_per_week\030\005 " + "\001(\r\022\031\n\021can_receive_voice\030\006 \001(\010\022\026\n\016can_se" + "nd_voice\030\007 \001(\010\022\025\n\rplay_schedule\030\010 \003(\010\022\026\n" + "\016can_join_group\030\t \001(\010\022\027\n\017can_use_profile" + "\030\n \001(\010\"\323\001\n\rGameLevelInfo\022\020\n\010is_trial\030\004 \001" + "(\010\022\023\n\013is_lifetime\030\005 \001(\010\022\025\n\ris_restricted" + "\030\006 \001(\010\022\017\n\007is_beta\030\007 \001(\010\022\014\n\004name\030\010 \001(\t\022\017\n" + "\007program\030\t \001(\007\0229\n\010licenses\030\n \003(\0132\'.bgs.p" + "rotocol.account.v1.AccountLicense\022\031\n\021rea" + "lm_permissions\030\013 \001(\r\"\205\001\n\014GameTimeInfo\022\036\n" + "\026is_unlimited_play_time\030\003 \001(\010\022\031\n\021play_ti" + "me_expires\030\005 \001(\004\022\027\n\017is_subscription\030\006 \001(" + "\010\022!\n\031is_recurring_subscription\030\007 \001(\010\"\261\001\n" + "\025GameTimeRemainingInfo\022\031\n\021minutes_remain" + "ing\030\001 \001(\r\022(\n parental_daily_minutes_rema" + "ining\030\002 \001(\r\022)\n!parental_weekly_minutes_r" + "emaining\030\003 \001(\r\022(\n\034seconds_remaining_unti" + "l_kick\030\004 \001(\rB\002\030\001\"\220\001\n\nGameStatus\022\024\n\014is_su" + "spended\030\004 \001(\010\022\021\n\tis_banned\030\005 \001(\010\022\032\n\022susp" + "ension_expires\030\006 \001(\004\022\017\n\007program\030\007 \001(\007\022\021\n" + "\tis_locked\030\010 \001(\010\022\031\n\021is_bam_unlockable\030\t " + "\001(\010\"\033\n\007RAFInfo\022\020\n\010raf_info\030\001 \001(\014\"\201\002\n\017Gam" + "eSessionInfo\022\026\n\nstart_time\030\003 \001(\rB\002\030\001\022>\n\010" + "location\030\004 \001(\0132,.bgs.protocol.account.v1" + ".GameSessionLocation\022\026\n\016has_benefactor\030\005" + " \001(\010\022\024\n\014is_using_igr\030\006 \001(\010\022 \n\030parental_c" + "ontrols_active\030\007 \001(\010\022\026\n\016start_time_sec\030\010" + " \001(\004\022.\n\006igr_id\030\t \001(\0132\036.bgs.protocol.acco" + "unt.v1.IgrId\"D\n\025GameSessionUpdateInfo\022+\n" + "\004cais\030\010 \001(\0132\035.bgs.protocol.account.v1.CA" + "IS\"H\n\023GameSessionLocation\022\022\n\nip_address\030" + "\001 \001(\t\022\017\n\007country\030\002 \001(\r\022\014\n\004city\030\003 \001(\t\"O\n\004" + "CAIS\022\026\n\016played_minutes\030\001 \001(\r\022\026\n\016rested_m" + "inutes\030\002 \001(\r\022\027\n\017last_heard_time\030\003 \001(\004\"]\n" + "\017GameAccountList\022\016\n\006region\030\003 \001(\r\022:\n\006hand" + "le\030\004 \003(\0132*.bgs.protocol.account.v1.GameA" + "ccountHandle\"\232\003\n\014AccountState\022E\n\022account" + "_level_info\030\001 \001(\0132).bgs.protocol.account" + ".v1.AccountLevelInfo\022:\n\014privacy_info\030\002 \001" + "(\0132$.bgs.protocol.account.v1.PrivacyInfo" + "\022K\n\025parental_control_info\030\003 \001(\0132,.bgs.pr" + "otocol.account.v1.ParentalControlInfo\022\?\n" + "\017game_level_info\030\005 \003(\0132&.bgs.protocol.ac" + "count.v1.GameLevelInfo\0228\n\013game_status\030\006 " + "\003(\0132#.bgs.protocol.account.v1.GameStatus" + "\022\?\n\rgame_accounts\030\007 \003(\0132(.bgs.protocol.a" + "ccount.v1.GameAccountList\"\223\001\n\022AccountSta" + "teTagged\022<\n\raccount_state\030\001 \001(\0132%.bgs.pr" + "otocol.account.v1.AccountState\022\?\n\014accoun" + "t_tags\030\002 \001(\0132).bgs.protocol.account.v1.A" + "ccountFieldTags\"\200\002\n\020GameAccountState\022\?\n\017" + "game_level_info\030\001 \001(\0132&.bgs.protocol.acc" + "ount.v1.GameLevelInfo\022=\n\016game_time_info\030" + "\002 \001(\0132%.bgs.protocol.account.v1.GameTime" + "Info\0228\n\013game_status\030\003 \001(\0132#.bgs.protocol" + ".account.v1.GameStatus\0222\n\010raf_info\030\004 \001(\013" + "2 .bgs.protocol.account.v1.RAFInfo\"\251\001\n\026G" + "ameAccountStateTagged\022E\n\022game_account_st" + "ate\030\001 \001(\0132).bgs.protocol.account.v1.Game" + "AccountState\022H\n\021game_account_tags\030\002 \001(\0132" + "-.bgs.protocol.account.v1.GameAccountFie" + "ldTags\"/\n\016AuthorizedData\022\014\n\004data\030\001 \001(\t\022\017" + "\n\007license\030\002 \003(\r\"j\n\005IgrId\022B\n\014game_account" + "\030\001 \001(\0132*.bgs.protocol.account.v1.GameAcc" + "ountHandleH\000\022\025\n\013external_id\030\002 \001(\007H\000B\006\n\004t" + "ype\"4\n\nIgrAddress\022\026\n\016client_address\030\001 \001(" + "\t\022\016\n\006region\030\002 \001(\r*\265\001\n\032IdentityVerificati" + "onStatus\022\021\n\rIDENT_NO_DATA\020\000\022\021\n\rIDENT_PEN" + "DING\020\001\022\021\n\rIDENT_OVER_18\020\002\022\022\n\016IDENT_UNDER" + "_18\020\003\022\020\n\014IDENT_FAILED\020\004\022\021\n\rIDENT_SUCCESS" + "\020\005\022\022\n\016IDENT_SUCC_MNL\020\006\022\021\n\rIDENT_UNKNOWN\020" + "\007B\002H\001", 5565); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "account_types.proto", &protobuf_RegisterTypes); AccountId::default_instance_ = new AccountId(); @@ -1095,7 +1055,6 @@ void protobuf_AddDesc_account_5ftypes_2eproto() { IgrId::default_instance_ = new IgrId(); IgrId_default_oneof_instance_ = new IgrIdOneofInstance; IgrAddress::default_instance_ = new IgrAddress(); - AccountRestriction::default_instance_ = new AccountRestriction(); AccountId::default_instance_->InitAsDefaultInstance(); AccountLicense::default_instance_->InitAsDefaultInstance(); GameAccountHandle::default_instance_->InitAsDefaultInstance(); @@ -1128,7 +1087,6 @@ void protobuf_AddDesc_account_5ftypes_2eproto() { AuthorizedData::default_instance_->InitAsDefaultInstance(); IgrId::default_instance_->InitAsDefaultInstance(); IgrAddress::default_instance_->InitAsDefaultInstance(); - AccountRestriction::default_instance_->InitAsDefaultInstance(); ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_account_5ftypes_2eproto); } @@ -1158,24 +1116,6 @@ bool IdentityVerificationStatus_IsValid(int value) { } } -const ::google::protobuf::EnumDescriptor* RestrictionType_descriptor() { - protobuf_AssignDescriptorsOnce(); - return RestrictionType_descriptor_; -} -bool RestrictionType_IsValid(int value) { - switch(value) { - case 0: - case 1: - case 2: - case 3: - case 4: - case 5: - return true; - default: - return false; - } -} - // =================================================================== @@ -2427,7 +2367,6 @@ void AccountReference::Swap(AccountReference* other) { #ifndef _MSC_VER const int Identity::kAccountFieldNumber; const int Identity::kGameAccountFieldNumber; -const int Identity::kProcessFieldNumber; #endif // !_MSC_VER Identity::Identity() @@ -2439,7 +2378,6 @@ Identity::Identity() void Identity::InitAsDefaultInstance() { account_ = const_cast< ::bgs::protocol::account::v1::AccountId*>(&::bgs::protocol::account::v1::AccountId::default_instance()); game_account_ = const_cast< ::bgs::protocol::account::v1::GameAccountHandle*>(&::bgs::protocol::account::v1::GameAccountHandle::default_instance()); - process_ = const_cast< ::bgs::protocol::ProcessId*>(&::bgs::protocol::ProcessId::default_instance()); } Identity::Identity(const Identity& from) @@ -2453,7 +2391,6 @@ void Identity::SharedCtor() { _cached_size_ = 0; account_ = NULL; game_account_ = NULL; - process_ = NULL; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -2466,7 +2403,6 @@ void Identity::SharedDtor() { if (this != default_instance_) { delete account_; delete game_account_; - delete process_; } } @@ -2492,16 +2428,13 @@ Identity* Identity::New() const { } void Identity::Clear() { - if (_has_bits_[0 / 32] & 7) { + if (_has_bits_[0 / 32] & 3) { if (has_account()) { if (account_ != NULL) account_->::bgs::protocol::account::v1::AccountId::Clear(); } if (has_game_account()) { if (game_account_ != NULL) game_account_->::bgs::protocol::account::v1::GameAccountHandle::Clear(); } - if (has_process()) { - if (process_ != NULL) process_->::bgs::protocol::ProcessId::Clear(); - } } ::memset(_has_bits_, 0, sizeof(_has_bits_)); mutable_unknown_fields()->Clear(); @@ -2538,19 +2471,6 @@ bool Identity::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(26)) goto parse_process; - break; - } - - // optional .bgs.protocol.ProcessId process = 3; - case 3: { - if (tag == 26) { - parse_process: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_process())); - } else { - goto handle_unusual; - } if (input->ExpectAtEnd()) goto success; break; } @@ -2592,12 +2512,6 @@ void Identity::SerializeWithCachedSizes( 2, this->game_account(), output); } - // optional .bgs.protocol.ProcessId process = 3; - if (has_process()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 3, this->process(), output); - } - if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -2622,13 +2536,6 @@ void Identity::SerializeWithCachedSizes( 2, this->game_account(), target); } - // optional .bgs.protocol.ProcessId process = 3; - if (has_process()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 3, this->process(), target); - } - if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -2655,13 +2562,6 @@ int Identity::ByteSize() const { this->game_account()); } - // optional .bgs.protocol.ProcessId process = 3; - if (has_process()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->process()); - } - } if (!unknown_fields().empty()) { total_size += @@ -2695,9 +2595,6 @@ void Identity::MergeFrom(const Identity& from) { if (from.has_game_account()) { mutable_game_account()->::bgs::protocol::account::v1::GameAccountHandle::MergeFrom(from.game_account()); } - if (from.has_process()) { - mutable_process()->::bgs::protocol::ProcessId::MergeFrom(from.process()); - } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); } @@ -2722,9 +2619,6 @@ bool Identity::IsInitialized() const { if (has_game_account()) { if (!this->game_account().IsInitialized()) return false; } - if (has_process()) { - if (!this->process().IsInitialized()) return false; - } return true; } @@ -2732,7 +2626,6 @@ void Identity::Swap(Identity* other) { if (other != this) { std::swap(account_, other->account_); std::swap(game_account_, other->game_account_); - std::swap(process_, other->process_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); @@ -5390,8 +5283,8 @@ const int AccountLevelInfo::kIdentityCheckStatusFieldNumber; const int AccountLevelInfo::kEmailFieldNumber; const int AccountLevelInfo::kHeadlessAccountFieldNumber; const int AccountLevelInfo::kTestAccountFieldNumber; -const int AccountLevelInfo::kRestrictionFieldNumber; const int AccountLevelInfo::kIsSmsProtectedFieldNumber; +const int AccountLevelInfo::kRatingsBoardMinimumAgeFieldNumber; #endif // !_MSC_VER AccountLevelInfo::AccountLevelInfo() @@ -5426,6 +5319,7 @@ void AccountLevelInfo::SharedCtor() { headless_account_ = false; test_account_ = false; is_sms_protected_ = false; + ratings_board_minimum_age_ = 0u; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -5502,9 +5396,9 @@ void AccountLevelInfo::Clear() { } } } - if (_has_bits_[8 / 32] & 24320) { + if (_has_bits_[8 / 32] & 32512) { ZR_(account_paid_any_, identity_check_status_); - ZR_(test_account_, is_sms_protected_); + ZR_(test_account_, ratings_board_minimum_age_); if (has_email()) { if (email_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { email_->clear(); @@ -5516,7 +5410,6 @@ void AccountLevelInfo::Clear() { #undef ZR_ licenses_.Clear(); - restriction_.Clear(); ::memset(_has_bits_, 0, sizeof(_has_bits_)); mutable_unknown_fields()->Clear(); } @@ -5734,20 +5627,6 @@ bool AccountLevelInfo::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(130)) goto parse_restriction; - break; - } - - // repeated .bgs.protocol.account.v1.AccountRestriction restriction = 16; - case 16: { - if (tag == 130) { - parse_restriction: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, add_restriction())); - } else { - goto handle_unusual; - } - if (input->ExpectTag(130)) goto parse_restriction; if (input->ExpectTag(136)) goto parse_is_sms_protected; break; } @@ -5763,6 +5642,21 @@ bool AccountLevelInfo::MergePartialFromCodedStream( } else { goto handle_unusual; } + if (input->ExpectTag(144)) goto parse_ratings_board_minimum_age; + break; + } + + // optional uint32 ratings_board_minimum_age = 18; + case 18: { + if (tag == 144) { + parse_ratings_board_minimum_age: + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( + input, &ratings_board_minimum_age_))); + set_has_ratings_board_minimum_age(); + } else { + goto handle_unusual; + } if (input->ExpectAtEnd()) goto success; break; } @@ -5879,17 +5773,16 @@ void AccountLevelInfo::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteBool(15, this->test_account(), output); } - // repeated .bgs.protocol.account.v1.AccountRestriction restriction = 16; - for (int i = 0; i < this->restriction_size(); i++) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 16, this->restriction(i), output); - } - // optional bool is_sms_protected = 17; if (has_is_sms_protected()) { ::google::protobuf::internal::WireFormatLite::WriteBool(17, this->is_sms_protected(), output); } + // optional uint32 ratings_board_minimum_age = 18; + if (has_ratings_board_minimum_age()) { + ::google::protobuf::internal::WireFormatLite::WriteUInt32(18, this->ratings_board_minimum_age(), output); + } + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -5992,18 +5885,16 @@ void AccountLevelInfo::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(15, this->test_account(), target); } - // repeated .bgs.protocol.account.v1.AccountRestriction restriction = 16; - for (int i = 0; i < this->restriction_size(); i++) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 16, this->restriction(i), target); - } - // optional bool is_sms_protected = 17; if (has_is_sms_protected()) { target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(17, this->is_sms_protected(), target); } + // optional uint32 ratings_board_minimum_age = 18; + if (has_ratings_board_minimum_age()) { + target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(18, this->ratings_board_minimum_age(), target); + } + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -6094,6 +5985,13 @@ int AccountLevelInfo::ByteSize() const { total_size += 2 + 1; } + // optional uint32 ratings_board_minimum_age = 18; + if (has_ratings_board_minimum_age()) { + total_size += 2 + + ::google::protobuf::internal::WireFormatLite::UInt32Size( + this->ratings_board_minimum_age()); + } + } // repeated .bgs.protocol.account.v1.AccountLicense licenses = 3; total_size += 1 * this->licenses_size(); @@ -6103,14 +6001,6 @@ int AccountLevelInfo::ByteSize() const { this->licenses(i)); } - // repeated .bgs.protocol.account.v1.AccountRestriction restriction = 16; - total_size += 2 * this->restriction_size(); - for (int i = 0; i < this->restriction_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->restriction(i)); - } - if (!unknown_fields().empty()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( @@ -6137,7 +6027,6 @@ void AccountLevelInfo::MergeFrom(const ::google::protobuf::Message& from) { void AccountLevelInfo::MergeFrom(const AccountLevelInfo& from) { GOOGLE_CHECK_NE(&from, this); licenses_.MergeFrom(from.licenses_); - restriction_.MergeFrom(from.restriction_); if (from._has_bits_[1 / 32] & (0xffu << (1 % 32))) { if (from.has_default_currency()) { set_default_currency(from.default_currency()); @@ -6180,6 +6069,9 @@ void AccountLevelInfo::MergeFrom(const AccountLevelInfo& from) { if (from.has_is_sms_protected()) { set_is_sms_protected(from.is_sms_protected()); } + if (from.has_ratings_board_minimum_age()) { + set_ratings_board_minimum_age(from.ratings_board_minimum_age()); + } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); } @@ -6217,8 +6109,8 @@ void AccountLevelInfo::Swap(AccountLevelInfo* other) { std::swap(email_, other->email_); std::swap(headless_account_, other->headless_account_); std::swap(test_account_, other->test_account_); - restriction_.Swap(&other->restriction_); std::swap(is_sms_protected_, other->is_sms_protected_); + std::swap(ratings_board_minimum_age_, other->ratings_board_minimum_age_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); @@ -12870,443 +12762,6 @@ void IgrAddress::Swap(IgrAddress* other) { } -// =================================================================== - -#ifndef _MSC_VER -const int AccountRestriction::kRestrictionIdFieldNumber; -const int AccountRestriction::kProgramFieldNumber; -const int AccountRestriction::kTypeFieldNumber; -const int AccountRestriction::kPlatformFieldNumber; -const int AccountRestriction::kExpireTimeFieldNumber; -const int AccountRestriction::kCreatedTimeFieldNumber; -#endif // !_MSC_VER - -AccountRestriction::AccountRestriction() - : ::google::protobuf::Message() { - SharedCtor(); - // @@protoc_insertion_point(constructor:bgs.protocol.account.v1.AccountRestriction) -} - -void AccountRestriction::InitAsDefaultInstance() { -} - -AccountRestriction::AccountRestriction(const AccountRestriction& from) - : ::google::protobuf::Message() { - SharedCtor(); - MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:bgs.protocol.account.v1.AccountRestriction) -} - -void AccountRestriction::SharedCtor() { - _cached_size_ = 0; - restriction_id_ = 0u; - program_ = 0u; - type_ = 0; - expire_time_ = GOOGLE_ULONGLONG(0); - created_time_ = GOOGLE_ULONGLONG(0); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); -} - -AccountRestriction::~AccountRestriction() { - // @@protoc_insertion_point(destructor:bgs.protocol.account.v1.AccountRestriction) - SharedDtor(); -} - -void AccountRestriction::SharedDtor() { - if (this != default_instance_) { - } -} - -void AccountRestriction::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const ::google::protobuf::Descriptor* AccountRestriction::descriptor() { - protobuf_AssignDescriptorsOnce(); - return AccountRestriction_descriptor_; -} - -const AccountRestriction& AccountRestriction::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_account_5ftypes_2eproto(); - return *default_instance_; -} - -AccountRestriction* AccountRestriction::default_instance_ = NULL; - -AccountRestriction* AccountRestriction::New() const { - return new AccountRestriction; -} - -void AccountRestriction::Clear() { -#define OFFSET_OF_FIELD_(f) (reinterpret_cast<char*>( \ - &reinterpret_cast<AccountRestriction*>(16)->f) - \ - reinterpret_cast<char*>(16)) - -#define ZR_(first, last) do { \ - size_t f = OFFSET_OF_FIELD_(first); \ - size_t n = OFFSET_OF_FIELD_(last) - f + sizeof(last); \ - ::memset(&first, 0, n); \ - } while (0) - - if (_has_bits_[0 / 32] & 55) { - ZR_(restriction_id_, program_); - ZR_(expire_time_, type_); - } - -#undef OFFSET_OF_FIELD_ -#undef ZR_ - - platform_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - mutable_unknown_fields()->Clear(); -} - -bool AccountRestriction::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:bgs.protocol.account.v1.AccountRestriction) - for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // optional uint32 restriction_id = 1; - case 1: { - if (tag == 8) { - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( - input, &restriction_id_))); - set_has_restriction_id(); - } else { - goto handle_unusual; - } - if (input->ExpectTag(21)) goto parse_program; - break; - } - - // optional fixed32 program = 2; - case 2: { - if (tag == 21) { - parse_program: - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_FIXED32>( - input, &program_))); - set_has_program(); - } else { - goto handle_unusual; - } - if (input->ExpectTag(24)) goto parse_type; - break; - } - - // optional .bgs.protocol.account.v1.RestrictionType type = 3; - case 3: { - if (tag == 24) { - parse_type: - int value; - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( - input, &value))); - if (::bgs::protocol::account::v1::RestrictionType_IsValid(value)) { - set_type(static_cast< ::bgs::protocol::account::v1::RestrictionType >(value)); - } else { - mutable_unknown_fields()->AddVarint(3, value); - } - } else { - goto handle_unusual; - } - if (input->ExpectTag(37)) goto parse_platform; - break; - } - - // repeated fixed32 platform = 4; - case 4: { - if (tag == 37) { - parse_platform: - DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive< - ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_FIXED32>( - 1, 37, input, this->mutable_platform()))); - } else if (tag == 34) { - DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline< - ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_FIXED32>( - input, this->mutable_platform()))); - } else { - goto handle_unusual; - } - if (input->ExpectTag(37)) goto parse_platform; - if (input->ExpectTag(40)) goto parse_expire_time; - break; - } - - // optional uint64 expire_time = 5; - case 5: { - if (tag == 40) { - parse_expire_time: - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>( - input, &expire_time_))); - set_has_expire_time(); - } else { - goto handle_unusual; - } - if (input->ExpectTag(48)) goto parse_created_time; - break; - } - - // optional uint64 created_time = 6; - case 6: { - if (tag == 48) { - parse_created_time: - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>( - input, &created_time_))); - set_has_created_time(); - } else { - goto handle_unusual; - } - if (input->ExpectAtEnd()) goto success; - break; - } - - default: { - handle_unusual: - if (tag == 0 || - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { - goto success; - } - DO_(::google::protobuf::internal::WireFormat::SkipField( - input, tag, mutable_unknown_fields())); - break; - } - } - } -success: - // @@protoc_insertion_point(parse_success:bgs.protocol.account.v1.AccountRestriction) - return true; -failure: - // @@protoc_insertion_point(parse_failure:bgs.protocol.account.v1.AccountRestriction) - return false; -#undef DO_ -} - -void AccountRestriction::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:bgs.protocol.account.v1.AccountRestriction) - // optional uint32 restriction_id = 1; - if (has_restriction_id()) { - ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->restriction_id(), output); - } - - // optional fixed32 program = 2; - if (has_program()) { - ::google::protobuf::internal::WireFormatLite::WriteFixed32(2, this->program(), output); - } - - // optional .bgs.protocol.account.v1.RestrictionType type = 3; - if (has_type()) { - ::google::protobuf::internal::WireFormatLite::WriteEnum( - 3, this->type(), output); - } - - // repeated fixed32 platform = 4; - for (int i = 0; i < this->platform_size(); i++) { - ::google::protobuf::internal::WireFormatLite::WriteFixed32( - 4, this->platform(i), output); - } - - // optional uint64 expire_time = 5; - if (has_expire_time()) { - ::google::protobuf::internal::WireFormatLite::WriteUInt64(5, this->expire_time(), output); - } - - // optional uint64 created_time = 6; - if (has_created_time()) { - ::google::protobuf::internal::WireFormatLite::WriteUInt64(6, this->created_time(), output); - } - - if (!unknown_fields().empty()) { - ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - unknown_fields(), output); - } - // @@protoc_insertion_point(serialize_end:bgs.protocol.account.v1.AccountRestriction) -} - -::google::protobuf::uint8* AccountRestriction::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.account.v1.AccountRestriction) - // optional uint32 restriction_id = 1; - if (has_restriction_id()) { - target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->restriction_id(), target); - } - - // optional fixed32 program = 2; - if (has_program()) { - target = ::google::protobuf::internal::WireFormatLite::WriteFixed32ToArray(2, this->program(), target); - } - - // optional .bgs.protocol.account.v1.RestrictionType type = 3; - if (has_type()) { - target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( - 3, this->type(), target); - } - - // repeated fixed32 platform = 4; - for (int i = 0; i < this->platform_size(); i++) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteFixed32ToArray(4, this->platform(i), target); - } - - // optional uint64 expire_time = 5; - if (has_expire_time()) { - target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(5, this->expire_time(), target); - } - - // optional uint64 created_time = 6; - if (has_created_time()) { - target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(6, this->created_time(), target); - } - - if (!unknown_fields().empty()) { - target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - unknown_fields(), target); - } - // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.account.v1.AccountRestriction) - return target; -} - -int AccountRestriction::ByteSize() const { - int total_size = 0; - - if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // optional uint32 restriction_id = 1; - if (has_restriction_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::UInt32Size( - this->restriction_id()); - } - - // optional fixed32 program = 2; - if (has_program()) { - total_size += 1 + 4; - } - - // optional .bgs.protocol.account.v1.RestrictionType type = 3; - if (has_type()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::EnumSize(this->type()); - } - - // optional uint64 expire_time = 5; - if (has_expire_time()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::UInt64Size( - this->expire_time()); - } - - // optional uint64 created_time = 6; - if (has_created_time()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::UInt64Size( - this->created_time()); - } - - } - // repeated fixed32 platform = 4; - { - int data_size = 0; - data_size = 4 * this->platform_size(); - total_size += 1 * this->platform_size() + data_size; - } - - if (!unknown_fields().empty()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); - } - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); - return total_size; -} - -void AccountRestriction::MergeFrom(const ::google::protobuf::Message& from) { - GOOGLE_CHECK_NE(&from, this); - const AccountRestriction* source = - ::google::protobuf::internal::dynamic_cast_if_available<const AccountRestriction*>( - &from); - if (source == NULL) { - ::google::protobuf::internal::ReflectionOps::Merge(from, this); - } else { - MergeFrom(*source); - } -} - -void AccountRestriction::MergeFrom(const AccountRestriction& from) { - GOOGLE_CHECK_NE(&from, this); - platform_.MergeFrom(from.platform_); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { - if (from.has_restriction_id()) { - set_restriction_id(from.restriction_id()); - } - if (from.has_program()) { - set_program(from.program()); - } - if (from.has_type()) { - set_type(from.type()); - } - if (from.has_expire_time()) { - set_expire_time(from.expire_time()); - } - if (from.has_created_time()) { - set_created_time(from.created_time()); - } - } - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); -} - -void AccountRestriction::CopyFrom(const ::google::protobuf::Message& from) { - if (&from == this) return; - Clear(); - MergeFrom(from); -} - -void AccountRestriction::CopyFrom(const AccountRestriction& from) { - if (&from == this) return; - Clear(); - MergeFrom(from); -} - -bool AccountRestriction::IsInitialized() const { - - return true; -} - -void AccountRestriction::Swap(AccountRestriction* other) { - if (other != this) { - std::swap(restriction_id_, other->restriction_id_); - std::swap(program_, other->program_); - std::swap(type_, other->type_); - platform_.Swap(&other->platform_); - std::swap(expire_time_, other->expire_time_); - std::swap(created_time_, other->created_time_); - std::swap(_has_bits_[0], other->_has_bits_[0]); - _unknown_fields_.Swap(&other->_unknown_fields_); - std::swap(_cached_size_, other->_cached_size_); - } -} - -::google::protobuf::Metadata AccountRestriction::GetMetadata() const { - protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = AccountRestriction_descriptor_; - metadata.reflection = AccountRestriction_reflection_; - return metadata; -} - - // @@protoc_insertion_point(namespace_scope) } // namespace v1 diff --git a/src/server/proto/Client/account_types.pb.h b/src/server/proto/Client/account_types.pb.h index 28f71f9dce4..6723f063e9b 100644 --- a/src/server/proto/Client/account_types.pb.h +++ b/src/server/proto/Client/account_types.pb.h @@ -72,7 +72,6 @@ class GameAccountStateTagged; class AuthorizedData; class IgrId; class IgrAddress; -class AccountRestriction; enum PrivacyInfo_GameInfoPrivacy { PrivacyInfo_GameInfoPrivacy_PRIVACY_ME = 0, @@ -119,29 +118,6 @@ inline bool IdentityVerificationStatus_Parse( return ::google::protobuf::internal::ParseNamedEnum<IdentityVerificationStatus>( IdentityVerificationStatus_descriptor(), name, value); } -enum RestrictionType { - UNKNOWN = 0, - GAME_ACCOUNT_BANNED = 1, - GAME_ACCOUNT_SUSPENDED = 2, - ACCOUNT_LOCKED = 3, - ACCOUNT_SQUELCHED = 4, - CLUB_MEMBERSHIP_LOCKED = 5 -}; -TC_PROTO_API bool RestrictionType_IsValid(int value); -const RestrictionType RestrictionType_MIN = UNKNOWN; -const RestrictionType RestrictionType_MAX = CLUB_MEMBERSHIP_LOCKED; -const int RestrictionType_ARRAYSIZE = RestrictionType_MAX + 1; - -TC_PROTO_API const ::google::protobuf::EnumDescriptor* RestrictionType_descriptor(); -inline const ::std::string& RestrictionType_Name(RestrictionType value) { - return ::google::protobuf::internal::NameOfEnum( - RestrictionType_descriptor(), value); -} -inline bool RestrictionType_Parse( - const ::std::string& name, RestrictionType* value) { - return ::google::protobuf::internal::ParseNamedEnum<RestrictionType>( - RestrictionType_descriptor(), name, value); -} // =================================================================== class TC_PROTO_API AccountId : public ::google::protobuf::Message { @@ -613,23 +589,12 @@ class TC_PROTO_API Identity : public ::google::protobuf::Message { inline ::bgs::protocol::account::v1::GameAccountHandle* release_game_account(); inline void set_allocated_game_account(::bgs::protocol::account::v1::GameAccountHandle* game_account); - // optional .bgs.protocol.ProcessId process = 3; - inline bool has_process() const; - inline void clear_process(); - static const int kProcessFieldNumber = 3; - inline const ::bgs::protocol::ProcessId& process() const; - inline ::bgs::protocol::ProcessId* mutable_process(); - inline ::bgs::protocol::ProcessId* release_process(); - inline void set_allocated_process(::bgs::protocol::ProcessId* process); - // @@protoc_insertion_point(class_scope:bgs.protocol.account.v1.Identity) private: inline void set_has_account(); inline void clear_has_account(); inline void set_has_game_account(); inline void clear_has_game_account(); - inline void set_has_process(); - inline void clear_has_process(); ::google::protobuf::UnknownFieldSet _unknown_fields_; @@ -637,7 +602,6 @@ class TC_PROTO_API Identity : public ::google::protobuf::Message { mutable int _cached_size_; ::bgs::protocol::account::v1::AccountId* account_; ::bgs::protocol::account::v1::GameAccountHandle* game_account_; - ::bgs::protocol::ProcessId* process_; friend void TC_PROTO_API protobuf_AddDesc_account_5ftypes_2eproto(); friend void protobuf_AssignDesc_account_5ftypes_2eproto(); friend void protobuf_ShutdownFile_account_5ftypes_2eproto(); @@ -1648,18 +1612,6 @@ class TC_PROTO_API AccountLevelInfo : public ::google::protobuf::Message { inline bool test_account() const; inline void set_test_account(bool value); - // repeated .bgs.protocol.account.v1.AccountRestriction restriction = 16; - inline int restriction_size() const; - inline void clear_restriction(); - static const int kRestrictionFieldNumber = 16; - inline const ::bgs::protocol::account::v1::AccountRestriction& restriction(int index) const; - inline ::bgs::protocol::account::v1::AccountRestriction* mutable_restriction(int index); - inline ::bgs::protocol::account::v1::AccountRestriction* add_restriction(); - inline const ::google::protobuf::RepeatedPtrField< ::bgs::protocol::account::v1::AccountRestriction >& - restriction() const; - inline ::google::protobuf::RepeatedPtrField< ::bgs::protocol::account::v1::AccountRestriction >* - mutable_restriction(); - // optional bool is_sms_protected = 17; inline bool has_is_sms_protected() const; inline void clear_is_sms_protected(); @@ -1667,6 +1619,13 @@ class TC_PROTO_API AccountLevelInfo : public ::google::protobuf::Message { inline bool is_sms_protected() const; inline void set_is_sms_protected(bool value); + // optional uint32 ratings_board_minimum_age = 18; + inline bool has_ratings_board_minimum_age() const; + inline void clear_ratings_board_minimum_age(); + static const int kRatingsBoardMinimumAgeFieldNumber = 18; + inline ::google::protobuf::uint32 ratings_board_minimum_age() const; + inline void set_ratings_board_minimum_age(::google::protobuf::uint32 value); + // @@protoc_insertion_point(class_scope:bgs.protocol.account.v1.AccountLevelInfo) private: inline void set_has_default_currency(); @@ -1695,6 +1654,8 @@ class TC_PROTO_API AccountLevelInfo : public ::google::protobuf::Message { inline void clear_has_test_account(); inline void set_has_is_sms_protected(); inline void clear_has_is_sms_protected(); + inline void set_has_ratings_board_minimum_age(); + inline void clear_has_ratings_board_minimum_age(); ::google::protobuf::UnknownFieldSet _unknown_fields_; @@ -1712,9 +1673,9 @@ class TC_PROTO_API AccountLevelInfo : public ::google::protobuf::Message { bool headless_account_; int identity_check_status_; ::std::string* email_; - ::google::protobuf::RepeatedPtrField< ::bgs::protocol::account::v1::AccountRestriction > restriction_; bool test_account_; bool is_sms_protected_; + ::google::protobuf::uint32 ratings_board_minimum_age_; friend void TC_PROTO_API protobuf_AddDesc_account_5ftypes_2eproto(); friend void protobuf_AssignDesc_account_5ftypes_2eproto(); friend void protobuf_ShutdownFile_account_5ftypes_2eproto(); @@ -3877,138 +3838,6 @@ class TC_PROTO_API IgrAddress : public ::google::protobuf::Message { void InitAsDefaultInstance(); static IgrAddress* default_instance_; }; -// ------------------------------------------------------------------- - -class TC_PROTO_API AccountRestriction : public ::google::protobuf::Message { - public: - AccountRestriction(); - virtual ~AccountRestriction(); - - AccountRestriction(const AccountRestriction& from); - - inline AccountRestriction& operator=(const AccountRestriction& from) { - CopyFrom(from); - return *this; - } - - inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { - return _unknown_fields_; - } - - inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { - return &_unknown_fields_; - } - - static const ::google::protobuf::Descriptor* descriptor(); - static const AccountRestriction& default_instance(); - - void Swap(AccountRestriction* other); - - // implements Message ---------------------------------------------- - - AccountRestriction* New() const; - void CopyFrom(const ::google::protobuf::Message& from); - void MergeFrom(const ::google::protobuf::Message& from); - void CopyFrom(const AccountRestriction& from); - void MergeFrom(const AccountRestriction& from); - void Clear(); - bool IsInitialized() const; - - int ByteSize() const; - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input); - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const; - ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; - int GetCachedSize() const { return _cached_size_; } - private: - void SharedCtor(); - void SharedDtor(); - void SetCachedSize(int size) const; - public: - ::google::protobuf::Metadata GetMetadata() const; - - // nested types ---------------------------------------------------- - - // accessors ------------------------------------------------------- - - // optional uint32 restriction_id = 1; - inline bool has_restriction_id() const; - inline void clear_restriction_id(); - static const int kRestrictionIdFieldNumber = 1; - inline ::google::protobuf::uint32 restriction_id() const; - inline void set_restriction_id(::google::protobuf::uint32 value); - - // optional fixed32 program = 2; - inline bool has_program() const; - inline void clear_program(); - static const int kProgramFieldNumber = 2; - inline ::google::protobuf::uint32 program() const; - inline void set_program(::google::protobuf::uint32 value); - - // optional .bgs.protocol.account.v1.RestrictionType type = 3; - inline bool has_type() const; - inline void clear_type(); - static const int kTypeFieldNumber = 3; - inline ::bgs::protocol::account::v1::RestrictionType type() const; - inline void set_type(::bgs::protocol::account::v1::RestrictionType value); - - // repeated fixed32 platform = 4; - inline int platform_size() const; - inline void clear_platform(); - static const int kPlatformFieldNumber = 4; - inline ::google::protobuf::uint32 platform(int index) const; - inline void set_platform(int index, ::google::protobuf::uint32 value); - inline void add_platform(::google::protobuf::uint32 value); - inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >& - platform() const; - inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >* - mutable_platform(); - - // optional uint64 expire_time = 5; - inline bool has_expire_time() const; - inline void clear_expire_time(); - static const int kExpireTimeFieldNumber = 5; - inline ::google::protobuf::uint64 expire_time() const; - inline void set_expire_time(::google::protobuf::uint64 value); - - // optional uint64 created_time = 6; - inline bool has_created_time() const; - inline void clear_created_time(); - static const int kCreatedTimeFieldNumber = 6; - inline ::google::protobuf::uint64 created_time() const; - inline void set_created_time(::google::protobuf::uint64 value); - - // @@protoc_insertion_point(class_scope:bgs.protocol.account.v1.AccountRestriction) - private: - inline void set_has_restriction_id(); - inline void clear_has_restriction_id(); - inline void set_has_program(); - inline void clear_has_program(); - inline void set_has_type(); - inline void clear_has_type(); - inline void set_has_expire_time(); - inline void clear_has_expire_time(); - inline void set_has_created_time(); - inline void clear_has_created_time(); - - ::google::protobuf::UnknownFieldSet _unknown_fields_; - - ::google::protobuf::uint32 _has_bits_[1]; - mutable int _cached_size_; - ::google::protobuf::uint32 restriction_id_; - ::google::protobuf::uint32 program_; - ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > platform_; - ::google::protobuf::uint64 expire_time_; - ::google::protobuf::uint64 created_time_; - int type_; - friend void TC_PROTO_API protobuf_AddDesc_account_5ftypes_2eproto(); - friend void protobuf_AssignDesc_account_5ftypes_2eproto(); - friend void protobuf_ShutdownFile_account_5ftypes_2eproto(); - - void InitAsDefaultInstance(); - static AccountRestriction* default_instance_; -}; // =================================================================== @@ -4502,47 +4331,6 @@ inline void Identity::set_allocated_game_account(::bgs::protocol::account::v1::G // @@protoc_insertion_point(field_set_allocated:bgs.protocol.account.v1.Identity.game_account) } -// optional .bgs.protocol.ProcessId process = 3; -inline bool Identity::has_process() const { - return (_has_bits_[0] & 0x00000004u) != 0; -} -inline void Identity::set_has_process() { - _has_bits_[0] |= 0x00000004u; -} -inline void Identity::clear_has_process() { - _has_bits_[0] &= ~0x00000004u; -} -inline void Identity::clear_process() { - if (process_ != NULL) process_->::bgs::protocol::ProcessId::Clear(); - clear_has_process(); -} -inline const ::bgs::protocol::ProcessId& Identity::process() const { - // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.Identity.process) - return process_ != NULL ? *process_ : *default_instance_->process_; -} -inline ::bgs::protocol::ProcessId* Identity::mutable_process() { - set_has_process(); - if (process_ == NULL) process_ = new ::bgs::protocol::ProcessId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.account.v1.Identity.process) - return process_; -} -inline ::bgs::protocol::ProcessId* Identity::release_process() { - clear_has_process(); - ::bgs::protocol::ProcessId* temp = process_; - process_ = NULL; - return temp; -} -inline void Identity::set_allocated_process(::bgs::protocol::ProcessId* process) { - delete process_; - process_ = process; - if (process) { - set_has_process(); - } else { - clear_has_process(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.account.v1.Identity.process) -} - // ------------------------------------------------------------------- // ProgramTag @@ -5997,45 +5785,15 @@ inline void AccountLevelInfo::set_test_account(bool value) { // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.AccountLevelInfo.test_account) } -// repeated .bgs.protocol.account.v1.AccountRestriction restriction = 16; -inline int AccountLevelInfo::restriction_size() const { - return restriction_.size(); -} -inline void AccountLevelInfo::clear_restriction() { - restriction_.Clear(); -} -inline const ::bgs::protocol::account::v1::AccountRestriction& AccountLevelInfo::restriction(int index) const { - // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.AccountLevelInfo.restriction) - return restriction_.Get(index); -} -inline ::bgs::protocol::account::v1::AccountRestriction* AccountLevelInfo::mutable_restriction(int index) { - // @@protoc_insertion_point(field_mutable:bgs.protocol.account.v1.AccountLevelInfo.restriction) - return restriction_.Mutable(index); -} -inline ::bgs::protocol::account::v1::AccountRestriction* AccountLevelInfo::add_restriction() { - // @@protoc_insertion_point(field_add:bgs.protocol.account.v1.AccountLevelInfo.restriction) - return restriction_.Add(); -} -inline const ::google::protobuf::RepeatedPtrField< ::bgs::protocol::account::v1::AccountRestriction >& -AccountLevelInfo::restriction() const { - // @@protoc_insertion_point(field_list:bgs.protocol.account.v1.AccountLevelInfo.restriction) - return restriction_; -} -inline ::google::protobuf::RepeatedPtrField< ::bgs::protocol::account::v1::AccountRestriction >* -AccountLevelInfo::mutable_restriction() { - // @@protoc_insertion_point(field_mutable_list:bgs.protocol.account.v1.AccountLevelInfo.restriction) - return &restriction_; -} - // optional bool is_sms_protected = 17; inline bool AccountLevelInfo::has_is_sms_protected() const { - return (_has_bits_[0] & 0x00004000u) != 0; + return (_has_bits_[0] & 0x00002000u) != 0; } inline void AccountLevelInfo::set_has_is_sms_protected() { - _has_bits_[0] |= 0x00004000u; + _has_bits_[0] |= 0x00002000u; } inline void AccountLevelInfo::clear_has_is_sms_protected() { - _has_bits_[0] &= ~0x00004000u; + _has_bits_[0] &= ~0x00002000u; } inline void AccountLevelInfo::clear_is_sms_protected() { is_sms_protected_ = false; @@ -6051,6 +5809,30 @@ inline void AccountLevelInfo::set_is_sms_protected(bool value) { // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.AccountLevelInfo.is_sms_protected) } +// optional uint32 ratings_board_minimum_age = 18; +inline bool AccountLevelInfo::has_ratings_board_minimum_age() const { + return (_has_bits_[0] & 0x00004000u) != 0; +} +inline void AccountLevelInfo::set_has_ratings_board_minimum_age() { + _has_bits_[0] |= 0x00004000u; +} +inline void AccountLevelInfo::clear_has_ratings_board_minimum_age() { + _has_bits_[0] &= ~0x00004000u; +} +inline void AccountLevelInfo::clear_ratings_board_minimum_age() { + ratings_board_minimum_age_ = 0u; + clear_has_ratings_board_minimum_age(); +} +inline ::google::protobuf::uint32 AccountLevelInfo::ratings_board_minimum_age() const { + // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.AccountLevelInfo.ratings_board_minimum_age) + return ratings_board_minimum_age_; +} +inline void AccountLevelInfo::set_ratings_board_minimum_age(::google::protobuf::uint32 value) { + set_has_ratings_board_minimum_age(); + ratings_board_minimum_age_ = value; + // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.AccountLevelInfo.ratings_board_minimum_age) +} + // ------------------------------------------------------------------- // PrivacyInfo @@ -8531,161 +8313,6 @@ inline void IgrAddress::set_region(::google::protobuf::uint32 value) { // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.IgrAddress.region) } -// ------------------------------------------------------------------- - -// AccountRestriction - -// optional uint32 restriction_id = 1; -inline bool AccountRestriction::has_restriction_id() const { - return (_has_bits_[0] & 0x00000001u) != 0; -} -inline void AccountRestriction::set_has_restriction_id() { - _has_bits_[0] |= 0x00000001u; -} -inline void AccountRestriction::clear_has_restriction_id() { - _has_bits_[0] &= ~0x00000001u; -} -inline void AccountRestriction::clear_restriction_id() { - restriction_id_ = 0u; - clear_has_restriction_id(); -} -inline ::google::protobuf::uint32 AccountRestriction::restriction_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.AccountRestriction.restriction_id) - return restriction_id_; -} -inline void AccountRestriction::set_restriction_id(::google::protobuf::uint32 value) { - set_has_restriction_id(); - restriction_id_ = value; - // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.AccountRestriction.restriction_id) -} - -// optional fixed32 program = 2; -inline bool AccountRestriction::has_program() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void AccountRestriction::set_has_program() { - _has_bits_[0] |= 0x00000002u; -} -inline void AccountRestriction::clear_has_program() { - _has_bits_[0] &= ~0x00000002u; -} -inline void AccountRestriction::clear_program() { - program_ = 0u; - clear_has_program(); -} -inline ::google::protobuf::uint32 AccountRestriction::program() const { - // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.AccountRestriction.program) - return program_; -} -inline void AccountRestriction::set_program(::google::protobuf::uint32 value) { - set_has_program(); - program_ = value; - // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.AccountRestriction.program) -} - -// optional .bgs.protocol.account.v1.RestrictionType type = 3; -inline bool AccountRestriction::has_type() const { - return (_has_bits_[0] & 0x00000004u) != 0; -} -inline void AccountRestriction::set_has_type() { - _has_bits_[0] |= 0x00000004u; -} -inline void AccountRestriction::clear_has_type() { - _has_bits_[0] &= ~0x00000004u; -} -inline void AccountRestriction::clear_type() { - type_ = 0; - clear_has_type(); -} -inline ::bgs::protocol::account::v1::RestrictionType AccountRestriction::type() const { - // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.AccountRestriction.type) - return static_cast< ::bgs::protocol::account::v1::RestrictionType >(type_); -} -inline void AccountRestriction::set_type(::bgs::protocol::account::v1::RestrictionType value) { - assert(::bgs::protocol::account::v1::RestrictionType_IsValid(value)); - set_has_type(); - type_ = value; - // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.AccountRestriction.type) -} - -// repeated fixed32 platform = 4; -inline int AccountRestriction::platform_size() const { - return platform_.size(); -} -inline void AccountRestriction::clear_platform() { - platform_.Clear(); -} -inline ::google::protobuf::uint32 AccountRestriction::platform(int index) const { - // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.AccountRestriction.platform) - return platform_.Get(index); -} -inline void AccountRestriction::set_platform(int index, ::google::protobuf::uint32 value) { - platform_.Set(index, value); - // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.AccountRestriction.platform) -} -inline void AccountRestriction::add_platform(::google::protobuf::uint32 value) { - platform_.Add(value); - // @@protoc_insertion_point(field_add:bgs.protocol.account.v1.AccountRestriction.platform) -} -inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >& -AccountRestriction::platform() const { - // @@protoc_insertion_point(field_list:bgs.protocol.account.v1.AccountRestriction.platform) - return platform_; -} -inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >* -AccountRestriction::mutable_platform() { - // @@protoc_insertion_point(field_mutable_list:bgs.protocol.account.v1.AccountRestriction.platform) - return &platform_; -} - -// optional uint64 expire_time = 5; -inline bool AccountRestriction::has_expire_time() const { - return (_has_bits_[0] & 0x00000010u) != 0; -} -inline void AccountRestriction::set_has_expire_time() { - _has_bits_[0] |= 0x00000010u; -} -inline void AccountRestriction::clear_has_expire_time() { - _has_bits_[0] &= ~0x00000010u; -} -inline void AccountRestriction::clear_expire_time() { - expire_time_ = GOOGLE_ULONGLONG(0); - clear_has_expire_time(); -} -inline ::google::protobuf::uint64 AccountRestriction::expire_time() const { - // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.AccountRestriction.expire_time) - return expire_time_; -} -inline void AccountRestriction::set_expire_time(::google::protobuf::uint64 value) { - set_has_expire_time(); - expire_time_ = value; - // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.AccountRestriction.expire_time) -} - -// optional uint64 created_time = 6; -inline bool AccountRestriction::has_created_time() const { - return (_has_bits_[0] & 0x00000020u) != 0; -} -inline void AccountRestriction::set_has_created_time() { - _has_bits_[0] |= 0x00000020u; -} -inline void AccountRestriction::clear_has_created_time() { - _has_bits_[0] &= ~0x00000020u; -} -inline void AccountRestriction::clear_created_time() { - created_time_ = GOOGLE_ULONGLONG(0); - clear_has_created_time(); -} -inline ::google::protobuf::uint64 AccountRestriction::created_time() const { - // @@protoc_insertion_point(field_get:bgs.protocol.account.v1.AccountRestriction.created_time) - return created_time_; -} -inline void AccountRestriction::set_created_time(::google::protobuf::uint64 value) { - set_has_created_time(); - created_time_ = value; - // @@protoc_insertion_point(field_set:bgs.protocol.account.v1.AccountRestriction.created_time) -} - // @@protoc_insertion_point(namespace_scope) @@ -8708,11 +8335,6 @@ template <> inline const EnumDescriptor* GetEnumDescriptor< ::bgs::protocol::account::v1::IdentityVerificationStatus>() { return ::bgs::protocol::account::v1::IdentityVerificationStatus_descriptor(); } -template <> struct is_proto_enum< ::bgs::protocol::account::v1::RestrictionType> : ::google::protobuf::internal::true_type {}; -template <> -inline const EnumDescriptor* GetEnumDescriptor< ::bgs::protocol::account::v1::RestrictionType>() { - return ::bgs::protocol::account::v1::RestrictionType_descriptor(); -} } // namespace google } // namespace protobuf 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 6b4341f2c92..0a786bfdf85 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 @@ -105,17 +105,18 @@ 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\"\370\001\n\023SubmitReportRequest\0224\n\010" + "_types.proto\"\200\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\017\n\007" "program\030\003 \001(\r\022;\n\014user_options\030\n \001(\0132#.bg" "s.protocol.report.v2.UserOptionsH\000\022;\n\014cl" "ub_options\030\013 \001(\0132#.bgs.protocol.report.v" - "2.ClubOptionsH\000B\006\n\004type2\245\001\n\rReportServic" - "e\022Y\n\014SubmitReport\022+.bgs.protocol.report." - "v2.SubmitReportRequest\032\024.bgs.protocol.No" - "Data\"\006\202\371+\002\010\001\0329\202\371+/\n%bnet.protocol.report" - ".v2.ReportService*\006report\212\371+\002\020\001B\005H\001\200\001\000", 558); + "2.ClubOptionsH\000:\006\202\371+\002\020\001B\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\001\200\001\000", 566); ::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 8cb58d6d61f..5e25efc4973 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 @@ -168,15 +168,15 @@ void protobuf_AddDesc_api_2fclient_2fv2_2freport_5ftypes_2eproto() { ".ReportItem*\215\001\n\tIssueType\022\023\n\017ISSUE_TYPE_" "SPAM\020\000\022\031\n\025ISSUE_TYPE_HARASSMENT\020\001\022 \n\034ISS" "UE_TYPE_OFFENSIVE_CONTENT\020\003\022\026\n\022ISSUE_TYP" - "E_HACKING\020\004\022\026\n\022ISSUE_TYPE_BOTTING\020\005*\252\001\n\n" + "E_HACKING\020\004\022\026\n\022ISSUE_TYPE_BOTTING\020\005*\301\001\n\n" "UserSource\022\025\n\021USER_SOURCE_OTHER\020\000\022\027\n\023USE" "R_SOURCE_WHISPER\020\001\022\027\n\023USER_SOURCE_PROFIL" "E\020\002\022\032\n\026USER_SOURCE_BATTLE_TAG\020\003\022\024\n\020USER_" "SOURCE_CHAT\020\004\022!\n\035USER_SOURCE_FRIEND_INVI" - "TATION\020\005*t\n\nClubSource\022\025\n\021CLUB_SOURCE_OT" - "HER\020\000\022\027\n\023CLUB_SOURCE_MESSAGE\020\001\022\031\n\025CLUB_S" - "OURCE_CLUB_NAME\020\002\022\033\n\027CLUB_SOURCE_STREAM_" - "NAME\020\003B\005H\001\200\001\000", 1053); + "TATION\020\005\022\025\n\021USER_SOURCE_VOICE\020\006*t\n\nClubS" + "ource\022\025\n\021CLUB_SOURCE_OTHER\020\000\022\027\n\023CLUB_SOU" + "RCE_MESSAGE\020\001\022\031\n\025CLUB_SOURCE_CLUB_NAME\020\002" + "\022\033\n\027CLUB_SOURCE_STREAM_NAME\020\003B\005H\001\200\001\000", 1076); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "api/client/v2/report_types.proto", &protobuf_RegisterTypes); ReportItem::default_instance_ = new ReportItem(); @@ -224,6 +224,7 @@ bool UserSource_IsValid(int value) { case 3: case 4: case 5: + case 6: 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 bfaa6277203..3dbc57aab68 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 @@ -73,11 +73,12 @@ enum UserSource { USER_SOURCE_PROFILE = 2, USER_SOURCE_BATTLE_TAG = 3, USER_SOURCE_CHAT = 4, - USER_SOURCE_FRIEND_INVITATION = 5 + USER_SOURCE_FRIEND_INVITATION = 5, + USER_SOURCE_VOICE = 6 }; TC_PROTO_API bool UserSource_IsValid(int value); const UserSource UserSource_MIN = USER_SOURCE_OTHER; -const UserSource UserSource_MAX = USER_SOURCE_FRIEND_INVITATION; +const UserSource UserSource_MAX = USER_SOURCE_VOICE; const int UserSource_ARRAYSIZE = UserSource_MAX + 1; TC_PROTO_API const ::google::protobuf::EnumDescriptor* UserSource_descriptor(); diff --git a/src/server/proto/Client/authentication_service.pb.cc b/src/server/proto/Client/authentication_service.pb.cc index 9a2ffa34a62..55c251ce1c8 100644 --- a/src/server/proto/Client/authentication_service.pb.cc +++ b/src/server/proto/Client/authentication_service.pb.cc @@ -173,7 +173,7 @@ void protobuf_AssignDesc_authentication_5fservice_2eproto() { ::google::protobuf::MessageFactory::generated_factory(), sizeof(LogonRequest)); LogonResult_descriptor_ = file->message_type(4); - static const int LogonResult_offsets_[10] = { + static const int LogonResult_offsets_[11] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LogonResult, error_code_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LogonResult, account_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LogonResult, game_account_id_), @@ -184,6 +184,7 @@ void protobuf_AssignDesc_authentication_5fservice_2eproto() { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LogonResult, geoip_country_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LogonResult, session_key_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LogonResult, restricted_mode_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LogonResult, client_id_), }; LogonResult_reflection_ = new ::google::protobuf::internal::GeneratedMessageReflection( @@ -562,98 +563,99 @@ void protobuf_AddDesc_authentication_5fservice_2eproto() { " \001(\005\022\027\n\017public_computer\030\007 \001(\010\022.\n\037allow_l" "ogon_queue_notifications\030\n \001(\010:\005false\022\036\n" "\026cached_web_credentials\030\014 \001(\014\022\022\n\nuser_ag" - "ent\030\016 \001(\t\022\021\n\tdevice_id\030\017 \001(\t\"\232\002\n\013LogonRe" + "ent\030\016 \001(\t\022\021\n\tdevice_id\030\017 \001(\t\"\255\002\n\013LogonRe" "sult\022\022\n\nerror_code\030\001 \002(\r\022*\n\naccount_id\030\002" " \001(\0132\026.bgs.protocol.EntityId\022/\n\017game_acc" "ount_id\030\003 \003(\0132\026.bgs.protocol.EntityId\022\r\n" "\005email\030\004 \001(\t\022\030\n\020available_region\030\005 \003(\r\022\030" "\n\020connected_region\030\006 \001(\r\022\022\n\nbattle_tag\030\007" " \001(\t\022\025\n\rgeoip_country\030\010 \001(\t\022\023\n\013session_k" - "ey\030\t \001(\014\022\027\n\017restricted_mode\030\n \001(\010\"*\n\027Gen" - "erateSSOTokenRequest\022\017\n\007program\030\001 \001(\007\">\n" - "\030GenerateSSOTokenResponse\022\016\n\006sso_id\030\001 \001(" - "\014\022\022\n\nsso_secret\030\002 \001(\014\"(\n\022LogonUpdateRequ" - "est\022\022\n\nerror_code\030\001 \002(\r\"a\n\027LogonQueueUpd" - "ateRequest\022\020\n\010position\030\001 \002(\r\022\026\n\016estimate" - "d_time\030\002 \002(\004\022\034\n\024eta_deviation_in_sec\030\003 \002" - "(\004\"\276\001\n\033AccountSettingsNotification\0229\n\010li" - "censes\030\001 \003(\0132\'.bgs.protocol.account.v1.A" - "ccountLicense\022\024\n\014is_using_rid\030\002 \001(\010\022\033\n\023i" - "s_playing_from_igr\030\003 \001(\010\022\031\n\021can_receive_" - "voice\030\004 \001(\010\022\026\n\016can_send_voice\030\005 \001(\010\"=\n\030S" - "erverStateChangeRequest\022\r\n\005state\030\001 \002(\r\022\022" - "\n\nevent_time\030\002 \002(\004\"T\n\013VersionInfo\022\016\n\006num" - "ber\030\001 \001(\r\022\r\n\005patch\030\002 \001(\t\022\023\n\013is_optional\030" - "\003 \001(\010\022\021\n\tkick_time\030\004 \001(\004\"\\\n\027VersionInfoN" - "otification\022A\n\014version_info\030\001 \001(\0132+.bgs." - "protocol.authentication.v1.VersionInfo\"_" - "\n\024MemModuleLoadRequest\022+\n\006handle\030\001 \002(\0132\033" - ".bgs.protocol.ContentHandle\022\013\n\003key\030\002 \002(\014" - "\022\r\n\005input\030\003 \002(\014\"%\n\025MemModuleLoadResponse" - "\022\014\n\004data\030\001 \002(\014\"K\n\030SelectGameAccountReque" - "st\022/\n\017game_account_id\030\001 \002(\0132\026.bgs.protoc" - "ol.EntityId\"]\n\032GameAccountSelectedReques" - "t\022\016\n\006result\030\001 \002(\r\022/\n\017game_account_id\030\002 \001" - "(\0132\026.bgs.protocol.EntityId\"0\n\035GenerateWe" - "bCredentialsRequest\022\017\n\007program\030\001 \001(\007\"9\n\036" - "GenerateWebCredentialsResponse\022\027\n\017web_cr" - "edentials\030\001 \001(\014\"6\n\033VerifyWebCredentialsR" - "equest\022\027\n\017web_credentials\030\001 \001(\0142\237\t\n\026Auth" - "enticationListener\022g\n\014OnModuleLoad\0221.bgs" - ".protocol.authentication.v1.ModuleLoadRe" - "quest\032\031.bgs.protocol.NO_RESPONSE\"\t\210\002\001\202\371+" - "\002\010\001\022h\n\017OnModuleMessage\0224.bgs.protocol.au" - "thentication.v1.ModuleMessageRequest\032\024.b" - "gs.protocol.NoData\"\t\210\002\001\202\371+\002\010\002\022r\n\023OnServe" - "rStateChange\0228.bgs.protocol.authenticati" - "on.v1.ServerStateChangeRequest\032\031.bgs.pro" - "tocol.NO_RESPONSE\"\006\202\371+\002\010\004\022a\n\017OnLogonComp" - "lete\022+.bgs.protocol.authentication.v1.Lo" - "gonResult\032\031.bgs.protocol.NO_RESPONSE\"\006\202\371" - "+\002\010\005\022\206\001\n\017OnMemModuleLoad\0224.bgs.protocol." - "authentication.v1.MemModuleLoadRequest\0325" - ".bgs.protocol.authentication.v1.MemModul" - "eLoadResponse\"\006\202\371+\002\010\006\022f\n\rOnLogonUpdate\0222" - ".bgs.protocol.authentication.v1.LogonUpd" - "ateRequest\032\031.bgs.protocol.NO_RESPONSE\"\006\202" - "\371+\002\010\n\022r\n\024OnVersionInfoUpdated\0227.bgs.prot" - "ocol.authentication.v1.VersionInfoNotifi" - "cation\032\031.bgs.protocol.NO_RESPONSE\"\006\202\371+\002\010" - "\013\022p\n\022OnLogonQueueUpdate\0227.bgs.protocol.a" - "uthentication.v1.LogonQueueUpdateRequest" - "\032\031.bgs.protocol.NO_RESPONSE\"\006\202\371+\002\010\014\022J\n\017O" - "nLogonQueueEnd\022\024.bgs.protocol.NoData\032\031.b" - "gs.protocol.NO_RESPONSE\"\006\202\371+\002\010\r\022y\n\025OnGam" - "eAccountSelected\022:.bgs.protocol.authenti" - "cation.v1.GameAccountSelectedRequest\032\031.b" - "gs.protocol.NO_RESPONSE\"\t\210\002\001\202\371+\002\010\016\032=\202\371+3" - "\n1bnet.protocol.authentication.Authentic" - "ationClient\212\371+\002\010\0012\346\007\n\025AuthenticationServ" - "ice\022S\n\005Logon\022,.bgs.protocol.authenticati" - "on.v1.LogonRequest\032\024.bgs.protocol.NoData" - "\"\006\202\371+\002\010\001\022c\n\014ModuleNotify\0222.bgs.protocol." - "authentication.v1.ModuleNotification\032\024.b" - "gs.protocol.NoData\"\t\210\002\001\202\371+\002\010\002\022f\n\rModuleM" - "essage\0224.bgs.protocol.authentication.v1." - "ModuleMessageRequest\032\024.bgs.protocol.NoDa" - "ta\"\t\210\002\001\202\371+\002\010\003\022W\n\034SelectGameAccount_DEPRE" - "CATED\022\026.bgs.protocol.EntityId\032\024.bgs.prot" - "ocol.NoData\"\t\210\002\001\202\371+\002\010\004\022\215\001\n\020GenerateSSOTo" - "ken\0227.bgs.protocol.authentication.v1.Gen" - "erateSSOTokenRequest\0328.bgs.protocol.auth" - "entication.v1.GenerateSSOTokenResponse\"\006" - "\202\371+\002\010\005\022n\n\021SelectGameAccount\0228.bgs.protoc" - "ol.authentication.v1.SelectGameAccountRe" - "quest\032\024.bgs.protocol.NoData\"\t\210\002\001\202\371+\002\010\006\022q" - "\n\024VerifyWebCredentials\022;.bgs.protocol.au" - "thentication.v1.VerifyWebCredentialsRequ" - "est\032\024.bgs.protocol.NoData\"\006\202\371+\002\010\007\022\237\001\n\026Ge" - "nerateWebCredentials\022=.bgs.protocol.auth" - "entication.v1.GenerateWebCredentialsRequ" - "est\032>.bgs.protocol.authentication.v1.Gen" - "erateWebCredentialsResponse\"\006\202\371+\002\010\010\032=\202\371+" - "3\n1bnet.protocol.authentication.Authenti" - "cationServer\212\371+\002\020\001B\005H\001\200\001\000", 4265); + "ey\030\t \001(\014\022\027\n\017restricted_mode\030\n \001(\010\022\021\n\tcli" + "ent_id\030\013 \001(\t\"*\n\027GenerateSSOTokenRequest\022" + "\017\n\007program\030\001 \001(\007\">\n\030GenerateSSOTokenResp" + "onse\022\016\n\006sso_id\030\001 \001(\014\022\022\n\nsso_secret\030\002 \001(\014" + "\"(\n\022LogonUpdateRequest\022\022\n\nerror_code\030\001 \002" + "(\r\"a\n\027LogonQueueUpdateRequest\022\020\n\010positio" + "n\030\001 \002(\r\022\026\n\016estimated_time\030\002 \002(\004\022\034\n\024eta_d" + "eviation_in_sec\030\003 \002(\004\"\276\001\n\033AccountSetting" + "sNotification\0229\n\010licenses\030\001 \003(\0132\'.bgs.pr" + "otocol.account.v1.AccountLicense\022\024\n\014is_u" + "sing_rid\030\002 \001(\010\022\033\n\023is_playing_from_igr\030\003 " + "\001(\010\022\031\n\021can_receive_voice\030\004 \001(\010\022\026\n\016can_se" + "nd_voice\030\005 \001(\010\"=\n\030ServerStateChangeReque" + "st\022\r\n\005state\030\001 \002(\r\022\022\n\nevent_time\030\002 \002(\004\"T\n" + "\013VersionInfo\022\016\n\006number\030\001 \001(\r\022\r\n\005patch\030\002 " + "\001(\t\022\023\n\013is_optional\030\003 \001(\010\022\021\n\tkick_time\030\004 " + "\001(\004\"\\\n\027VersionInfoNotification\022A\n\014versio" + "n_info\030\001 \001(\0132+.bgs.protocol.authenticati" + "on.v1.VersionInfo\"_\n\024MemModuleLoadReques" + "t\022+\n\006handle\030\001 \002(\0132\033.bgs.protocol.Content" + "Handle\022\013\n\003key\030\002 \002(\014\022\r\n\005input\030\003 \002(\014\"%\n\025Me" + "mModuleLoadResponse\022\014\n\004data\030\001 \002(\014\"K\n\030Sel" + "ectGameAccountRequest\022/\n\017game_account_id" + "\030\001 \002(\0132\026.bgs.protocol.EntityId\"]\n\032GameAc" + "countSelectedRequest\022\016\n\006result\030\001 \002(\r\022/\n\017" + "game_account_id\030\002 \001(\0132\026.bgs.protocol.Ent" + "ityId\"0\n\035GenerateWebCredentialsRequest\022\017" + "\n\007program\030\001 \001(\007\"9\n\036GenerateWebCredential" + "sResponse\022\027\n\017web_credentials\030\001 \001(\014\"6\n\033Ve" + "rifyWebCredentialsRequest\022\027\n\017web_credent" + "ials\030\001 \001(\0142\237\t\n\026AuthenticationListener\022g\n" + "\014OnModuleLoad\0221.bgs.protocol.authenticat" + "ion.v1.ModuleLoadRequest\032\031.bgs.protocol." + "NO_RESPONSE\"\t\210\002\001\202\371+\002\010\001\022h\n\017OnModuleMessag" + "e\0224.bgs.protocol.authentication.v1.Modul" + "eMessageRequest\032\024.bgs.protocol.NoData\"\t\210" + "\002\001\202\371+\002\010\002\022r\n\023OnServerStateChange\0228.bgs.pr" + "otocol.authentication.v1.ServerStateChan" + "geRequest\032\031.bgs.protocol.NO_RESPONSE\"\006\202\371" + "+\002\010\004\022a\n\017OnLogonComplete\022+.bgs.protocol.a" + "uthentication.v1.LogonResult\032\031.bgs.proto" + "col.NO_RESPONSE\"\006\202\371+\002\010\005\022\206\001\n\017OnMemModuleL" + "oad\0224.bgs.protocol.authentication.v1.Mem" + "ModuleLoadRequest\0325.bgs.protocol.authent" + "ication.v1.MemModuleLoadResponse\"\006\202\371+\002\010\006" + "\022f\n\rOnLogonUpdate\0222.bgs.protocol.authent" + "ication.v1.LogonUpdateRequest\032\031.bgs.prot" + "ocol.NO_RESPONSE\"\006\202\371+\002\010\n\022r\n\024OnVersionInf" + "oUpdated\0227.bgs.protocol.authentication.v" + "1.VersionInfoNotification\032\031.bgs.protocol" + ".NO_RESPONSE\"\006\202\371+\002\010\013\022p\n\022OnLogonQueueUpda" + "te\0227.bgs.protocol.authentication.v1.Logo" + "nQueueUpdateRequest\032\031.bgs.protocol.NO_RE" + "SPONSE\"\006\202\371+\002\010\014\022J\n\017OnLogonQueueEnd\022\024.bgs." + "protocol.NoData\032\031.bgs.protocol.NO_RESPON" + "SE\"\006\202\371+\002\010\r\022y\n\025OnGameAccountSelected\022:.bg" + "s.protocol.authentication.v1.GameAccount" + "SelectedRequest\032\031.bgs.protocol.NO_RESPON" + "SE\"\t\210\002\001\202\371+\002\010\016\032=\202\371+3\n1bnet.protocol.authe" + "ntication.AuthenticationClient\212\371+\002\010\0012\366\007\n" + "\025AuthenticationService\022S\n\005Logon\022,.bgs.pr" + "otocol.authentication.v1.LogonRequest\032\024." + "bgs.protocol.NoData\"\006\202\371+\002\010\001\022c\n\014ModuleNot" + "ify\0222.bgs.protocol.authentication.v1.Mod" + "uleNotification\032\024.bgs.protocol.NoData\"\t\210" + "\002\001\202\371+\002\010\002\022f\n\rModuleMessage\0224.bgs.protocol" + ".authentication.v1.ModuleMessageRequest\032" + "\024.bgs.protocol.NoData\"\t\210\002\001\202\371+\002\010\003\022W\n\034Sele" + "ctGameAccount_DEPRECATED\022\026.bgs.protocol." + "EntityId\032\024.bgs.protocol.NoData\"\t\210\002\001\202\371+\002\010" + "\004\022\215\001\n\020GenerateSSOToken\0227.bgs.protocol.au" + "thentication.v1.GenerateSSOTokenRequest\032" + "8.bgs.protocol.authentication.v1.Generat" + "eSSOTokenResponse\"\006\202\371+\002\010\005\022n\n\021SelectGameA" + "ccount\0228.bgs.protocol.authentication.v1." + "SelectGameAccountRequest\032\024.bgs.protocol." + "NoData\"\t\210\002\001\202\371+\002\010\006\022q\n\024VerifyWebCredential" + "s\022;.bgs.protocol.authentication.v1.Verif" + "yWebCredentialsRequest\032\024.bgs.protocol.No" + "Data\"\006\202\371+\002\010\007\022\237\001\n\026GenerateWebCredentials\022" + "=.bgs.protocol.authentication.v1.Generat" + "eWebCredentialsRequest\032>.bgs.protocol.au" + "thentication.v1.GenerateWebCredentialsRe" + "sponse\"\006\202\371+\002\010\010\032M\202\371+C\n1bnet.protocol.auth" + "entication.AuthenticationServer*\016authent" + "ication\212\371+\002\020\001B\005H\001\200\001\000", 4300); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "authentication_service.proto", &protobuf_RegisterTypes); ModuleLoadRequest::default_instance_ = new ModuleLoadRequest(); @@ -2324,6 +2326,7 @@ const int LogonResult::kBattleTagFieldNumber; const int LogonResult::kGeoipCountryFieldNumber; const int LogonResult::kSessionKeyFieldNumber; const int LogonResult::kRestrictedModeFieldNumber; +const int LogonResult::kClientIdFieldNumber; #endif // !_MSC_VER LogonResult::LogonResult() @@ -2354,6 +2357,7 @@ void LogonResult::SharedCtor() { geoip_country_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); session_key_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); restricted_mode_ = false; + client_id_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -2375,6 +2379,9 @@ void LogonResult::SharedDtor() { if (session_key_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { delete session_key_; } + if (client_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + delete client_id_; + } if (this != default_instance_) { delete account_id_; } @@ -2433,13 +2440,18 @@ void LogonResult::Clear() { } } } - if (_has_bits_[8 / 32] & 768) { + if (_has_bits_[8 / 32] & 1792) { if (has_session_key()) { if (session_key_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { session_key_->clear(); } } restricted_mode_ = false; + if (has_client_id()) { + if (client_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + client_id_->clear(); + } + } } #undef OFFSET_OF_FIELD_ @@ -2611,6 +2623,23 @@ bool LogonResult::MergePartialFromCodedStream( } else { goto handle_unusual; } + if (input->ExpectTag(90)) goto parse_client_id; + break; + } + + // optional string client_id = 11; + case 11: { + if (tag == 90) { + parse_client_id: + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_client_id())); + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->client_id().data(), this->client_id().length(), + ::google::protobuf::internal::WireFormat::PARSE, + "client_id"); + } else { + goto handle_unusual; + } if (input->ExpectAtEnd()) goto success; break; } @@ -2709,6 +2738,16 @@ void LogonResult::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteBool(10, this->restricted_mode(), output); } + // optional string client_id = 11; + if (has_client_id()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->client_id().data(), this->client_id().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "client_id"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 11, this->client_id(), output); + } + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -2794,6 +2833,17 @@ void LogonResult::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(10, this->restricted_mode(), target); } + // optional string client_id = 11; + if (has_client_id()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->client_id().data(), this->client_id().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "client_id"); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 11, this->client_id(), target); + } + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -2862,6 +2912,13 @@ int LogonResult::ByteSize() const { total_size += 1 + 1; } + // optional string client_id = 11; + if (has_client_id()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->client_id()); + } + } // repeated .bgs.protocol.EntityId game_account_id = 3; total_size += 1 * this->game_account_id_size(); @@ -2935,6 +2992,9 @@ void LogonResult::MergeFrom(const LogonResult& from) { if (from.has_restricted_mode()) { set_restricted_mode(from.restricted_mode()); } + if (from.has_client_id()) { + set_client_id(from.client_id()); + } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); } @@ -2973,6 +3033,7 @@ void LogonResult::Swap(LogonResult* other) { std::swap(geoip_country_, other->geoip_country_); std::swap(session_key_, other->session_key_); std::swap(restricted_mode_, other->restricted_mode_); + std::swap(client_id_, other->client_id_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); diff --git a/src/server/proto/Client/authentication_service.pb.h b/src/server/proto/Client/authentication_service.pb.h index fb9f12f01ef..2040321e561 100644 --- a/src/server/proto/Client/authentication_service.pb.h +++ b/src/server/proto/Client/authentication_service.pb.h @@ -720,6 +720,18 @@ class TC_PROTO_API LogonResult : public ::google::protobuf::Message { inline bool restricted_mode() const; inline void set_restricted_mode(bool value); + // optional string client_id = 11; + inline bool has_client_id() const; + inline void clear_client_id(); + static const int kClientIdFieldNumber = 11; + inline const ::std::string& client_id() const; + inline void set_client_id(const ::std::string& value); + inline void set_client_id(const char* value); + inline void set_client_id(const char* value, size_t size); + inline ::std::string* mutable_client_id(); + inline ::std::string* release_client_id(); + inline void set_allocated_client_id(::std::string* client_id); + // @@protoc_insertion_point(class_scope:bgs.protocol.authentication.v1.LogonResult) private: inline void set_has_error_code(); @@ -738,6 +750,8 @@ class TC_PROTO_API LogonResult : public ::google::protobuf::Message { inline void clear_has_session_key(); inline void set_has_restricted_mode(); inline void clear_has_restricted_mode(); + inline void set_has_client_id(); + inline void clear_has_client_id(); ::google::protobuf::UnknownFieldSet _unknown_fields_; @@ -752,6 +766,7 @@ class TC_PROTO_API LogonResult : public ::google::protobuf::Message { ::std::string* battle_tag_; ::std::string* geoip_country_; ::std::string* session_key_; + ::std::string* client_id_; bool restricted_mode_; friend void TC_PROTO_API protobuf_AddDesc_authentication_5fservice_2eproto(); friend void protobuf_AssignDesc_authentication_5fservice_2eproto(); @@ -3673,6 +3688,82 @@ inline void LogonResult::set_restricted_mode(bool value) { // @@protoc_insertion_point(field_set:bgs.protocol.authentication.v1.LogonResult.restricted_mode) } +// optional string client_id = 11; +inline bool LogonResult::has_client_id() const { + return (_has_bits_[0] & 0x00000400u) != 0; +} +inline void LogonResult::set_has_client_id() { + _has_bits_[0] |= 0x00000400u; +} +inline void LogonResult::clear_has_client_id() { + _has_bits_[0] &= ~0x00000400u; +} +inline void LogonResult::clear_client_id() { + if (client_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + client_id_->clear(); + } + clear_has_client_id(); +} +inline const ::std::string& LogonResult::client_id() const { + // @@protoc_insertion_point(field_get:bgs.protocol.authentication.v1.LogonResult.client_id) + return *client_id_; +} +inline void LogonResult::set_client_id(const ::std::string& value) { + set_has_client_id(); + if (client_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + client_id_ = new ::std::string; + } + client_id_->assign(value); + // @@protoc_insertion_point(field_set:bgs.protocol.authentication.v1.LogonResult.client_id) +} +inline void LogonResult::set_client_id(const char* value) { + set_has_client_id(); + if (client_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + client_id_ = new ::std::string; + } + client_id_->assign(value); + // @@protoc_insertion_point(field_set_char:bgs.protocol.authentication.v1.LogonResult.client_id) +} +inline void LogonResult::set_client_id(const char* value, size_t size) { + set_has_client_id(); + if (client_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + client_id_ = new ::std::string; + } + client_id_->assign(reinterpret_cast<const char*>(value), size); + // @@protoc_insertion_point(field_set_pointer:bgs.protocol.authentication.v1.LogonResult.client_id) +} +inline ::std::string* LogonResult::mutable_client_id() { + set_has_client_id(); + if (client_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + client_id_ = new ::std::string; + } + // @@protoc_insertion_point(field_mutable:bgs.protocol.authentication.v1.LogonResult.client_id) + return client_id_; +} +inline ::std::string* LogonResult::release_client_id() { + clear_has_client_id(); + if (client_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + return NULL; + } else { + ::std::string* temp = client_id_; + client_id_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return temp; + } +} +inline void LogonResult::set_allocated_client_id(::std::string* client_id) { + if (client_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + delete client_id_; + } + if (client_id) { + set_has_client_id(); + client_id_ = client_id; + } else { + clear_has_client_id(); + client_id_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + } + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.authentication.v1.LogonResult.client_id) +} + // ------------------------------------------------------------------- // GenerateSSOTokenRequest diff --git a/src/server/proto/Client/channel_types.pb.cc b/src/server/proto/Client/channel_types.pb.cc index e27aaf9942f..601912f71c5 100644 --- a/src/server/proto/Client/channel_types.pb.cc +++ b/src/server/proto/Client/channel_types.pb.cc @@ -50,6 +50,9 @@ const ::google::protobuf::internal::GeneratedMessageReflection* const ::google::protobuf::Descriptor* Member_descriptor_ = NULL; const ::google::protobuf::internal::GeneratedMessageReflection* Member_reflection_ = NULL; +const ::google::protobuf::Descriptor* SubscriberId_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + SubscriberId_reflection_ = NULL; } // namespace @@ -204,6 +207,23 @@ void protobuf_AssignDesc_channel_5ftypes_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(Member)); + SubscriberId_descriptor_ = file->message_type(8); + static const int SubscriberId_offsets_[3] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscriberId, account_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscriberId, game_account_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscriberId, process_), + }; + SubscriberId_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + SubscriberId_descriptor_, + SubscriberId::default_instance_, + SubscriberId_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscriberId, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscriberId, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(SubscriberId)); } namespace { @@ -232,6 +252,8 @@ void protobuf_RegisterTypes(const ::std::string&) { MemberState_descriptor_, &MemberState::default_instance()); ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( Member_descriptor_, &Member::default_instance()); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + SubscriberId_descriptor_, &SubscriberId::default_instance()); } } // namespace @@ -254,6 +276,8 @@ void protobuf_ShutdownFile_channel_5ftypes_2eproto() { delete MemberState_reflection_; delete Member::default_instance_; delete Member_reflection_; + delete SubscriberId::default_instance_; + delete SubscriberId_reflection_; } void protobuf_AddDesc_channel_5ftypes_2eproto() { @@ -265,48 +289,54 @@ void protobuf_AddDesc_channel_5ftypes_2eproto() { ::bgs::protocol::channel::v1::protobuf_AddDesc_api_2fclient_2fv1_2fchannel_5fid_2eproto(); ::bgs::protocol::protobuf_AddDesc_attribute_5ftypes_2eproto(); ::bgs::protocol::protobuf_AddDesc_entity_5ftypes_2eproto(); + ::bgs::protocol::account::v1::protobuf_AddDesc_account_5ftypes_2eproto(); ::bgs::protocol::protobuf_AddDesc_invitation_5ftypes_2eproto(); ::bgs::protocol::protobuf_AddDesc_rpc_5ftypes_2eproto(); ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( "\n\023channel_types.proto\022\027bgs.protocol.chan" "nel.v1\032\036api/client/v1/channel_id.proto\032\025" "attribute_types.proto\032\022entity_types.prot" - "o\032\026invitation_types.proto\032\017rpc_types.pro" - "to\"<\n\007Message\022*\n\tattribute\030\001 \003(\0132\027.bgs.p" - "rotocol.Attribute*\005\010d\020\220N\"\333\001\n\023ListChannel" - "sOptions\022\026\n\013start_index\030\001 \001(\r:\0010\022\027\n\013max_" - "results\030\002 \001(\r:\00216\022\014\n\004name\030\003 \001(\t\022\017\n\007progr" - "am\030\004 \001(\007\022\016\n\006locale\030\005 \001(\007\022\025\n\rcapacity_ful" - "l\030\006 \001(\r\0227\n\020attribute_filter\030\007 \002(\0132\035.bgs." - "protocol.AttributeFilter\022\024\n\014channel_type" - "\030\010 \001(\t\"\217\001\n\022ChannelDescription\022*\n\nchannel" - "_id\030\001 \002(\0132\026.bgs.protocol.EntityId\022\027\n\017cur" - "rent_members\030\002 \001(\r\0224\n\005state\030\003 \001(\0132%.bgs." - "protocol.channel.v1.ChannelState\"\200\001\n\013Cha" - "nnelInfo\022@\n\013description\030\001 \002(\0132+.bgs.prot" - "ocol.channel.v1.ChannelDescription\022/\n\006me" - "mber\030\002 \003(\0132\037.bgs.protocol.channel.v1.Mem" - "ber\"\377\003\n\014ChannelState\022\023\n\013max_members\030\001 \001(" - "\r\022\023\n\013min_members\030\002 \001(\r\022*\n\tattribute\030\003 \003(" - "\0132\027.bgs.protocol.Attribute\022,\n\ninvitation" - "\030\004 \003(\0132\030.bgs.protocol.Invitation\022\016\n\006reas" - "on\030\006 \001(\r\022]\n\rprivacy_level\030\007 \001(\01622.bgs.pr" - "otocol.channel.v1.ChannelState.PrivacyLe" - "vel:\022PRIVACY_LEVEL_OPEN\022\014\n\004name\030\010 \001(\t\022\035\n" - "\014channel_type\030\n \001(\t:\007default\022\017\n\007program\030" - "\013 \001(\007\022#\n\025subscribe_to_presence\030\r \001(\010:\004tr" - "ue\"\221\001\n\014PrivacyLevel\022\026\n\022PRIVACY_LEVEL_OPE" - "N\020\001\022,\n(PRIVACY_LEVEL_OPEN_INVITATION_AND" - "_FRIEND\020\002\022!\n\035PRIVACY_LEVEL_OPEN_INVITATI" - "ON\020\003\022\030\n\024PRIVACY_LEVEL_CLOSED\020\004*\005\010d\020\220N\"\'\n" - "\021MemberAccountInfo\022\022\n\nbattle_tag\030\003 \001(\t\"\234" - "\001\n\013MemberState\022*\n\tattribute\030\001 \003(\0132\027.bgs." - "protocol.Attribute\022\020\n\004role\030\002 \003(\rB\002\020\001\022\025\n\n" - "privileges\030\003 \001(\004:\0010\0228\n\004info\030\004 \001(\0132*.bgs." - "protocol.channel.v1.MemberAccountInfo\"g\n" - "\006Member\022(\n\010identity\030\001 \002(\0132\026.bgs.protocol" - ".Identity\0223\n\005state\030\002 \002(\0132$.bgs.protocol." - "channel.v1.MemberStateB\002H\001P\000", 1548); + "o\032\023account_types.proto\032\026invitation_types" + ".proto\032\017rpc_types.proto\"<\n\007Message\022*\n\tat" + "tribute\030\001 \003(\0132\027.bgs.protocol.Attribute*\005" + "\010d\020\220N\"\333\001\n\023ListChannelsOptions\022\026\n\013start_i" + "ndex\030\001 \001(\r:\0010\022\027\n\013max_results\030\002 \001(\r:\00216\022\014" + "\n\004name\030\003 \001(\t\022\017\n\007program\030\004 \001(\007\022\016\n\006locale\030" + "\005 \001(\007\022\025\n\rcapacity_full\030\006 \001(\r\0227\n\020attribut" + "e_filter\030\007 \002(\0132\035.bgs.protocol.AttributeF" + "ilter\022\024\n\014channel_type\030\010 \001(\t\"\217\001\n\022ChannelD" + "escription\022*\n\nchannel_id\030\001 \002(\0132\026.bgs.pro" + "tocol.EntityId\022\027\n\017current_members\030\002 \001(\r\022" + "4\n\005state\030\003 \001(\0132%.bgs.protocol.channel.v1" + ".ChannelState\"\200\001\n\013ChannelInfo\022@\n\013descrip" + "tion\030\001 \002(\0132+.bgs.protocol.channel.v1.Cha" + "nnelDescription\022/\n\006member\030\002 \003(\0132\037.bgs.pr" + "otocol.channel.v1.Member\"\377\003\n\014ChannelStat" + "e\022\023\n\013max_members\030\001 \001(\r\022\023\n\013min_members\030\002 " + "\001(\r\022*\n\tattribute\030\003 \003(\0132\027.bgs.protocol.At" + "tribute\022,\n\ninvitation\030\004 \003(\0132\030.bgs.protoc" + "ol.Invitation\022\016\n\006reason\030\006 \001(\r\022]\n\rprivacy" + "_level\030\007 \001(\01622.bgs.protocol.channel.v1.C" + "hannelState.PrivacyLevel:\022PRIVACY_LEVEL_" + "OPEN\022\014\n\004name\030\010 \001(\t\022\035\n\014channel_type\030\n \001(\t" + ":\007default\022\017\n\007program\030\013 \001(\007\022#\n\025subscribe_" + "to_presence\030\r \001(\010:\004true\"\221\001\n\014PrivacyLevel" + "\022\026\n\022PRIVACY_LEVEL_OPEN\020\001\022,\n(PRIVACY_LEVE" + "L_OPEN_INVITATION_AND_FRIEND\020\002\022!\n\035PRIVAC" + "Y_LEVEL_OPEN_INVITATION\020\003\022\030\n\024PRIVACY_LEV" + "EL_CLOSED\020\004*\005\010d\020\220N\"\'\n\021MemberAccountInfo\022" + "\022\n\nbattle_tag\030\003 \001(\t\"\234\001\n\013MemberState\022*\n\ta" + "ttribute\030\001 \003(\0132\027.bgs.protocol.Attribute\022" + "\020\n\004role\030\002 \003(\rB\002\020\001\022\025\n\nprivileges\030\003 \001(\004:\0010" + "\0228\n\004info\030\004 \001(\0132*.bgs.protocol.channel.v1" + ".MemberAccountInfo\"g\n\006Member\022(\n\010identity" + "\030\001 \002(\0132\026.bgs.protocol.Identity\0223\n\005state\030" + "\002 \002(\0132$.bgs.protocol.channel.v1.MemberSt" + "ate\"\273\001\n\014SubscriberId\0227\n\007account\030\001 \001(\0132\"." + "bgs.protocol.account.v1.AccountIdB\002\030\001\022@\n" + "\014game_account\030\002 \001(\0132*.bgs.protocol.accou" + "nt.v1.GameAccountHandle\022(\n\007process\030\003 \001(\013" + "2\027.bgs.protocol.ProcessId:\006\202\371+\002\020\001B\002H\001P\000", 1759); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "channel_types.proto", &protobuf_RegisterTypes); Message::default_instance_ = new Message(); @@ -319,6 +349,7 @@ void protobuf_AddDesc_channel_5ftypes_2eproto() { MemberAccountInfo::default_instance_ = new MemberAccountInfo(); MemberState::default_instance_ = new MemberState(); Member::default_instance_ = new Member(); + SubscriberId::default_instance_ = new SubscriberId(); Message::default_instance_->InitAsDefaultInstance(); ListChannelsOptions::default_instance_->InitAsDefaultInstance(); ChannelDescription::default_instance_->InitAsDefaultInstance(); @@ -327,6 +358,7 @@ void protobuf_AddDesc_channel_5ftypes_2eproto() { MemberAccountInfo::default_instance_->InitAsDefaultInstance(); MemberState::default_instance_->InitAsDefaultInstance(); Member::default_instance_->InitAsDefaultInstance(); + SubscriberId::default_instance_->InitAsDefaultInstance(); ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_channel_5ftypes_2eproto); } @@ -3302,6 +3334,332 @@ void Member::Swap(Member* other) { } +// =================================================================== + +#ifndef _MSC_VER +const int SubscriberId::kAccountFieldNumber; +const int SubscriberId::kGameAccountFieldNumber; +const int SubscriberId::kProcessFieldNumber; +#endif // !_MSC_VER + +SubscriberId::SubscriberId() + : ::google::protobuf::Message() { + SharedCtor(); + // @@protoc_insertion_point(constructor:bgs.protocol.channel.v1.SubscriberId) +} + +void SubscriberId::InitAsDefaultInstance() { + account_ = const_cast< ::bgs::protocol::account::v1::AccountId*>(&::bgs::protocol::account::v1::AccountId::default_instance()); + game_account_ = const_cast< ::bgs::protocol::account::v1::GameAccountHandle*>(&::bgs::protocol::account::v1::GameAccountHandle::default_instance()); + process_ = const_cast< ::bgs::protocol::ProcessId*>(&::bgs::protocol::ProcessId::default_instance()); +} + +SubscriberId::SubscriberId(const SubscriberId& from) + : ::google::protobuf::Message() { + SharedCtor(); + MergeFrom(from); + // @@protoc_insertion_point(copy_constructor:bgs.protocol.channel.v1.SubscriberId) +} + +void SubscriberId::SharedCtor() { + _cached_size_ = 0; + account_ = NULL; + game_account_ = NULL; + process_ = NULL; + ::memset(_has_bits_, 0, sizeof(_has_bits_)); +} + +SubscriberId::~SubscriberId() { + // @@protoc_insertion_point(destructor:bgs.protocol.channel.v1.SubscriberId) + SharedDtor(); +} + +void SubscriberId::SharedDtor() { + if (this != default_instance_) { + delete account_; + delete game_account_; + delete process_; + } +} + +void SubscriberId::SetCachedSize(int size) const { + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); +} +const ::google::protobuf::Descriptor* SubscriberId::descriptor() { + protobuf_AssignDescriptorsOnce(); + return SubscriberId_descriptor_; +} + +const SubscriberId& SubscriberId::default_instance() { + if (default_instance_ == NULL) protobuf_AddDesc_channel_5ftypes_2eproto(); + return *default_instance_; +} + +SubscriberId* SubscriberId::default_instance_ = NULL; + +SubscriberId* SubscriberId::New() const { + return new SubscriberId; +} + +void SubscriberId::Clear() { + if (_has_bits_[0 / 32] & 7) { + if (has_account()) { + if (account_ != NULL) account_->::bgs::protocol::account::v1::AccountId::Clear(); + } + if (has_game_account()) { + if (game_account_ != NULL) game_account_->::bgs::protocol::account::v1::GameAccountHandle::Clear(); + } + if (has_process()) { + if (process_ != NULL) process_->::bgs::protocol::ProcessId::Clear(); + } + } + ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); +} + +bool SubscriberId::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:bgs.protocol.channel.v1.SubscriberId) + for (;;) { + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // optional .bgs.protocol.account.v1.AccountId account = 1 [deprecated = true]; + case 1: { + if (tag == 10) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_account())); + } else { + goto handle_unusual; + } + if (input->ExpectTag(18)) goto parse_game_account; + break; + } + + // optional .bgs.protocol.account.v1.GameAccountHandle game_account = 2; + case 2: { + if (tag == 18) { + parse_game_account: + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_game_account())); + } else { + goto handle_unusual; + } + if (input->ExpectTag(26)) goto parse_process; + break; + } + + // optional .bgs.protocol.ProcessId process = 3; + case 3: { + if (tag == 26) { + parse_process: + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_process())); + } else { + goto handle_unusual; + } + if (input->ExpectAtEnd()) goto success; + break; + } + + default: { + handle_unusual: + if (tag == 0 || + ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:bgs.protocol.channel.v1.SubscriberId) + return true; +failure: + // @@protoc_insertion_point(parse_failure:bgs.protocol.channel.v1.SubscriberId) + return false; +#undef DO_ +} + +void SubscriberId::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:bgs.protocol.channel.v1.SubscriberId) + // optional .bgs.protocol.account.v1.AccountId account = 1 [deprecated = true]; + if (has_account()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, this->account(), output); + } + + // optional .bgs.protocol.account.v1.GameAccountHandle game_account = 2; + if (has_game_account()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 2, this->game_account(), output); + } + + // optional .bgs.protocol.ProcessId process = 3; + if (has_process()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 3, this->process(), output); + } + + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:bgs.protocol.channel.v1.SubscriberId) +} + +::google::protobuf::uint8* SubscriberId::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.channel.v1.SubscriberId) + // optional .bgs.protocol.account.v1.AccountId account = 1 [deprecated = true]; + if (has_account()) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 1, this->account(), target); + } + + // optional .bgs.protocol.account.v1.GameAccountHandle game_account = 2; + if (has_game_account()) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 2, this->game_account(), target); + } + + // optional .bgs.protocol.ProcessId process = 3; + if (has_process()) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 3, this->process(), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.channel.v1.SubscriberId) + return target; +} + +int SubscriberId::ByteSize() const { + int total_size = 0; + + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { + // optional .bgs.protocol.account.v1.AccountId account = 1 [deprecated = true]; + if (has_account()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->account()); + } + + // optional .bgs.protocol.account.v1.GameAccountHandle game_account = 2; + if (has_game_account()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->game_account()); + } + + // optional .bgs.protocol.ProcessId process = 3; + if (has_process()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->process()); + } + + } + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = total_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} + +void SubscriberId::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const SubscriberId* source = + ::google::protobuf::internal::dynamic_cast_if_available<const SubscriberId*>( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } +} + +void SubscriberId::MergeFrom(const SubscriberId& from) { + GOOGLE_CHECK_NE(&from, this); + if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from.has_account()) { + mutable_account()->::bgs::protocol::account::v1::AccountId::MergeFrom(from.account()); + } + if (from.has_game_account()) { + mutable_game_account()->::bgs::protocol::account::v1::GameAccountHandle::MergeFrom(from.game_account()); + } + if (from.has_process()) { + mutable_process()->::bgs::protocol::ProcessId::MergeFrom(from.process()); + } + } + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void SubscriberId::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void SubscriberId::CopyFrom(const SubscriberId& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool SubscriberId::IsInitialized() const { + + if (has_account()) { + if (!this->account().IsInitialized()) return false; + } + if (has_game_account()) { + if (!this->game_account().IsInitialized()) return false; + } + if (has_process()) { + if (!this->process().IsInitialized()) return false; + } + return true; +} + +void SubscriberId::Swap(SubscriberId* other) { + if (other != this) { + std::swap(account_, other->account_); + std::swap(game_account_, other->game_account_); + std::swap(process_, other->process_); + std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); + std::swap(_cached_size_, other->_cached_size_); + } +} + +::google::protobuf::Metadata SubscriberId::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = SubscriberId_descriptor_; + metadata.reflection = SubscriberId_reflection_; + return metadata; +} + + // @@protoc_insertion_point(namespace_scope) } // namespace v1 diff --git a/src/server/proto/Client/channel_types.pb.h b/src/server/proto/Client/channel_types.pb.h index c17da91a0b4..65eecc6ccad 100644 --- a/src/server/proto/Client/channel_types.pb.h +++ b/src/server/proto/Client/channel_types.pb.h @@ -28,6 +28,7 @@ #include "api/client/v1/channel_id.pb.h" // IWYU pragma: export #include "attribute_types.pb.h" #include "entity_types.pb.h" +#include "account_types.pb.h" #include "invitation_types.pb.h" #include "rpc_types.pb.h" #include "Define.h" // for TC_PROTO_API @@ -51,6 +52,7 @@ class ChannelState; class MemberAccountInfo; class MemberState; class Member; +class SubscriberId; enum ChannelState_PrivacyLevel { ChannelState_PrivacyLevel_PRIVACY_LEVEL_OPEN = 1, @@ -1026,6 +1028,111 @@ class TC_PROTO_API Member : public ::google::protobuf::Message { void InitAsDefaultInstance(); static Member* default_instance_; }; +// ------------------------------------------------------------------- + +class TC_PROTO_API SubscriberId : public ::google::protobuf::Message { + public: + SubscriberId(); + virtual ~SubscriberId(); + + SubscriberId(const SubscriberId& from); + + inline SubscriberId& operator=(const SubscriberId& from) { + CopyFrom(from); + return *this; + } + + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); + static const SubscriberId& default_instance(); + + void Swap(SubscriberId* other); + + // implements Message ---------------------------------------------- + + SubscriberId* New() const; + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); + void CopyFrom(const SubscriberId& from); + void MergeFrom(const SubscriberId& from); + void Clear(); + bool IsInitialized() const; + + int ByteSize() const; + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input); + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; + int GetCachedSize() const { return _cached_size_; } + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const; + public: + ::google::protobuf::Metadata GetMetadata() const; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // optional .bgs.protocol.account.v1.AccountId account = 1 [deprecated = true]; + inline bool has_account() const PROTOBUF_DEPRECATED; + inline void clear_account() PROTOBUF_DEPRECATED; + static const int kAccountFieldNumber = 1; + inline const ::bgs::protocol::account::v1::AccountId& account() const PROTOBUF_DEPRECATED; + inline ::bgs::protocol::account::v1::AccountId* mutable_account() PROTOBUF_DEPRECATED; + inline ::bgs::protocol::account::v1::AccountId* release_account() PROTOBUF_DEPRECATED; + inline void set_allocated_account(::bgs::protocol::account::v1::AccountId* account) PROTOBUF_DEPRECATED; + + // optional .bgs.protocol.account.v1.GameAccountHandle game_account = 2; + inline bool has_game_account() const; + inline void clear_game_account(); + static const int kGameAccountFieldNumber = 2; + inline const ::bgs::protocol::account::v1::GameAccountHandle& game_account() const; + inline ::bgs::protocol::account::v1::GameAccountHandle* mutable_game_account(); + inline ::bgs::protocol::account::v1::GameAccountHandle* release_game_account(); + inline void set_allocated_game_account(::bgs::protocol::account::v1::GameAccountHandle* game_account); + + // optional .bgs.protocol.ProcessId process = 3; + inline bool has_process() const; + inline void clear_process(); + static const int kProcessFieldNumber = 3; + inline const ::bgs::protocol::ProcessId& process() const; + inline ::bgs::protocol::ProcessId* mutable_process(); + inline ::bgs::protocol::ProcessId* release_process(); + inline void set_allocated_process(::bgs::protocol::ProcessId* process); + + // @@protoc_insertion_point(class_scope:bgs.protocol.channel.v1.SubscriberId) + private: + inline void set_has_account(); + inline void clear_has_account(); + inline void set_has_game_account(); + inline void clear_has_game_account(); + inline void set_has_process(); + inline void clear_has_process(); + + ::google::protobuf::UnknownFieldSet _unknown_fields_; + + ::google::protobuf::uint32 _has_bits_[1]; + mutable int _cached_size_; + ::bgs::protocol::account::v1::AccountId* account_; + ::bgs::protocol::account::v1::GameAccountHandle* game_account_; + ::bgs::protocol::ProcessId* process_; + friend void TC_PROTO_API protobuf_AddDesc_channel_5ftypes_2eproto(); + friend void protobuf_AssignDesc_channel_5ftypes_2eproto(); + friend void protobuf_ShutdownFile_channel_5ftypes_2eproto(); + + void InitAsDefaultInstance(); + static SubscriberId* default_instance_; +}; // =================================================================== @@ -2224,6 +2331,133 @@ inline void Member::set_allocated_state(::bgs::protocol::channel::v1::MemberStat // @@protoc_insertion_point(field_set_allocated:bgs.protocol.channel.v1.Member.state) } +// ------------------------------------------------------------------- + +// SubscriberId + +// optional .bgs.protocol.account.v1.AccountId account = 1 [deprecated = true]; +inline bool SubscriberId::has_account() const { + return (_has_bits_[0] & 0x00000001u) != 0; +} +inline void SubscriberId::set_has_account() { + _has_bits_[0] |= 0x00000001u; +} +inline void SubscriberId::clear_has_account() { + _has_bits_[0] &= ~0x00000001u; +} +inline void SubscriberId::clear_account() { + if (account_ != NULL) account_->::bgs::protocol::account::v1::AccountId::Clear(); + clear_has_account(); +} +inline const ::bgs::protocol::account::v1::AccountId& SubscriberId::account() const { + // @@protoc_insertion_point(field_get:bgs.protocol.channel.v1.SubscriberId.account) + return account_ != NULL ? *account_ : *default_instance_->account_; +} +inline ::bgs::protocol::account::v1::AccountId* SubscriberId::mutable_account() { + set_has_account(); + if (account_ == NULL) account_ = new ::bgs::protocol::account::v1::AccountId; + // @@protoc_insertion_point(field_mutable:bgs.protocol.channel.v1.SubscriberId.account) + return account_; +} +inline ::bgs::protocol::account::v1::AccountId* SubscriberId::release_account() { + clear_has_account(); + ::bgs::protocol::account::v1::AccountId* temp = account_; + account_ = NULL; + return temp; +} +inline void SubscriberId::set_allocated_account(::bgs::protocol::account::v1::AccountId* account) { + delete account_; + account_ = account; + if (account) { + set_has_account(); + } else { + clear_has_account(); + } + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.channel.v1.SubscriberId.account) +} + +// optional .bgs.protocol.account.v1.GameAccountHandle game_account = 2; +inline bool SubscriberId::has_game_account() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +inline void SubscriberId::set_has_game_account() { + _has_bits_[0] |= 0x00000002u; +} +inline void SubscriberId::clear_has_game_account() { + _has_bits_[0] &= ~0x00000002u; +} +inline void SubscriberId::clear_game_account() { + if (game_account_ != NULL) game_account_->::bgs::protocol::account::v1::GameAccountHandle::Clear(); + clear_has_game_account(); +} +inline const ::bgs::protocol::account::v1::GameAccountHandle& SubscriberId::game_account() const { + // @@protoc_insertion_point(field_get:bgs.protocol.channel.v1.SubscriberId.game_account) + return game_account_ != NULL ? *game_account_ : *default_instance_->game_account_; +} +inline ::bgs::protocol::account::v1::GameAccountHandle* SubscriberId::mutable_game_account() { + set_has_game_account(); + if (game_account_ == NULL) game_account_ = new ::bgs::protocol::account::v1::GameAccountHandle; + // @@protoc_insertion_point(field_mutable:bgs.protocol.channel.v1.SubscriberId.game_account) + return game_account_; +} +inline ::bgs::protocol::account::v1::GameAccountHandle* SubscriberId::release_game_account() { + clear_has_game_account(); + ::bgs::protocol::account::v1::GameAccountHandle* temp = game_account_; + game_account_ = NULL; + return temp; +} +inline void SubscriberId::set_allocated_game_account(::bgs::protocol::account::v1::GameAccountHandle* game_account) { + delete game_account_; + game_account_ = game_account; + if (game_account) { + set_has_game_account(); + } else { + clear_has_game_account(); + } + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.channel.v1.SubscriberId.game_account) +} + +// optional .bgs.protocol.ProcessId process = 3; +inline bool SubscriberId::has_process() const { + return (_has_bits_[0] & 0x00000004u) != 0; +} +inline void SubscriberId::set_has_process() { + _has_bits_[0] |= 0x00000004u; +} +inline void SubscriberId::clear_has_process() { + _has_bits_[0] &= ~0x00000004u; +} +inline void SubscriberId::clear_process() { + if (process_ != NULL) process_->::bgs::protocol::ProcessId::Clear(); + clear_has_process(); +} +inline const ::bgs::protocol::ProcessId& SubscriberId::process() const { + // @@protoc_insertion_point(field_get:bgs.protocol.channel.v1.SubscriberId.process) + return process_ != NULL ? *process_ : *default_instance_->process_; +} +inline ::bgs::protocol::ProcessId* SubscriberId::mutable_process() { + set_has_process(); + if (process_ == NULL) process_ = new ::bgs::protocol::ProcessId; + // @@protoc_insertion_point(field_mutable:bgs.protocol.channel.v1.SubscriberId.process) + return process_; +} +inline ::bgs::protocol::ProcessId* SubscriberId::release_process() { + clear_has_process(); + ::bgs::protocol::ProcessId* temp = process_; + process_ = NULL; + return temp; +} +inline void SubscriberId::set_allocated_process(::bgs::protocol::ProcessId* process) { + delete process_; + process_ = process; + if (process) { + set_has_process(); + } else { + clear_has_process(); + } + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.channel.v1.SubscriberId.process) +} + // @@protoc_insertion_point(namespace_scope) diff --git a/src/server/proto/Client/club_member.pb.cc b/src/server/proto/Client/club_member.pb.cc index 45b7788049a..68cc6099557 100644 --- a/src/server/proto/Client/club_member.pb.cc +++ b/src/server/proto/Client/club_member.pb.cc @@ -25,9 +25,6 @@ namespace v1 { namespace { -const ::google::protobuf::Descriptor* MemberId_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - MemberId_reflection_ = NULL; const ::google::protobuf::Descriptor* Member_descriptor_ = NULL; const ::google::protobuf::internal::GeneratedMessageReflection* Member_reflection_ = NULL; @@ -52,6 +49,9 @@ const ::google::protobuf::internal::GeneratedMessageReflection* const ::google::protobuf::Descriptor* MemberDescription_descriptor_ = NULL; const ::google::protobuf::internal::GeneratedMessageReflection* MemberDescription_reflection_ = NULL; +const ::google::protobuf::Descriptor* RoleOptions_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + RoleOptions_reflection_ = NULL; const ::google::protobuf::Descriptor* RoleAssignment_descriptor_ = NULL; const ::google::protobuf::internal::GeneratedMessageReflection* RoleAssignment_reflection_ = NULL; @@ -80,23 +80,7 @@ void protobuf_AssignDesc_club_5fmember_2eproto() { ::google::protobuf::DescriptorPool::generated_pool()->FindFileByName( "club_member.proto"); GOOGLE_CHECK(file != NULL); - MemberId_descriptor_ = file->message_type(0); - static const int MemberId_offsets_[2] = { - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberId, account_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberId, unique_id_), - }; - MemberId_reflection_ = - new ::google::protobuf::internal::GeneratedMessageReflection( - MemberId_descriptor_, - MemberId::default_instance_, - MemberId_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberId, _has_bits_[0]), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberId, _unknown_fields_), - -1, - ::google::protobuf::DescriptorPool::generated_pool(), - ::google::protobuf::MessageFactory::generated_factory(), - sizeof(MemberId)); - Member_descriptor_ = file->message_type(1); + Member_descriptor_ = file->message_type(0); static const int Member_offsets_[11] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Member, id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Member, battle_tag_), @@ -121,7 +105,7 @@ void protobuf_AssignDesc_club_5fmember_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(Member)); - MemberResult_descriptor_ = file->message_type(2); + MemberResult_descriptor_ = file->message_type(1); static const int MemberResult_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberResult, member_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberResult, status_), @@ -137,7 +121,7 @@ void protobuf_AssignDesc_club_5fmember_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(MemberResult)); - RemoveMemberOptions_descriptor_ = file->message_type(3); + RemoveMemberOptions_descriptor_ = file->message_type(2); static const int RemoveMemberOptions_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RemoveMemberOptions, id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RemoveMemberOptions, reason_), @@ -153,7 +137,7 @@ void protobuf_AssignDesc_club_5fmember_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(RemoveMemberOptions)); - MemberRemovedAssignment_descriptor_ = file->message_type(4); + MemberRemovedAssignment_descriptor_ = file->message_type(3); static const int MemberRemovedAssignment_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberRemovedAssignment, id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberRemovedAssignment, reason_), @@ -169,7 +153,7 @@ void protobuf_AssignDesc_club_5fmember_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(MemberRemovedAssignment)); - MemberVoiceOptions_descriptor_ = file->message_type(5); + MemberVoiceOptions_descriptor_ = file->message_type(4); static const int MemberVoiceOptions_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberVoiceOptions, stream_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberVoiceOptions, joined_), @@ -187,7 +171,7 @@ void protobuf_AssignDesc_club_5fmember_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(MemberVoiceOptions)); - MemberVoiceState_descriptor_ = file->message_type(6); + MemberVoiceState_descriptor_ = file->message_type(5); static const int MemberVoiceState_offsets_[5] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberVoiceState, id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberVoiceState, stream_id_), @@ -206,7 +190,7 @@ void protobuf_AssignDesc_club_5fmember_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(MemberVoiceState)); - CreateMemberOptions_descriptor_ = file->message_type(7); + CreateMemberOptions_descriptor_ = file->message_type(6); static const int CreateMemberOptions_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CreateMemberOptions, id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CreateMemberOptions, attribute_), @@ -222,7 +206,7 @@ void protobuf_AssignDesc_club_5fmember_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(CreateMemberOptions)); - MemberDescription_descriptor_ = file->message_type(8); + MemberDescription_descriptor_ = file->message_type(7); static const int MemberDescription_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberDescription, id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberDescription, battle_tag_), @@ -238,6 +222,22 @@ void protobuf_AssignDesc_club_5fmember_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(MemberDescription)); + RoleOptions_descriptor_ = file->message_type(8); + static const int RoleOptions_offsets_[2] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RoleOptions, member_id_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RoleOptions, role_), + }; + RoleOptions_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + RoleOptions_descriptor_, + RoleOptions::default_instance_, + RoleOptions_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RoleOptions, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RoleOptions, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(RoleOptions)); RoleAssignment_descriptor_ = file->message_type(9); static const int RoleAssignment_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RoleAssignment, member_id_), @@ -354,8 +354,6 @@ inline void protobuf_AssignDescriptorsOnce() { void protobuf_RegisterTypes(const ::std::string&) { protobuf_AssignDescriptorsOnce(); ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - MemberId_descriptor_, &MemberId::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( Member_descriptor_, &Member::default_instance()); ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( MemberResult_descriptor_, &MemberResult::default_instance()); @@ -372,6 +370,8 @@ void protobuf_RegisterTypes(const ::std::string&) { ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( MemberDescription_descriptor_, &MemberDescription::default_instance()); ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + RoleOptions_descriptor_, &RoleOptions::default_instance()); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( RoleAssignment_descriptor_, &RoleAssignment::default_instance()); ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( MemberAttributeAssignment_descriptor_, &MemberAttributeAssignment::default_instance()); @@ -388,8 +388,6 @@ void protobuf_RegisterTypes(const ::std::string&) { } // namespace void protobuf_ShutdownFile_club_5fmember_2eproto() { - delete MemberId::default_instance_; - delete MemberId_reflection_; delete Member::default_instance_; delete Member_reflection_; delete MemberResult::default_instance_; @@ -406,6 +404,8 @@ void protobuf_ShutdownFile_club_5fmember_2eproto() { delete CreateMemberOptions_reflection_; delete MemberDescription::default_instance_; delete MemberDescription_reflection_; + delete RoleOptions::default_instance_; + delete RoleOptions_reflection_; delete RoleAssignment::default_instance_; delete RoleAssignment_reflection_; delete MemberAttributeAssignment::default_instance_; @@ -426,75 +426,76 @@ void protobuf_AddDesc_club_5fmember_2eproto() { already_here = true; GOOGLE_PROTOBUF_VERIFY_VERSION; + ::bgs::protocol::club::v1::protobuf_AddDesc_club_5fmember_5fid_2eproto(); ::bgs::protocol::protobuf_AddDesc_global_5fextensions_2fmessage_5foptions_2eproto(); ::bgs::protocol::v2::protobuf_AddDesc_api_2fclient_2fv2_2fattribute_5ftypes_2eproto(); - ::bgs::protocol::account::v1::protobuf_AddDesc_account_5ftypes_2eproto(); ::bgs::protocol::club::v1::protobuf_AddDesc_club_5fenum_2eproto(); + ::bgs::protocol::protobuf_AddDesc_rpc_5ftypes_2eproto(); ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( "\n\021club_member.proto\022\024bgs.protocol.club.v" - "1\032\'global_extensions/message_options.pro" - "to\032#api/client/v2/attribute_types.proto\032" - "\023account_types.proto\032\017club_enum.proto\"]\n" - "\010MemberId\0226\n\naccount_id\030\001 \001(\0132\".bgs.prot" - "ocol.account.v1.AccountId\022\021\n\tunique_id\030\002" - " \001(\004:\006\202\371+\002\010\001\"\201\003\n\006Member\022*\n\002id\030\001 \001(\0132\036.bg" - "s.protocol.club.v1.MemberId\022\022\n\nbattle_ta" - "g\030\002 \001(\t\022\020\n\004role\030\003 \003(\rB\002\020\001\022-\n\tattribute\030\004" - " \003(\0132\032.bgs.protocol.v2.Attribute\022\021\n\tjoin" - "_time\030\005 \001(\004\022;\n\016presence_level\030\006 \001(\0162#.bg" - "s.protocol.club.v1.PresenceLevel\022\026\n\016mode" - "rator_mute\030\007 \001(\010\0229\n\rwhisper_level\030\010 \001(\0162" - "\".bgs.protocol.club.v1.WhisperLevel\022\014\n\004n" - "ote\030\t \001(\t\022\016\n\006active\0302 \001(\010\0225\n\005voice\0303 \001(\013" - "2&.bgs.protocol.club.v1.MemberVoiceState" - "\"Q\n\014MemberResult\0221\n\tmember_id\030\001 \001(\0132\036.bg" - "s.protocol.club.v1.MemberId\022\016\n\006status\030\002 " - "\001(\r\"z\n\023RemoveMemberOptions\022*\n\002id\030\001 \001(\0132\036" - ".bgs.protocol.club.v1.MemberId\0227\n\006reason" - "\030\002 \001(\0162\'.bgs.protocol.club.v1.ClubRemove" - "dReason\"~\n\027MemberRemovedAssignment\022*\n\002id" - "\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\0227" - "\n\006reason\030\002 \001(\0162\'.bgs.protocol.club.v1.Cl" - "ubRemovedReason\"\207\001\n\022MemberVoiceOptions\022\021" - "\n\tstream_id\030\001 \001(\004\022\016\n\006joined\030\002 \001(\010\022>\n\nmic" - "rophone\030\003 \001(\0162*.bgs.protocol.club.v1.Voi" - "ceMicrophoneState\022\016\n\006active\030\004 \001(\010\"\221\001\n\020Me" - "mberVoiceState\022\n\n\002id\030\001 \001(\t\022\021\n\tstream_id\030" - "\002 \001(\004\022\016\n\006joined\030\003 \001(\010\022>\n\nmicrophone\030\004 \001(" - "\0162*.bgs.protocol.club.v1.VoiceMicrophone" - "State\022\016\n\006active\030\005 \001(\010\"p\n\023CreateMemberOpt" - "ions\022*\n\002id\030\001 \001(\0132\036.bgs.protocol.club.v1." - "MemberId\022-\n\tattribute\030\002 \003(\0132\032.bgs.protoc" - "ol.v2.Attribute\"S\n\021MemberDescription\022*\n\002" - "id\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId" - "\022\022\n\nbattle_tag\030\002 \001(\t\"U\n\016RoleAssignment\0221" + "1\032\024club_member_id.proto\032\'global_extensio" + "ns/message_options.proto\032#api/client/v2/" + "attribute_types.proto\032\017club_enum.proto\032\017" + "rpc_types.proto\"\201\003\n\006Member\022*\n\002id\030\001 \001(\0132\036" + ".bgs.protocol.club.v1.MemberId\022\022\n\nbattle" + "_tag\030\002 \001(\t\022\020\n\004role\030\003 \003(\rB\002\020\001\022-\n\tattribut" + "e\030\004 \003(\0132\032.bgs.protocol.v2.Attribute\022\021\n\tj" + "oin_time\030\005 \001(\004\022;\n\016presence_level\030\006 \001(\0162#" + ".bgs.protocol.club.v1.PresenceLevel\022\026\n\016m" + "oderator_mute\030\007 \001(\010\0229\n\rwhisper_level\030\010 \001" + "(\0162\".bgs.protocol.club.v1.WhisperLevel\022\014" + "\n\004note\030\t \001(\t\022\016\n\006active\0302 \001(\010\0225\n\005voice\0303 " + "\001(\0132&.bgs.protocol.club.v1.MemberVoiceSt" + "ate\"Q\n\014MemberResult\0221\n\tmember_id\030\001 \001(\0132\036" + ".bgs.protocol.club.v1.MemberId\022\016\n\006status" + "\030\002 \001(\r\"z\n\023RemoveMemberOptions\022*\n\002id\030\001 \001(" + "\0132\036.bgs.protocol.club.v1.MemberId\0227\n\006rea" + "son\030\002 \001(\0162\'.bgs.protocol.club.v1.ClubRem" + "ovedReason\"~\n\027MemberRemovedAssignment\022*\n" + "\002id\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberI" + "d\0227\n\006reason\030\002 \001(\0162\'.bgs.protocol.club.v1" + ".ClubRemovedReason\"\207\001\n\022MemberVoiceOption" + "s\022\021\n\tstream_id\030\001 \001(\004\022\016\n\006joined\030\002 \001(\010\022>\n\n" + "microphone\030\003 \001(\0162*.bgs.protocol.club.v1." + "VoiceMicrophoneState\022\016\n\006active\030\004 \001(\010\"\221\001\n" + "\020MemberVoiceState\022\n\n\002id\030\001 \001(\t\022\021\n\tstream_" + "id\030\002 \001(\004\022\016\n\006joined\030\003 \001(\010\022>\n\nmicrophone\030\004" + " \001(\0162*.bgs.protocol.club.v1.VoiceMicroph" + "oneState\022\016\n\006active\030\005 \001(\010\"p\n\023CreateMember" + "Options\022*\n\002id\030\001 \001(\0132\036.bgs.protocol.club." + "v1.MemberId\022-\n\tattribute\030\002 \003(\0132\032.bgs.pro" + "tocol.v2.Attribute\"S\n\021MemberDescription\022" + "*\n\002id\030\001 \001(\0132\036.bgs.protocol.club.v1.Membe" + "rId\022\022\n\nbattle_tag\030\002 \001(\t\"^\n\013RoleOptions\0221" "\n\tmember_id\030\001 \001(\0132\036.bgs.protocol.club.v1" - ".MemberId\022\020\n\004role\030\002 \003(\rB\002\020\001\"}\n\031MemberAtt" - "ributeAssignment\0221\n\tmember_id\030\001 \001(\0132\036.bg" - "s.protocol.club.v1.MemberId\022-\n\tattribute" - "\030\002 \003(\0132\032.bgs.protocol.v2.Attribute\"Q\n\026Su" - "bscriberStateOptions\0227\n\005voice\030\001 \001(\0132(.bg" - "s.protocol.club.v1.MemberVoiceOptions\"\225\001" - "\n\031SubscriberStateAssignment\0221\n\tmember_id" - "\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022\016" - "\n\006active\030\002 \001(\010\0225\n\005voice\030\003 \001(\0132&.bgs.prot" - "ocol.club.v1.MemberVoiceState\"\341\001\n\022Member" - "StateOptions\022-\n\tattribute\030\001 \003(\0132\032.bgs.pr" - "otocol.v2.Attribute\022;\n\016presence_level\030\002 " - "\001(\0162#.bgs.protocol.club.v1.PresenceLevel" - "\022\026\n\016moderator_mute\030\003 \001(\010\0229\n\rwhisper_leve" - "l\030\004 \001(\0162\".bgs.protocol.club.v1.WhisperLe" - "vel\022\014\n\004note\030\005 \001(\t\"\227\002\n\025MemberStateAssignm" - "ent\0221\n\tmember_id\030\001 \001(\0132\036.bgs.protocol.cl" - "ub.v1.MemberId\022-\n\tattribute\030\002 \003(\0132\032.bgs." - "protocol.v2.Attribute\022;\n\016presence_level\030" - "\003 \001(\0162#.bgs.protocol.club.v1.PresenceLev" - "el\022\026\n\016moderator_mute\030\004 \001(\010\0229\n\rwhisper_le" - "vel\030\005 \001(\0162\".bgs.protocol.club.v1.Whisper" - "Level\022\014\n\004note\030\006 \001(\tB\002H\001", 2423); + ".MemberId\022\034\n\004role\030\002 \003(\rB\016\020\001\212\371+\010*\006\n\004\010\001\020\001\"" + "U\n\016RoleAssignment\0221\n\tmember_id\030\001 \001(\0132\036.b" + "gs.protocol.club.v1.MemberId\022\020\n\004role\030\002 \003" + "(\rB\002\020\001\"}\n\031MemberAttributeAssignment\0221\n\tm" + "ember_id\030\001 \001(\0132\036.bgs.protocol.club.v1.Me" + "mberId\022-\n\tattribute\030\002 \003(\0132\032.bgs.protocol" + ".v2.Attribute\"Q\n\026SubscriberStateOptions\022" + "7\n\005voice\030\001 \001(\0132(.bgs.protocol.club.v1.Me" + "mberVoiceOptions\"\225\001\n\031SubscriberStateAssi" + "gnment\0221\n\tmember_id\030\001 \001(\0132\036.bgs.protocol" + ".club.v1.MemberId\022\016\n\006active\030\002 \001(\010\0225\n\005voi" + "ce\030\003 \001(\0132&.bgs.protocol.club.v1.MemberVo" + "iceState\"\341\001\n\022MemberStateOptions\022-\n\tattri" + "bute\030\001 \003(\0132\032.bgs.protocol.v2.Attribute\022;" + "\n\016presence_level\030\002 \001(\0162#.bgs.protocol.cl" + "ub.v1.PresenceLevel\022\026\n\016moderator_mute\030\003 " + "\001(\010\0229\n\rwhisper_level\030\004 \001(\0162\".bgs.protoco" + "l.club.v1.WhisperLevel\022\014\n\004note\030\005 \001(\t\"\227\002\n" + "\025MemberStateAssignment\0221\n\tmember_id\030\001 \001(" + "\0132\036.bgs.protocol.club.v1.MemberId\022-\n\tatt" + "ribute\030\002 \003(\0132\032.bgs.protocol.v2.Attribute" + "\022;\n\016presence_level\030\003 \001(\0162#.bgs.protocol." + "club.v1.PresenceLevel\022\026\n\016moderator_mute\030" + "\004 \001(\010\0229\n\rwhisper_level\030\005 \001(\0162\".bgs.proto" + "col.club.v1.WhisperLevel\022\014\n\004note\030\006 \001(\tB\002" + "H\001P\000", 2444); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "club_member.proto", &protobuf_RegisterTypes); - MemberId::default_instance_ = new MemberId(); Member::default_instance_ = new Member(); MemberResult::default_instance_ = new MemberResult(); RemoveMemberOptions::default_instance_ = new RemoveMemberOptions(); @@ -503,13 +504,13 @@ void protobuf_AddDesc_club_5fmember_2eproto() { MemberVoiceState::default_instance_ = new MemberVoiceState(); CreateMemberOptions::default_instance_ = new CreateMemberOptions(); MemberDescription::default_instance_ = new MemberDescription(); + RoleOptions::default_instance_ = new RoleOptions(); RoleAssignment::default_instance_ = new RoleAssignment(); MemberAttributeAssignment::default_instance_ = new MemberAttributeAssignment(); SubscriberStateOptions::default_instance_ = new SubscriberStateOptions(); SubscriberStateAssignment::default_instance_ = new SubscriberStateAssignment(); MemberStateOptions::default_instance_ = new MemberStateOptions(); MemberStateAssignment::default_instance_ = new MemberStateAssignment(); - MemberId::default_instance_->InitAsDefaultInstance(); Member::default_instance_->InitAsDefaultInstance(); MemberResult::default_instance_->InitAsDefaultInstance(); RemoveMemberOptions::default_instance_->InitAsDefaultInstance(); @@ -518,6 +519,7 @@ void protobuf_AddDesc_club_5fmember_2eproto() { MemberVoiceState::default_instance_->InitAsDefaultInstance(); CreateMemberOptions::default_instance_->InitAsDefaultInstance(); MemberDescription::default_instance_->InitAsDefaultInstance(); + RoleOptions::default_instance_->InitAsDefaultInstance(); RoleAssignment::default_instance_->InitAsDefaultInstance(); MemberAttributeAssignment::default_instance_->InitAsDefaultInstance(); SubscriberStateOptions::default_instance_->InitAsDefaultInstance(); @@ -537,277 +539,6 @@ struct StaticDescriptorInitializer_club_5fmember_2eproto { // =================================================================== #ifndef _MSC_VER -const int MemberId::kAccountIdFieldNumber; -const int MemberId::kUniqueIdFieldNumber; -#endif // !_MSC_VER - -MemberId::MemberId() - : ::google::protobuf::Message() { - SharedCtor(); - // @@protoc_insertion_point(constructor:bgs.protocol.club.v1.MemberId) -} - -void MemberId::InitAsDefaultInstance() { - account_id_ = const_cast< ::bgs::protocol::account::v1::AccountId*>(&::bgs::protocol::account::v1::AccountId::default_instance()); -} - -MemberId::MemberId(const MemberId& from) - : ::google::protobuf::Message() { - SharedCtor(); - MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:bgs.protocol.club.v1.MemberId) -} - -void MemberId::SharedCtor() { - _cached_size_ = 0; - account_id_ = NULL; - unique_id_ = GOOGLE_ULONGLONG(0); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); -} - -MemberId::~MemberId() { - // @@protoc_insertion_point(destructor:bgs.protocol.club.v1.MemberId) - SharedDtor(); -} - -void MemberId::SharedDtor() { - if (this != default_instance_) { - delete account_id_; - } -} - -void MemberId::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const ::google::protobuf::Descriptor* MemberId::descriptor() { - protobuf_AssignDescriptorsOnce(); - return MemberId_descriptor_; -} - -const MemberId& MemberId::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_club_5fmember_2eproto(); - return *default_instance_; -} - -MemberId* MemberId::default_instance_ = NULL; - -MemberId* MemberId::New() const { - return new MemberId; -} - -void MemberId::Clear() { - if (_has_bits_[0 / 32] & 3) { - if (has_account_id()) { - if (account_id_ != NULL) account_id_->::bgs::protocol::account::v1::AccountId::Clear(); - } - unique_id_ = GOOGLE_ULONGLONG(0); - } - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - mutable_unknown_fields()->Clear(); -} - -bool MemberId::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:bgs.protocol.club.v1.MemberId) - for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // optional .bgs.protocol.account.v1.AccountId account_id = 1; - case 1: { - if (tag == 10) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_account_id())); - } else { - goto handle_unusual; - } - if (input->ExpectTag(16)) goto parse_unique_id; - break; - } - - // optional uint64 unique_id = 2; - case 2: { - if (tag == 16) { - parse_unique_id: - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>( - input, &unique_id_))); - set_has_unique_id(); - } else { - goto handle_unusual; - } - if (input->ExpectAtEnd()) goto success; - break; - } - - default: { - handle_unusual: - if (tag == 0 || - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { - goto success; - } - DO_(::google::protobuf::internal::WireFormat::SkipField( - input, tag, mutable_unknown_fields())); - break; - } - } - } -success: - // @@protoc_insertion_point(parse_success:bgs.protocol.club.v1.MemberId) - return true; -failure: - // @@protoc_insertion_point(parse_failure:bgs.protocol.club.v1.MemberId) - return false; -#undef DO_ -} - -void MemberId::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:bgs.protocol.club.v1.MemberId) - // optional .bgs.protocol.account.v1.AccountId account_id = 1; - if (has_account_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 1, this->account_id(), output); - } - - // optional uint64 unique_id = 2; - if (has_unique_id()) { - ::google::protobuf::internal::WireFormatLite::WriteUInt64(2, this->unique_id(), output); - } - - if (!unknown_fields().empty()) { - ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - unknown_fields(), output); - } - // @@protoc_insertion_point(serialize_end:bgs.protocol.club.v1.MemberId) -} - -::google::protobuf::uint8* MemberId::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.club.v1.MemberId) - // optional .bgs.protocol.account.v1.AccountId account_id = 1; - if (has_account_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 1, this->account_id(), target); - } - - // optional uint64 unique_id = 2; - if (has_unique_id()) { - target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(2, this->unique_id(), target); - } - - if (!unknown_fields().empty()) { - target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - unknown_fields(), target); - } - // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.club.v1.MemberId) - return target; -} - -int MemberId::ByteSize() const { - int total_size = 0; - - if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // optional .bgs.protocol.account.v1.AccountId account_id = 1; - if (has_account_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->account_id()); - } - - // optional uint64 unique_id = 2; - if (has_unique_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::UInt64Size( - this->unique_id()); - } - - } - if (!unknown_fields().empty()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); - } - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); - return total_size; -} - -void MemberId::MergeFrom(const ::google::protobuf::Message& from) { - GOOGLE_CHECK_NE(&from, this); - const MemberId* source = - ::google::protobuf::internal::dynamic_cast_if_available<const MemberId*>( - &from); - if (source == NULL) { - ::google::protobuf::internal::ReflectionOps::Merge(from, this); - } else { - MergeFrom(*source); - } -} - -void MemberId::MergeFrom(const MemberId& from) { - GOOGLE_CHECK_NE(&from, this); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { - if (from.has_account_id()) { - mutable_account_id()->::bgs::protocol::account::v1::AccountId::MergeFrom(from.account_id()); - } - if (from.has_unique_id()) { - set_unique_id(from.unique_id()); - } - } - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); -} - -void MemberId::CopyFrom(const ::google::protobuf::Message& from) { - if (&from == this) return; - Clear(); - MergeFrom(from); -} - -void MemberId::CopyFrom(const MemberId& from) { - if (&from == this) return; - Clear(); - MergeFrom(from); -} - -bool MemberId::IsInitialized() const { - - if (has_account_id()) { - if (!this->account_id().IsInitialized()) return false; - } - return true; -} - -void MemberId::Swap(MemberId* other) { - if (other != this) { - std::swap(account_id_, other->account_id_); - std::swap(unique_id_, other->unique_id_); - std::swap(_has_bits_[0], other->_has_bits_[0]); - _unknown_fields_.Swap(&other->_unknown_fields_); - std::swap(_cached_size_, other->_cached_size_); - } -} - -::google::protobuf::Metadata MemberId::GetMetadata() const { - protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = MemberId_descriptor_; - metadata.reflection = MemberId_reflection_; - return metadata; -} - - -// =================================================================== - -#ifndef _MSC_VER const int Member::kIdFieldNumber; const int Member::kBattleTagFieldNumber; const int Member::kRoleFieldNumber; @@ -3679,6 +3410,300 @@ void MemberDescription::Swap(MemberDescription* other) { // =================================================================== #ifndef _MSC_VER +const int RoleOptions::kMemberIdFieldNumber; +const int RoleOptions::kRoleFieldNumber; +#endif // !_MSC_VER + +RoleOptions::RoleOptions() + : ::google::protobuf::Message() { + SharedCtor(); + // @@protoc_insertion_point(constructor:bgs.protocol.club.v1.RoleOptions) +} + +void RoleOptions::InitAsDefaultInstance() { + member_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); +} + +RoleOptions::RoleOptions(const RoleOptions& from) + : ::google::protobuf::Message() { + SharedCtor(); + MergeFrom(from); + // @@protoc_insertion_point(copy_constructor:bgs.protocol.club.v1.RoleOptions) +} + +void RoleOptions::SharedCtor() { + _cached_size_ = 0; + member_id_ = NULL; + _role_cached_byte_size_ = 0; + ::memset(_has_bits_, 0, sizeof(_has_bits_)); +} + +RoleOptions::~RoleOptions() { + // @@protoc_insertion_point(destructor:bgs.protocol.club.v1.RoleOptions) + SharedDtor(); +} + +void RoleOptions::SharedDtor() { + if (this != default_instance_) { + delete member_id_; + } +} + +void RoleOptions::SetCachedSize(int size) const { + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); +} +const ::google::protobuf::Descriptor* RoleOptions::descriptor() { + protobuf_AssignDescriptorsOnce(); + return RoleOptions_descriptor_; +} + +const RoleOptions& RoleOptions::default_instance() { + if (default_instance_ == NULL) protobuf_AddDesc_club_5fmember_2eproto(); + return *default_instance_; +} + +RoleOptions* RoleOptions::default_instance_ = NULL; + +RoleOptions* RoleOptions::New() const { + return new RoleOptions; +} + +void RoleOptions::Clear() { + if (has_member_id()) { + if (member_id_ != NULL) member_id_->::bgs::protocol::club::v1::MemberId::Clear(); + } + role_.Clear(); + ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); +} + +bool RoleOptions::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:bgs.protocol.club.v1.RoleOptions) + for (;;) { + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // optional .bgs.protocol.club.v1.MemberId member_id = 1; + case 1: { + if (tag == 10) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_member_id())); + } else { + goto handle_unusual; + } + if (input->ExpectTag(18)) goto parse_role; + break; + } + + // repeated uint32 role = 2 [packed = true]; + case 2: { + if (tag == 18) { + parse_role: + DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitive< + ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( + input, this->mutable_role()))); + } else if (tag == 16) { + DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline< + ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( + 1, 18, input, this->mutable_role()))); + } else { + goto handle_unusual; + } + if (input->ExpectAtEnd()) goto success; + break; + } + + default: { + handle_unusual: + if (tag == 0 || + ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:bgs.protocol.club.v1.RoleOptions) + return true; +failure: + // @@protoc_insertion_point(parse_failure:bgs.protocol.club.v1.RoleOptions) + return false; +#undef DO_ +} + +void RoleOptions::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:bgs.protocol.club.v1.RoleOptions) + // optional .bgs.protocol.club.v1.MemberId member_id = 1; + if (has_member_id()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, this->member_id(), output); + } + + // repeated uint32 role = 2 [packed = true]; + if (this->role_size() > 0) { + ::google::protobuf::internal::WireFormatLite::WriteTag(2, ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, output); + output->WriteVarint32(_role_cached_byte_size_); + } + for (int i = 0; i < this->role_size(); i++) { + ::google::protobuf::internal::WireFormatLite::WriteUInt32NoTag( + this->role(i), output); + } + + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:bgs.protocol.club.v1.RoleOptions) +} + +::google::protobuf::uint8* RoleOptions::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.club.v1.RoleOptions) + // optional .bgs.protocol.club.v1.MemberId member_id = 1; + if (has_member_id()) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 1, this->member_id(), target); + } + + // repeated uint32 role = 2 [packed = true]; + if (this->role_size() > 0) { + target = ::google::protobuf::internal::WireFormatLite::WriteTagToArray( + 2, + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, + target); + target = ::google::protobuf::io::CodedOutputStream::WriteVarint32ToArray( + _role_cached_byte_size_, target); + } + for (int i = 0; i < this->role_size(); i++) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteUInt32NoTagToArray(this->role(i), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.club.v1.RoleOptions) + return target; +} + +int RoleOptions::ByteSize() const { + int total_size = 0; + + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { + // optional .bgs.protocol.club.v1.MemberId member_id = 1; + if (has_member_id()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->member_id()); + } + + } + // repeated uint32 role = 2 [packed = true]; + { + int data_size = 0; + for (int i = 0; i < this->role_size(); i++) { + data_size += ::google::protobuf::internal::WireFormatLite:: + UInt32Size(this->role(i)); + } + if (data_size > 0) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::Int32Size(data_size); + } + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _role_cached_byte_size_ = data_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + total_size += data_size; + } + + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = total_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} + +void RoleOptions::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const RoleOptions* source = + ::google::protobuf::internal::dynamic_cast_if_available<const RoleOptions*>( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } +} + +void RoleOptions::MergeFrom(const RoleOptions& from) { + GOOGLE_CHECK_NE(&from, this); + role_.MergeFrom(from.role_); + if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from.has_member_id()) { + mutable_member_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.member_id()); + } + } + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void RoleOptions::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void RoleOptions::CopyFrom(const RoleOptions& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool RoleOptions::IsInitialized() const { + + if (has_member_id()) { + if (!this->member_id().IsInitialized()) return false; + } + return true; +} + +void RoleOptions::Swap(RoleOptions* other) { + if (other != this) { + std::swap(member_id_, other->member_id_); + role_.Swap(&other->role_); + std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); + std::swap(_cached_size_, other->_cached_size_); + } +} + +::google::protobuf::Metadata RoleOptions::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = RoleOptions_descriptor_; + metadata.reflection = RoleOptions_reflection_; + return metadata; +} + + +// =================================================================== + +#ifndef _MSC_VER const int RoleAssignment::kMemberIdFieldNumber; const int RoleAssignment::kRoleFieldNumber; #endif // !_MSC_VER diff --git a/src/server/proto/Client/club_member.pb.h b/src/server/proto/Client/club_member.pb.h index 249ef006b38..018bfa2ba56 100644 --- a/src/server/proto/Client/club_member.pb.h +++ b/src/server/proto/Client/club_member.pb.h @@ -24,10 +24,11 @@ #include <google/protobuf/repeated_field.h> #include <google/protobuf/extension_set.h> #include <google/protobuf/unknown_field_set.h> +#include "club_member_id.pb.h" // IWYU pragma: export #include "global_extensions/message_options.pb.h" #include "api/client/v2/attribute_types.pb.h" -#include "account_types.pb.h" #include "club_enum.pb.h" +#include "rpc_types.pb.h" #include "Define.h" // for TC_PROTO_API // @@protoc_insertion_point(includes) @@ -41,7 +42,6 @@ void TC_PROTO_API protobuf_AddDesc_club_5fmember_2eproto(); void protobuf_AssignDesc_club_5fmember_2eproto(); void protobuf_ShutdownFile_club_5fmember_2eproto(); -class MemberId; class Member; class MemberResult; class RemoveMemberOptions; @@ -50,6 +50,7 @@ class MemberVoiceOptions; class MemberVoiceState; class CreateMemberOptions; class MemberDescription; +class RoleOptions; class RoleAssignment; class MemberAttributeAssignment; class SubscriberStateOptions; @@ -59,97 +60,6 @@ class MemberStateAssignment; // =================================================================== -class TC_PROTO_API MemberId : public ::google::protobuf::Message { - public: - MemberId(); - virtual ~MemberId(); - - MemberId(const MemberId& from); - - inline MemberId& operator=(const MemberId& from) { - CopyFrom(from); - return *this; - } - - inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { - return _unknown_fields_; - } - - inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { - return &_unknown_fields_; - } - - static const ::google::protobuf::Descriptor* descriptor(); - static const MemberId& default_instance(); - - void Swap(MemberId* other); - - // implements Message ---------------------------------------------- - - MemberId* New() const; - void CopyFrom(const ::google::protobuf::Message& from); - void MergeFrom(const ::google::protobuf::Message& from); - void CopyFrom(const MemberId& from); - void MergeFrom(const MemberId& from); - void Clear(); - bool IsInitialized() const; - - int ByteSize() const; - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input); - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const; - ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; - int GetCachedSize() const { return _cached_size_; } - private: - void SharedCtor(); - void SharedDtor(); - void SetCachedSize(int size) const; - public: - ::google::protobuf::Metadata GetMetadata() const; - - // nested types ---------------------------------------------------- - - // accessors ------------------------------------------------------- - - // optional .bgs.protocol.account.v1.AccountId account_id = 1; - inline bool has_account_id() const; - inline void clear_account_id(); - static const int kAccountIdFieldNumber = 1; - inline const ::bgs::protocol::account::v1::AccountId& account_id() const; - inline ::bgs::protocol::account::v1::AccountId* mutable_account_id(); - inline ::bgs::protocol::account::v1::AccountId* release_account_id(); - inline void set_allocated_account_id(::bgs::protocol::account::v1::AccountId* account_id); - - // optional uint64 unique_id = 2; - inline bool has_unique_id() const; - inline void clear_unique_id(); - static const int kUniqueIdFieldNumber = 2; - inline ::google::protobuf::uint64 unique_id() const; - inline void set_unique_id(::google::protobuf::uint64 value); - - // @@protoc_insertion_point(class_scope:bgs.protocol.club.v1.MemberId) - private: - inline void set_has_account_id(); - inline void clear_has_account_id(); - inline void set_has_unique_id(); - inline void clear_has_unique_id(); - - ::google::protobuf::UnknownFieldSet _unknown_fields_; - - ::google::protobuf::uint32 _has_bits_[1]; - mutable int _cached_size_; - ::bgs::protocol::account::v1::AccountId* account_id_; - ::google::protobuf::uint64 unique_id_; - friend void TC_PROTO_API protobuf_AddDesc_club_5fmember_2eproto(); - friend void protobuf_AssignDesc_club_5fmember_2eproto(); - friend void protobuf_ShutdownFile_club_5fmember_2eproto(); - - void InitAsDefaultInstance(); - static MemberId* default_instance_; -}; -// ------------------------------------------------------------------- - class TC_PROTO_API Member : public ::google::protobuf::Message { public: Member(); @@ -1046,6 +956,101 @@ class TC_PROTO_API MemberDescription : public ::google::protobuf::Message { }; // ------------------------------------------------------------------- +class TC_PROTO_API RoleOptions : public ::google::protobuf::Message { + public: + RoleOptions(); + virtual ~RoleOptions(); + + RoleOptions(const RoleOptions& from); + + inline RoleOptions& operator=(const RoleOptions& from) { + CopyFrom(from); + return *this; + } + + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); + static const RoleOptions& default_instance(); + + void Swap(RoleOptions* other); + + // implements Message ---------------------------------------------- + + RoleOptions* New() const; + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); + void CopyFrom(const RoleOptions& from); + void MergeFrom(const RoleOptions& from); + void Clear(); + bool IsInitialized() const; + + int ByteSize() const; + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input); + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; + int GetCachedSize() const { return _cached_size_; } + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const; + public: + ::google::protobuf::Metadata GetMetadata() const; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // optional .bgs.protocol.club.v1.MemberId member_id = 1; + inline bool has_member_id() const; + inline void clear_member_id(); + static const int kMemberIdFieldNumber = 1; + inline const ::bgs::protocol::club::v1::MemberId& member_id() const; + inline ::bgs::protocol::club::v1::MemberId* mutable_member_id(); + inline ::bgs::protocol::club::v1::MemberId* release_member_id(); + inline void set_allocated_member_id(::bgs::protocol::club::v1::MemberId* member_id); + + // repeated uint32 role = 2 [packed = true]; + inline int role_size() const; + inline void clear_role(); + static const int kRoleFieldNumber = 2; + inline ::google::protobuf::uint32 role(int index) const; + inline void set_role(int index, ::google::protobuf::uint32 value); + inline void add_role(::google::protobuf::uint32 value); + inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >& + role() const; + inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >* + mutable_role(); + + // @@protoc_insertion_point(class_scope:bgs.protocol.club.v1.RoleOptions) + private: + inline void set_has_member_id(); + inline void clear_has_member_id(); + + ::google::protobuf::UnknownFieldSet _unknown_fields_; + + ::google::protobuf::uint32 _has_bits_[1]; + mutable int _cached_size_; + ::bgs::protocol::club::v1::MemberId* member_id_; + ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > role_; + mutable int _role_cached_byte_size_; + friend void TC_PROTO_API protobuf_AddDesc_club_5fmember_2eproto(); + friend void protobuf_AssignDesc_club_5fmember_2eproto(); + friend void protobuf_ShutdownFile_club_5fmember_2eproto(); + + void InitAsDefaultInstance(); + static RoleOptions* default_instance_; +}; +// ------------------------------------------------------------------- + class TC_PROTO_API RoleAssignment : public ::google::protobuf::Message { public: RoleAssignment(); @@ -1691,75 +1696,6 @@ class TC_PROTO_API MemberStateAssignment : public ::google::protobuf::Message { // =================================================================== -// MemberId - -// optional .bgs.protocol.account.v1.AccountId account_id = 1; -inline bool MemberId::has_account_id() const { - return (_has_bits_[0] & 0x00000001u) != 0; -} -inline void MemberId::set_has_account_id() { - _has_bits_[0] |= 0x00000001u; -} -inline void MemberId::clear_has_account_id() { - _has_bits_[0] &= ~0x00000001u; -} -inline void MemberId::clear_account_id() { - if (account_id_ != NULL) account_id_->::bgs::protocol::account::v1::AccountId::Clear(); - clear_has_account_id(); -} -inline const ::bgs::protocol::account::v1::AccountId& MemberId::account_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.MemberId.account_id) - return account_id_ != NULL ? *account_id_ : *default_instance_->account_id_; -} -inline ::bgs::protocol::account::v1::AccountId* MemberId::mutable_account_id() { - set_has_account_id(); - if (account_id_ == NULL) account_id_ = new ::bgs::protocol::account::v1::AccountId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.MemberId.account_id) - return account_id_; -} -inline ::bgs::protocol::account::v1::AccountId* MemberId::release_account_id() { - clear_has_account_id(); - ::bgs::protocol::account::v1::AccountId* temp = account_id_; - account_id_ = NULL; - return temp; -} -inline void MemberId::set_allocated_account_id(::bgs::protocol::account::v1::AccountId* account_id) { - delete account_id_; - account_id_ = account_id; - if (account_id) { - set_has_account_id(); - } else { - clear_has_account_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.MemberId.account_id) -} - -// optional uint64 unique_id = 2; -inline bool MemberId::has_unique_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void MemberId::set_has_unique_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void MemberId::clear_has_unique_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void MemberId::clear_unique_id() { - unique_id_ = GOOGLE_ULONGLONG(0); - clear_has_unique_id(); -} -inline ::google::protobuf::uint64 MemberId::unique_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.MemberId.unique_id) - return unique_id_; -} -inline void MemberId::set_unique_id(::google::protobuf::uint64 value) { - set_has_unique_id(); - unique_id_ = value; - // @@protoc_insertion_point(field_set:bgs.protocol.club.v1.MemberId.unique_id) -} - -// ------------------------------------------------------------------- - // Member // optional .bgs.protocol.club.v1.MemberId id = 1; @@ -2863,6 +2799,81 @@ inline void MemberDescription::set_allocated_battle_tag(::std::string* battle_ta // ------------------------------------------------------------------- +// RoleOptions + +// optional .bgs.protocol.club.v1.MemberId member_id = 1; +inline bool RoleOptions::has_member_id() const { + return (_has_bits_[0] & 0x00000001u) != 0; +} +inline void RoleOptions::set_has_member_id() { + _has_bits_[0] |= 0x00000001u; +} +inline void RoleOptions::clear_has_member_id() { + _has_bits_[0] &= ~0x00000001u; +} +inline void RoleOptions::clear_member_id() { + if (member_id_ != NULL) member_id_->::bgs::protocol::club::v1::MemberId::Clear(); + clear_has_member_id(); +} +inline const ::bgs::protocol::club::v1::MemberId& RoleOptions::member_id() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.RoleOptions.member_id) + return member_id_ != NULL ? *member_id_ : *default_instance_->member_id_; +} +inline ::bgs::protocol::club::v1::MemberId* RoleOptions::mutable_member_id() { + set_has_member_id(); + if (member_id_ == NULL) member_id_ = new ::bgs::protocol::club::v1::MemberId; + // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.RoleOptions.member_id) + return member_id_; +} +inline ::bgs::protocol::club::v1::MemberId* RoleOptions::release_member_id() { + clear_has_member_id(); + ::bgs::protocol::club::v1::MemberId* temp = member_id_; + member_id_ = NULL; + return temp; +} +inline void RoleOptions::set_allocated_member_id(::bgs::protocol::club::v1::MemberId* member_id) { + delete member_id_; + member_id_ = member_id; + if (member_id) { + set_has_member_id(); + } else { + clear_has_member_id(); + } + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.RoleOptions.member_id) +} + +// repeated uint32 role = 2 [packed = true]; +inline int RoleOptions::role_size() const { + return role_.size(); +} +inline void RoleOptions::clear_role() { + role_.Clear(); +} +inline ::google::protobuf::uint32 RoleOptions::role(int index) const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.RoleOptions.role) + return role_.Get(index); +} +inline void RoleOptions::set_role(int index, ::google::protobuf::uint32 value) { + role_.Set(index, value); + // @@protoc_insertion_point(field_set:bgs.protocol.club.v1.RoleOptions.role) +} +inline void RoleOptions::add_role(::google::protobuf::uint32 value) { + role_.Add(value); + // @@protoc_insertion_point(field_add:bgs.protocol.club.v1.RoleOptions.role) +} +inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >& +RoleOptions::role() const { + // @@protoc_insertion_point(field_list:bgs.protocol.club.v1.RoleOptions.role) + return role_; +} +inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >* +RoleOptions::mutable_role() { + // @@protoc_insertion_point(field_mutable_list:bgs.protocol.club.v1.RoleOptions.role) + return &role_; +} + +// ------------------------------------------------------------------- + // RoleAssignment // optional .bgs.protocol.club.v1.MemberId member_id = 1; diff --git a/src/server/proto/Client/club_member_id.pb.cc b/src/server/proto/Client/club_member_id.pb.cc new file mode 100644 index 00000000000..f8fbd2a681d --- /dev/null +++ b/src/server/proto/Client/club_member_id.pb.cc @@ -0,0 +1,387 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: club_member_id.proto + +#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION +#include "club_member_id.pb.h" + +#include <algorithm> +#include <utility> + +#include <google/protobuf/stubs/common.h> +#include <google/protobuf/stubs/once.h> +#include <google/protobuf/io/coded_stream.h> +#include <google/protobuf/wire_format_lite_inl.h> +#include <google/protobuf/descriptor.h> +#include <google/protobuf/generated_message_reflection.h> +#include <google/protobuf/reflection_ops.h> +#include <google/protobuf/wire_format.h> +#include "Log.h" +// @@protoc_insertion_point(includes) + +namespace bgs { +namespace protocol { +namespace club { +namespace v1 { + +namespace { + +const ::google::protobuf::Descriptor* MemberId_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + MemberId_reflection_ = NULL; + +} // namespace + + +void protobuf_AssignDesc_club_5fmember_5fid_2eproto() { + protobuf_AddDesc_club_5fmember_5fid_2eproto(); + const ::google::protobuf::FileDescriptor* file = + ::google::protobuf::DescriptorPool::generated_pool()->FindFileByName( + "club_member_id.proto"); + GOOGLE_CHECK(file != NULL); + MemberId_descriptor_ = file->message_type(0); + static const int MemberId_offsets_[2] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberId, account_id_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberId, unique_id_), + }; + MemberId_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + MemberId_descriptor_, + MemberId::default_instance_, + MemberId_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberId, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberId, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(MemberId)); +} + +namespace { + +GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_); +inline void protobuf_AssignDescriptorsOnce() { + ::google::protobuf::GoogleOnceInit(&protobuf_AssignDescriptors_once_, + &protobuf_AssignDesc_club_5fmember_5fid_2eproto); +} + +void protobuf_RegisterTypes(const ::std::string&) { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + MemberId_descriptor_, &MemberId::default_instance()); +} + +} // namespace + +void protobuf_ShutdownFile_club_5fmember_5fid_2eproto() { + delete MemberId::default_instance_; + delete MemberId_reflection_; +} + +void protobuf_AddDesc_club_5fmember_5fid_2eproto() { + static bool already_here = false; + if (already_here) return; + already_here = true; + GOOGLE_PROTOBUF_VERIFY_VERSION; + + ::bgs::protocol::protobuf_AddDesc_global_5fextensions_2fmessage_5foptions_2eproto(); + ::bgs::protocol::account::v1::protobuf_AddDesc_account_5ftypes_2eproto(); + ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( + "\n\024club_member_id.proto\022\024bgs.protocol.clu" + "b.v1\032\'global_extensions/message_options." + "proto\032\023account_types.proto\"]\n\010MemberId\0226" + "\n\naccount_id\030\001 \001(\0132\".bgs.protocol.accoun" + "t.v1.AccountId\022\021\n\tunique_id\030\002 \001(\004:\006\202\371+\002\010" + "\001B\002H\001", 205); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( + "club_member_id.proto", &protobuf_RegisterTypes); + MemberId::default_instance_ = new MemberId(); + MemberId::default_instance_->InitAsDefaultInstance(); + ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_club_5fmember_5fid_2eproto); +} + +// Force AddDescriptors() to be called at static initialization time. +struct StaticDescriptorInitializer_club_5fmember_5fid_2eproto { + StaticDescriptorInitializer_club_5fmember_5fid_2eproto() { + protobuf_AddDesc_club_5fmember_5fid_2eproto(); + } +} static_descriptor_initializer_club_5fmember_5fid_2eproto_; + +// =================================================================== + +#ifndef _MSC_VER +const int MemberId::kAccountIdFieldNumber; +const int MemberId::kUniqueIdFieldNumber; +#endif // !_MSC_VER + +MemberId::MemberId() + : ::google::protobuf::Message() { + SharedCtor(); + // @@protoc_insertion_point(constructor:bgs.protocol.club.v1.MemberId) +} + +void MemberId::InitAsDefaultInstance() { + account_id_ = const_cast< ::bgs::protocol::account::v1::AccountId*>(&::bgs::protocol::account::v1::AccountId::default_instance()); +} + +MemberId::MemberId(const MemberId& from) + : ::google::protobuf::Message() { + SharedCtor(); + MergeFrom(from); + // @@protoc_insertion_point(copy_constructor:bgs.protocol.club.v1.MemberId) +} + +void MemberId::SharedCtor() { + _cached_size_ = 0; + account_id_ = NULL; + unique_id_ = GOOGLE_ULONGLONG(0); + ::memset(_has_bits_, 0, sizeof(_has_bits_)); +} + +MemberId::~MemberId() { + // @@protoc_insertion_point(destructor:bgs.protocol.club.v1.MemberId) + SharedDtor(); +} + +void MemberId::SharedDtor() { + if (this != default_instance_) { + delete account_id_; + } +} + +void MemberId::SetCachedSize(int size) const { + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); +} +const ::google::protobuf::Descriptor* MemberId::descriptor() { + protobuf_AssignDescriptorsOnce(); + return MemberId_descriptor_; +} + +const MemberId& MemberId::default_instance() { + if (default_instance_ == NULL) protobuf_AddDesc_club_5fmember_5fid_2eproto(); + return *default_instance_; +} + +MemberId* MemberId::default_instance_ = NULL; + +MemberId* MemberId::New() const { + return new MemberId; +} + +void MemberId::Clear() { + if (_has_bits_[0 / 32] & 3) { + if (has_account_id()) { + if (account_id_ != NULL) account_id_->::bgs::protocol::account::v1::AccountId::Clear(); + } + unique_id_ = GOOGLE_ULONGLONG(0); + } + ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); +} + +bool MemberId::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:bgs.protocol.club.v1.MemberId) + for (;;) { + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // optional .bgs.protocol.account.v1.AccountId account_id = 1; + case 1: { + if (tag == 10) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_account_id())); + } else { + goto handle_unusual; + } + if (input->ExpectTag(16)) goto parse_unique_id; + break; + } + + // optional uint64 unique_id = 2; + case 2: { + if (tag == 16) { + parse_unique_id: + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>( + input, &unique_id_))); + set_has_unique_id(); + } else { + goto handle_unusual; + } + if (input->ExpectAtEnd()) goto success; + break; + } + + default: { + handle_unusual: + if (tag == 0 || + ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:bgs.protocol.club.v1.MemberId) + return true; +failure: + // @@protoc_insertion_point(parse_failure:bgs.protocol.club.v1.MemberId) + return false; +#undef DO_ +} + +void MemberId::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:bgs.protocol.club.v1.MemberId) + // optional .bgs.protocol.account.v1.AccountId account_id = 1; + if (has_account_id()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, this->account_id(), output); + } + + // optional uint64 unique_id = 2; + if (has_unique_id()) { + ::google::protobuf::internal::WireFormatLite::WriteUInt64(2, this->unique_id(), output); + } + + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:bgs.protocol.club.v1.MemberId) +} + +::google::protobuf::uint8* MemberId::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.club.v1.MemberId) + // optional .bgs.protocol.account.v1.AccountId account_id = 1; + if (has_account_id()) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 1, this->account_id(), target); + } + + // optional uint64 unique_id = 2; + if (has_unique_id()) { + target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(2, this->unique_id(), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.club.v1.MemberId) + return target; +} + +int MemberId::ByteSize() const { + int total_size = 0; + + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { + // optional .bgs.protocol.account.v1.AccountId account_id = 1; + if (has_account_id()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->account_id()); + } + + // optional uint64 unique_id = 2; + if (has_unique_id()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::UInt64Size( + this->unique_id()); + } + + } + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = total_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} + +void MemberId::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const MemberId* source = + ::google::protobuf::internal::dynamic_cast_if_available<const MemberId*>( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } +} + +void MemberId::MergeFrom(const MemberId& from) { + GOOGLE_CHECK_NE(&from, this); + if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from.has_account_id()) { + mutable_account_id()->::bgs::protocol::account::v1::AccountId::MergeFrom(from.account_id()); + } + if (from.has_unique_id()) { + set_unique_id(from.unique_id()); + } + } + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void MemberId::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void MemberId::CopyFrom(const MemberId& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool MemberId::IsInitialized() const { + + if (has_account_id()) { + if (!this->account_id().IsInitialized()) return false; + } + return true; +} + +void MemberId::Swap(MemberId* other) { + if (other != this) { + std::swap(account_id_, other->account_id_); + std::swap(unique_id_, other->unique_id_); + std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); + std::swap(_cached_size_, other->_cached_size_); + } +} + +::google::protobuf::Metadata MemberId::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = MemberId_descriptor_; + metadata.reflection = MemberId_reflection_; + return metadata; +} + + +// @@protoc_insertion_point(namespace_scope) + +} // namespace v1 +} // namespace club +} // namespace protocol +} // namespace bgs + +// @@protoc_insertion_point(global_scope) diff --git a/src/server/proto/Client/club_member_id.pb.h b/src/server/proto/Client/club_member_id.pb.h new file mode 100644 index 00000000000..23dc51a5cf8 --- /dev/null +++ b/src/server/proto/Client/club_member_id.pb.h @@ -0,0 +1,229 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: club_member_id.proto + +#ifndef PROTOBUF_club_5fmember_5fid_2eproto__INCLUDED +#define PROTOBUF_club_5fmember_5fid_2eproto__INCLUDED + +#include <string> + +#include <google/protobuf/stubs/common.h> + +#if GOOGLE_PROTOBUF_VERSION < 2006000 +#error This file was generated by a newer version of protoc which is +#error incompatible with your Protocol Buffer headers. Please update +#error your headers. +#endif +#if 2006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION +#error This file was generated by an older version of protoc which is +#error incompatible with your Protocol Buffer headers. Please +#error regenerate this file with a newer version of protoc. +#endif + +#include <google/protobuf/generated_message_util.h> +#include <google/protobuf/message.h> +#include <google/protobuf/repeated_field.h> +#include <google/protobuf/extension_set.h> +#include <google/protobuf/unknown_field_set.h> +#include "global_extensions/message_options.pb.h" +#include "account_types.pb.h" +#include "Define.h" // for TC_PROTO_API +// @@protoc_insertion_point(includes) + +namespace bgs { +namespace protocol { +namespace club { +namespace v1 { + +// Internal implementation detail -- do not call these. +void TC_PROTO_API protobuf_AddDesc_club_5fmember_5fid_2eproto(); +void protobuf_AssignDesc_club_5fmember_5fid_2eproto(); +void protobuf_ShutdownFile_club_5fmember_5fid_2eproto(); + +class MemberId; + +// =================================================================== + +class TC_PROTO_API MemberId : public ::google::protobuf::Message { + public: + MemberId(); + virtual ~MemberId(); + + MemberId(const MemberId& from); + + inline MemberId& operator=(const MemberId& from) { + CopyFrom(from); + return *this; + } + + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); + static const MemberId& default_instance(); + + void Swap(MemberId* other); + + // implements Message ---------------------------------------------- + + MemberId* New() const; + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); + void CopyFrom(const MemberId& from); + void MergeFrom(const MemberId& from); + void Clear(); + bool IsInitialized() const; + + int ByteSize() const; + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input); + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; + int GetCachedSize() const { return _cached_size_; } + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const; + public: + ::google::protobuf::Metadata GetMetadata() const; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // optional .bgs.protocol.account.v1.AccountId account_id = 1; + inline bool has_account_id() const; + inline void clear_account_id(); + static const int kAccountIdFieldNumber = 1; + inline const ::bgs::protocol::account::v1::AccountId& account_id() const; + inline ::bgs::protocol::account::v1::AccountId* mutable_account_id(); + inline ::bgs::protocol::account::v1::AccountId* release_account_id(); + inline void set_allocated_account_id(::bgs::protocol::account::v1::AccountId* account_id); + + // optional uint64 unique_id = 2; + inline bool has_unique_id() const; + inline void clear_unique_id(); + static const int kUniqueIdFieldNumber = 2; + inline ::google::protobuf::uint64 unique_id() const; + inline void set_unique_id(::google::protobuf::uint64 value); + + // @@protoc_insertion_point(class_scope:bgs.protocol.club.v1.MemberId) + private: + inline void set_has_account_id(); + inline void clear_has_account_id(); + inline void set_has_unique_id(); + inline void clear_has_unique_id(); + + ::google::protobuf::UnknownFieldSet _unknown_fields_; + + ::google::protobuf::uint32 _has_bits_[1]; + mutable int _cached_size_; + ::bgs::protocol::account::v1::AccountId* account_id_; + ::google::protobuf::uint64 unique_id_; + friend void TC_PROTO_API protobuf_AddDesc_club_5fmember_5fid_2eproto(); + friend void protobuf_AssignDesc_club_5fmember_5fid_2eproto(); + friend void protobuf_ShutdownFile_club_5fmember_5fid_2eproto(); + + void InitAsDefaultInstance(); + static MemberId* default_instance_; +}; +// =================================================================== + + +// =================================================================== + + +// =================================================================== + +// MemberId + +// optional .bgs.protocol.account.v1.AccountId account_id = 1; +inline bool MemberId::has_account_id() const { + return (_has_bits_[0] & 0x00000001u) != 0; +} +inline void MemberId::set_has_account_id() { + _has_bits_[0] |= 0x00000001u; +} +inline void MemberId::clear_has_account_id() { + _has_bits_[0] &= ~0x00000001u; +} +inline void MemberId::clear_account_id() { + if (account_id_ != NULL) account_id_->::bgs::protocol::account::v1::AccountId::Clear(); + clear_has_account_id(); +} +inline const ::bgs::protocol::account::v1::AccountId& MemberId::account_id() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.MemberId.account_id) + return account_id_ != NULL ? *account_id_ : *default_instance_->account_id_; +} +inline ::bgs::protocol::account::v1::AccountId* MemberId::mutable_account_id() { + set_has_account_id(); + if (account_id_ == NULL) account_id_ = new ::bgs::protocol::account::v1::AccountId; + // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.MemberId.account_id) + return account_id_; +} +inline ::bgs::protocol::account::v1::AccountId* MemberId::release_account_id() { + clear_has_account_id(); + ::bgs::protocol::account::v1::AccountId* temp = account_id_; + account_id_ = NULL; + return temp; +} +inline void MemberId::set_allocated_account_id(::bgs::protocol::account::v1::AccountId* account_id) { + delete account_id_; + account_id_ = account_id; + if (account_id) { + set_has_account_id(); + } else { + clear_has_account_id(); + } + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.MemberId.account_id) +} + +// optional uint64 unique_id = 2; +inline bool MemberId::has_unique_id() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +inline void MemberId::set_has_unique_id() { + _has_bits_[0] |= 0x00000002u; +} +inline void MemberId::clear_has_unique_id() { + _has_bits_[0] &= ~0x00000002u; +} +inline void MemberId::clear_unique_id() { + unique_id_ = GOOGLE_ULONGLONG(0); + clear_has_unique_id(); +} +inline ::google::protobuf::uint64 MemberId::unique_id() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.MemberId.unique_id) + return unique_id_; +} +inline void MemberId::set_unique_id(::google::protobuf::uint64 value) { + set_has_unique_id(); + unique_id_ = value; + // @@protoc_insertion_point(field_set:bgs.protocol.club.v1.MemberId.unique_id) +} + + +// @@protoc_insertion_point(namespace_scope) + +} // namespace v1 +} // namespace club +} // namespace protocol +} // namespace bgs + +#ifndef SWIG +namespace google { +namespace protobuf { + + +} // namespace google +} // namespace protobuf +#endif // SWIG + +// @@protoc_insertion_point(global_scope) + +#endif // PROTOBUF_club_5fmember_5fid_2eproto__INCLUDED diff --git a/src/server/proto/Client/club_membership_listener.pb.cc b/src/server/proto/Client/club_membership_listener.pb.cc index cc0462aa3e9..ff3d4011159 100644 --- a/src/server/proto/Client/club_membership_listener.pb.cc +++ b/src/server/proto/Client/club_membership_listener.pb.cc @@ -64,9 +64,8 @@ void protobuf_AssignDesc_club_5fmembership_5flistener_2eproto() { "club_membership_listener.proto"); GOOGLE_CHECK(file != NULL); ClubAddedNotification_descriptor_ = file->message_type(0); - static const int ClubAddedNotification_offsets_[3] = { + static const int ClubAddedNotification_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubAddedNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubAddedNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubAddedNotification, membership_), }; ClubAddedNotification_reflection_ = @@ -81,9 +80,8 @@ void protobuf_AssignDesc_club_5fmembership_5flistener_2eproto() { ::google::protobuf::MessageFactory::generated_factory(), sizeof(ClubAddedNotification)); ClubRemovedNotification_descriptor_ = file->message_type(1); - static const int ClubRemovedNotification_offsets_[5] = { + static const int ClubRemovedNotification_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubRemovedNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubRemovedNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubRemovedNotification, member_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubRemovedNotification, club_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubRemovedNotification, reason_), @@ -100,9 +98,8 @@ void protobuf_AssignDesc_club_5fmembership_5flistener_2eproto() { ::google::protobuf::MessageFactory::generated_factory(), sizeof(ClubRemovedNotification)); ReceivedInvitationAddedNotification_descriptor_ = file->message_type(2); - static const int ReceivedInvitationAddedNotification_offsets_[3] = { + static const int ReceivedInvitationAddedNotification_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReceivedInvitationAddedNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReceivedInvitationAddedNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReceivedInvitationAddedNotification, invitation_), }; ReceivedInvitationAddedNotification_reflection_ = @@ -117,9 +114,8 @@ void protobuf_AssignDesc_club_5fmembership_5flistener_2eproto() { ::google::protobuf::MessageFactory::generated_factory(), sizeof(ReceivedInvitationAddedNotification)); ReceivedInvitationRemovedNotification_descriptor_ = file->message_type(3); - static const int ReceivedInvitationRemovedNotification_offsets_[4] = { + static const int ReceivedInvitationRemovedNotification_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReceivedInvitationRemovedNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReceivedInvitationRemovedNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReceivedInvitationRemovedNotification, invitation_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReceivedInvitationRemovedNotification, reason_), }; @@ -135,9 +131,8 @@ void protobuf_AssignDesc_club_5fmembership_5flistener_2eproto() { ::google::protobuf::MessageFactory::generated_factory(), sizeof(ReceivedInvitationRemovedNotification)); SharedSettingsChangedNotification_descriptor_ = file->message_type(4); - static const int SharedSettingsChangedNotification_offsets_[3] = { + static const int SharedSettingsChangedNotification_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SharedSettingsChangedNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SharedSettingsChangedNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SharedSettingsChangedNotification, assignment_), }; SharedSettingsChangedNotification_reflection_ = @@ -152,9 +147,8 @@ void protobuf_AssignDesc_club_5fmembership_5flistener_2eproto() { ::google::protobuf::MessageFactory::generated_factory(), sizeof(SharedSettingsChangedNotification)); StreamMentionAddedNotification_descriptor_ = file->message_type(5); - static const int StreamMentionAddedNotification_offsets_[3] = { + static const int StreamMentionAddedNotification_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMentionAddedNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMentionAddedNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMentionAddedNotification, mention_), }; StreamMentionAddedNotification_reflection_ = @@ -169,9 +163,8 @@ void protobuf_AssignDesc_club_5fmembership_5flistener_2eproto() { ::google::protobuf::MessageFactory::generated_factory(), sizeof(StreamMentionAddedNotification)); StreamMentionRemovedNotification_descriptor_ = file->message_type(6); - static const int StreamMentionRemovedNotification_offsets_[3] = { + static const int StreamMentionRemovedNotification_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMentionRemovedNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMentionRemovedNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMentionRemovedNotification, mention_id_), }; StreamMentionRemovedNotification_reflection_ = @@ -186,9 +179,8 @@ void protobuf_AssignDesc_club_5fmembership_5flistener_2eproto() { ::google::protobuf::MessageFactory::generated_factory(), sizeof(StreamMentionRemovedNotification)); StreamMentionAdvanceViewTimeNotification_descriptor_ = file->message_type(7); - static const int StreamMentionAdvanceViewTimeNotification_offsets_[3] = { + static const int StreamMentionAdvanceViewTimeNotification_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMentionAdvanceViewTimeNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMentionAdvanceViewTimeNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMentionAdvanceViewTimeNotification, view_time_), }; StreamMentionAdvanceViewTimeNotification_reflection_ = @@ -264,77 +256,67 @@ void protobuf_AddDesc_club_5fmembership_5flistener_2eproto() { ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( "\n\036club_membership_listener.proto\022\037bgs.pr" "otocol.club.v1.membership\032\020club_types.pr" - "oto\"\311\001\n\025ClubAddedNotification\0220\n\010agent_i" + "oto\"\226\001\n\025ClubAddedNotification\0220\n\010agent_i" "d\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022" - "9\n\rsubscriber_id\030\002 \001(\0132\".bgs.protocol.ac" - "count.v1.AccountId\022C\n\nmembership\030\003 \001(\0132/" - ".bgs.protocol.club.v1.ClubMembershipDesc" - "ription\"\203\002\n\027ClubRemovedNotification\0220\n\010a" - "gent_id\030\001 \001(\0132\036.bgs.protocol.club.v1.Mem" - "berId\0229\n\rsubscriber_id\030\002 \001(\0132\".bgs.proto" - "col.account.v1.AccountId\0221\n\tmember_id\030\003 " - "\001(\0132\036.bgs.protocol.club.v1.MemberId\022\017\n\007c" - "lub_id\030\004 \001(\004\0227\n\006reason\030\005 \001(\0162\'.bgs.proto" - "col.club.v1.ClubRemovedReason\"\314\001\n#Receiv" - "edInvitationAddedNotification\0220\n\010agent_i" - "d\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022" - "9\n\rsubscriber_id\030\002 \001(\0132\".bgs.protocol.ac" - "count.v1.AccountId\0228\n\ninvitation\030\003 \001(\0132$" - ".bgs.protocol.club.v1.ClubInvitation\"\342\001\n" - "%ReceivedInvitationRemovedNotification\0220" - "\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v1." - "MemberId\0229\n\rsubscriber_id\030\002 \001(\0132\".bgs.pr" - "otocol.account.v1.AccountId\022\025\n\rinvitatio" - "n_id\030\003 \001(\006\0225\n\006reason\030\004 \001(\0162%.bgs.protoco" - "l.InvitationRemovedReason\"\334\001\n!SharedSett" - "ingsChangedNotification\0224\n\010agent_id\030\001 \001(" - "\0132\".bgs.protocol.account.v1.AccountId\0229\n" - "\rsubscriber_id\030\002 \001(\0132\".bgs.protocol.acco" - "unt.v1.AccountId\022F\n\nassignment\030\004 \001(\01322.b" - "gs.protocol.club.v1.ClubSharedSettingsAs" - "signment\"\303\001\n\036StreamMentionAddedNotificat" - "ion\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.clu" - "b.v1.MemberId\0229\n\rsubscriber_id\030\002 \001(\0132\".b" - "gs.protocol.account.v1.AccountId\0224\n\007ment" - "ion\030\003 \001(\0132#.bgs.protocol.club.v1.StreamM" - "ention\"\303\001\n StreamMentionRemovedNotificat" - "ion\0224\n\010agent_id\030\001 \001(\0132\".bgs.protocol.acc" - "ount.v1.AccountId\0229\n\rsubscriber_id\030\002 \001(\013" - "2\".bgs.protocol.account.v1.AccountId\022.\n\n" - "mention_id\030\003 \001(\0132\032.bgs.protocol.TimeSeri" - "esId\"\256\001\n(StreamMentionAdvanceViewTimeNot" - "ification\0224\n\010agent_id\030\001 \001(\0132\".bgs.protoc" - "ol.account.v1.AccountId\0229\n\rsubscriber_id" - "\030\002 \001(\0132\".bgs.protocol.account.v1.Account" - "Id\022\021\n\tview_time\030\003 \001(\0042\316\010\n\026ClubMembership" - "Listener\022h\n\013OnClubAdded\0226.bgs.protocol.c" - "lub.v1.membership.ClubAddedNotification\032" - "\031.bgs.protocol.NO_RESPONSE\"\006\202\371+\002\010\001\022l\n\rOn" - "ClubRemoved\0228.bgs.protocol.club.v1.membe" - "rship.ClubRemovedNotification\032\031.bgs.prot" - "ocol.NO_RESPONSE\"\006\202\371+\002\010\002\022\204\001\n\031OnReceivedI" - "nvitationAdded\022D.bgs.protocol.club.v1.me" - "mbership.ReceivedInvitationAddedNotifica" - "tion\032\031.bgs.protocol.NO_RESPONSE\"\006\202\371+\002\010\003\022" - "\210\001\n\033OnReceivedInvitationRemoved\022F.bgs.pr" - "otocol.club.v1.membership.ReceivedInvita" - "tionRemovedNotification\032\031.bgs.protocol.N" - "O_RESPONSE\"\006\202\371+\002\010\004\022\200\001\n\027OnSharedSettingsC" - "hanged\022B.bgs.protocol.club.v1.membership" - ".SharedSettingsChangedNotification\032\031.bgs" - ".protocol.NO_RESPONSE\"\006\202\371+\002\010\005\022z\n\024OnStrea" - "mMentionAdded\022\?.bgs.protocol.club.v1.mem" - "bership.StreamMentionAddedNotification\032\031" - ".bgs.protocol.NO_RESPONSE\"\006\202\371+\002\010\006\022~\n\026OnS" - "treamMentionRemoved\022A.bgs.protocol.club." - "v1.membership.StreamMentionRemovedNotifi" - "cation\032\031.bgs.protocol.NO_RESPONSE\"\006\202\371+\002\010" - "\007\022\216\001\n\036OnStreamMentionAdvanceViewTime\022I.b" - "gs.protocol.club.v1.membership.StreamMen" - "tionAdvanceViewTimeNotification\032\031.bgs.pr" - "otocol.NO_RESPONSE\"\006\202\371+\002\010\010\032:\202\371+.\n,bnet.p" - "rotocol.club.v1.ClubMembershipListener\212\371" - "+\004\010\001\030\001B\005H\001\200\001\000", 2893); + "C\n\nmembership\030\003 \001(\0132/.bgs.protocol.club." + "v1.ClubMembershipDescription:\006\202\371+\002\030\001\"\320\001\n" + "\027ClubRemovedNotification\0220\n\010agent_id\030\001 \001" + "(\0132\036.bgs.protocol.club.v1.MemberId\0221\n\tme" + "mber_id\030\003 \001(\0132\036.bgs.protocol.club.v1.Mem" + "berId\022\017\n\007club_id\030\004 \001(\004\0227\n\006reason\030\005 \001(\0162\'" + ".bgs.protocol.club.v1.ClubRemovedReason:" + "\006\202\371+\002\030\001\"\231\001\n#ReceivedInvitationAddedNotif" + "ication\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol" + ".club.v1.MemberId\0228\n\ninvitation\030\003 \001(\0132$." + "bgs.protocol.club.v1.ClubInvitation:\006\202\371+" + "\002\030\001\"\257\001\n%ReceivedInvitationRemovedNotific" + "ation\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.c" + "lub.v1.MemberId\022\025\n\rinvitation_id\030\003 \001(\006\0225" + "\n\006reason\030\004 \001(\0162%.bgs.protocol.Invitation" + "RemovedReason:\006\202\371+\002\030\001\"\251\001\n!SharedSettings" + "ChangedNotification\0224\n\010agent_id\030\001 \001(\0132\"." + "bgs.protocol.account.v1.AccountId\022F\n\nass" + "ignment\030\004 \001(\01322.bgs.protocol.club.v1.Clu" + "bSharedSettingsAssignment:\006\202\371+\002\030\001\"\220\001\n\036St" + "reamMentionAddedNotification\0220\n\010agent_id" + "\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\0224" + "\n\007mention\030\003 \001(\0132#.bgs.protocol.club.v1.S" + "treamMention:\006\202\371+\002\030\001\"\220\001\n StreamMentionRe" + "movedNotification\0224\n\010agent_id\030\001 \001(\0132\".bg" + "s.protocol.account.v1.AccountId\022.\n\nmenti" + "on_id\030\003 \001(\0132\032.bgs.protocol.TimeSeriesId:" + "\006\202\371+\002\030\001\"{\n(StreamMentionAdvanceViewTimeN" + "otification\0224\n\010agent_id\030\001 \001(\0132\".bgs.prot" + "ocol.account.v1.AccountId\022\021\n\tview_time\030\003" + " \001(\004:\006\202\371+\002\030\0012\316\010\n\026ClubMembershipListener\022" + "h\n\013OnClubAdded\0226.bgs.protocol.club.v1.me" + "mbership.ClubAddedNotification\032\031.bgs.pro" + "tocol.NO_RESPONSE\"\006\202\371+\002\010\001\022l\n\rOnClubRemov" + "ed\0228.bgs.protocol.club.v1.membership.Clu" + "bRemovedNotification\032\031.bgs.protocol.NO_R" + "ESPONSE\"\006\202\371+\002\010\002\022\204\001\n\031OnReceivedInvitation" + "Added\022D.bgs.protocol.club.v1.membership." + "ReceivedInvitationAddedNotification\032\031.bg" + "s.protocol.NO_RESPONSE\"\006\202\371+\002\010\003\022\210\001\n\033OnRec" + "eivedInvitationRemoved\022F.bgs.protocol.cl" + "ub.v1.membership.ReceivedInvitationRemov" + "edNotification\032\031.bgs.protocol.NO_RESPONS" + "E\"\006\202\371+\002\010\004\022\200\001\n\027OnSharedSettingsChanged\022B." + "bgs.protocol.club.v1.membership.SharedSe" + "ttingsChangedNotification\032\031.bgs.protocol" + ".NO_RESPONSE\"\006\202\371+\002\010\005\022z\n\024OnStreamMentionA" + "dded\022\?.bgs.protocol.club.v1.membership.S" + "treamMentionAddedNotification\032\031.bgs.prot" + "ocol.NO_RESPONSE\"\006\202\371+\002\010\006\022~\n\026OnStreamMent" + "ionRemoved\022A.bgs.protocol.club.v1.member" + "ship.StreamMentionRemovedNotification\032\031." + "bgs.protocol.NO_RESPONSE\"\006\202\371+\002\010\007\022\216\001\n\036OnS" + "treamMentionAdvanceViewTime\022I.bgs.protoc" + "ol.club.v1.membership.StreamMentionAdvan" + "ceViewTimeNotification\032\031.bgs.protocol.NO" + "_RESPONSE\"\006\202\371+\002\010\010\032:\202\371+.\n,bnet.protocol.c" + "lub.v1.ClubMembershipListener\212\371+\004\010\001\030\001B\005H" + "\001\200\001\000", 2484); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "club_membership_listener.proto", &protobuf_RegisterTypes); ClubAddedNotification::default_instance_ = new ClubAddedNotification(); @@ -367,7 +349,6 @@ struct StaticDescriptorInitializer_club_5fmembership_5flistener_2eproto { #ifndef _MSC_VER const int ClubAddedNotification::kAgentIdFieldNumber; -const int ClubAddedNotification::kSubscriberIdFieldNumber; const int ClubAddedNotification::kMembershipFieldNumber; #endif // !_MSC_VER @@ -379,7 +360,6 @@ ClubAddedNotification::ClubAddedNotification() void ClubAddedNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::account::v1::AccountId*>(&::bgs::protocol::account::v1::AccountId::default_instance()); membership_ = const_cast< ::bgs::protocol::club::v1::ClubMembershipDescription*>(&::bgs::protocol::club::v1::ClubMembershipDescription::default_instance()); } @@ -393,7 +373,6 @@ ClubAddedNotification::ClubAddedNotification(const ClubAddedNotification& from) void ClubAddedNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; membership_ = NULL; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -406,7 +385,6 @@ ClubAddedNotification::~ClubAddedNotification() { void ClubAddedNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; delete membership_; } } @@ -433,13 +411,10 @@ ClubAddedNotification* ClubAddedNotification::New() const { } void ClubAddedNotification::Clear() { - if (_has_bits_[0 / 32] & 7) { + if (_has_bits_[0 / 32] & 3) { if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::account::v1::AccountId::Clear(); - } if (has_membership()) { if (membership_ != NULL) membership_->::bgs::protocol::club::v1::ClubMembershipDescription::Clear(); } @@ -466,19 +441,6 @@ bool ClubAddedNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(26)) goto parse_membership; break; } @@ -527,12 +489,6 @@ void ClubAddedNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional .bgs.protocol.club.v1.ClubMembershipDescription membership = 3; if (has_membership()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( @@ -556,13 +512,6 @@ void ClubAddedNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional .bgs.protocol.club.v1.ClubMembershipDescription membership = 3; if (has_membership()) { target = ::google::protobuf::internal::WireFormatLite:: @@ -589,13 +538,6 @@ int ClubAddedNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional .bgs.protocol.club.v1.ClubMembershipDescription membership = 3; if (has_membership()) { total_size += 1 + @@ -633,9 +575,6 @@ void ClubAddedNotification::MergeFrom(const ClubAddedNotification& from) { if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::account::v1::AccountId::MergeFrom(from.subscriber_id()); - } if (from.has_membership()) { mutable_membership()->::bgs::protocol::club::v1::ClubMembershipDescription::MergeFrom(from.membership()); } @@ -660,9 +599,6 @@ bool ClubAddedNotification::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } if (has_membership()) { if (!this->membership().IsInitialized()) return false; } @@ -672,7 +608,6 @@ bool ClubAddedNotification::IsInitialized() const { void ClubAddedNotification::Swap(ClubAddedNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(membership_, other->membership_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); @@ -693,7 +628,6 @@ void ClubAddedNotification::Swap(ClubAddedNotification* other) { #ifndef _MSC_VER const int ClubRemovedNotification::kAgentIdFieldNumber; -const int ClubRemovedNotification::kSubscriberIdFieldNumber; const int ClubRemovedNotification::kMemberIdFieldNumber; const int ClubRemovedNotification::kClubIdFieldNumber; const int ClubRemovedNotification::kReasonFieldNumber; @@ -707,7 +641,6 @@ ClubRemovedNotification::ClubRemovedNotification() void ClubRemovedNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::account::v1::AccountId*>(&::bgs::protocol::account::v1::AccountId::default_instance()); member_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); } @@ -721,7 +654,6 @@ ClubRemovedNotification::ClubRemovedNotification(const ClubRemovedNotification& void ClubRemovedNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; member_id_ = NULL; club_id_ = GOOGLE_ULONGLONG(0); reason_ = 0; @@ -736,7 +668,6 @@ ClubRemovedNotification::~ClubRemovedNotification() { void ClubRemovedNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; delete member_id_; } } @@ -773,14 +704,11 @@ void ClubRemovedNotification::Clear() { ::memset(&first, 0, n); \ } while (0) - if (_has_bits_[0 / 32] & 31) { + if (_has_bits_[0 / 32] & 15) { ZR_(club_id_, reason_); if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::account::v1::AccountId::Clear(); - } if (has_member_id()) { if (member_id_ != NULL) member_id_->::bgs::protocol::club::v1::MemberId::Clear(); } @@ -811,19 +739,6 @@ bool ClubRemovedNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(26)) goto parse_member_id; break; } @@ -907,12 +822,6 @@ void ClubRemovedNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional .bgs.protocol.club.v1.MemberId member_id = 3; if (has_member_id()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( @@ -947,13 +856,6 @@ void ClubRemovedNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional .bgs.protocol.club.v1.MemberId member_id = 3; if (has_member_id()) { target = ::google::protobuf::internal::WireFormatLite:: @@ -991,13 +893,6 @@ int ClubRemovedNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional .bgs.protocol.club.v1.MemberId member_id = 3; if (has_member_id()) { total_size += 1 + @@ -1048,9 +943,6 @@ void ClubRemovedNotification::MergeFrom(const ClubRemovedNotification& from) { if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::account::v1::AccountId::MergeFrom(from.subscriber_id()); - } if (from.has_member_id()) { mutable_member_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.member_id()); } @@ -1081,9 +973,6 @@ bool ClubRemovedNotification::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } if (has_member_id()) { if (!this->member_id().IsInitialized()) return false; } @@ -1093,7 +982,6 @@ bool ClubRemovedNotification::IsInitialized() const { void ClubRemovedNotification::Swap(ClubRemovedNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(member_id_, other->member_id_); std::swap(club_id_, other->club_id_); std::swap(reason_, other->reason_); @@ -1116,7 +1004,6 @@ void ClubRemovedNotification::Swap(ClubRemovedNotification* other) { #ifndef _MSC_VER const int ReceivedInvitationAddedNotification::kAgentIdFieldNumber; -const int ReceivedInvitationAddedNotification::kSubscriberIdFieldNumber; const int ReceivedInvitationAddedNotification::kInvitationFieldNumber; #endif // !_MSC_VER @@ -1128,7 +1015,6 @@ ReceivedInvitationAddedNotification::ReceivedInvitationAddedNotification() void ReceivedInvitationAddedNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::account::v1::AccountId*>(&::bgs::protocol::account::v1::AccountId::default_instance()); invitation_ = const_cast< ::bgs::protocol::club::v1::ClubInvitation*>(&::bgs::protocol::club::v1::ClubInvitation::default_instance()); } @@ -1142,7 +1028,6 @@ ReceivedInvitationAddedNotification::ReceivedInvitationAddedNotification(const R void ReceivedInvitationAddedNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; invitation_ = NULL; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -1155,7 +1040,6 @@ ReceivedInvitationAddedNotification::~ReceivedInvitationAddedNotification() { void ReceivedInvitationAddedNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; delete invitation_; } } @@ -1182,13 +1066,10 @@ ReceivedInvitationAddedNotification* ReceivedInvitationAddedNotification::New() } void ReceivedInvitationAddedNotification::Clear() { - if (_has_bits_[0 / 32] & 7) { + if (_has_bits_[0 / 32] & 3) { if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::account::v1::AccountId::Clear(); - } if (has_invitation()) { if (invitation_ != NULL) invitation_->::bgs::protocol::club::v1::ClubInvitation::Clear(); } @@ -1215,19 +1096,6 @@ bool ReceivedInvitationAddedNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(26)) goto parse_invitation; break; } @@ -1276,12 +1144,6 @@ void ReceivedInvitationAddedNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional .bgs.protocol.club.v1.ClubInvitation invitation = 3; if (has_invitation()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( @@ -1305,13 +1167,6 @@ void ReceivedInvitationAddedNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional .bgs.protocol.club.v1.ClubInvitation invitation = 3; if (has_invitation()) { target = ::google::protobuf::internal::WireFormatLite:: @@ -1338,13 +1193,6 @@ int ReceivedInvitationAddedNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional .bgs.protocol.club.v1.ClubInvitation invitation = 3; if (has_invitation()) { total_size += 1 + @@ -1382,9 +1230,6 @@ void ReceivedInvitationAddedNotification::MergeFrom(const ReceivedInvitationAdde if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::account::v1::AccountId::MergeFrom(from.subscriber_id()); - } if (from.has_invitation()) { mutable_invitation()->::bgs::protocol::club::v1::ClubInvitation::MergeFrom(from.invitation()); } @@ -1409,9 +1254,6 @@ bool ReceivedInvitationAddedNotification::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } if (has_invitation()) { if (!this->invitation().IsInitialized()) return false; } @@ -1421,7 +1263,6 @@ bool ReceivedInvitationAddedNotification::IsInitialized() const { void ReceivedInvitationAddedNotification::Swap(ReceivedInvitationAddedNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(invitation_, other->invitation_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); @@ -1442,7 +1283,6 @@ void ReceivedInvitationAddedNotification::Swap(ReceivedInvitationAddedNotificati #ifndef _MSC_VER const int ReceivedInvitationRemovedNotification::kAgentIdFieldNumber; -const int ReceivedInvitationRemovedNotification::kSubscriberIdFieldNumber; const int ReceivedInvitationRemovedNotification::kInvitationIdFieldNumber; const int ReceivedInvitationRemovedNotification::kReasonFieldNumber; #endif // !_MSC_VER @@ -1455,7 +1295,6 @@ ReceivedInvitationRemovedNotification::ReceivedInvitationRemovedNotification() void ReceivedInvitationRemovedNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::account::v1::AccountId*>(&::bgs::protocol::account::v1::AccountId::default_instance()); } ReceivedInvitationRemovedNotification::ReceivedInvitationRemovedNotification(const ReceivedInvitationRemovedNotification& from) @@ -1468,7 +1307,6 @@ ReceivedInvitationRemovedNotification::ReceivedInvitationRemovedNotification(con void ReceivedInvitationRemovedNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; invitation_id_ = GOOGLE_ULONGLONG(0); reason_ = 0; ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -1482,7 +1320,6 @@ ReceivedInvitationRemovedNotification::~ReceivedInvitationRemovedNotification() void ReceivedInvitationRemovedNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; } } @@ -1518,14 +1355,11 @@ void ReceivedInvitationRemovedNotification::Clear() { ::memset(&first, 0, n); \ } while (0) - if (_has_bits_[0 / 32] & 15) { + if (_has_bits_[0 / 32] & 7) { ZR_(invitation_id_, reason_); if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::account::v1::AccountId::Clear(); - } } #undef OFFSET_OF_FIELD_ @@ -1553,19 +1387,6 @@ bool ReceivedInvitationRemovedNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(25)) goto parse_invitation_id; break; } @@ -1636,12 +1457,6 @@ void ReceivedInvitationRemovedNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional fixed64 invitation_id = 3; if (has_invitation_id()) { ::google::protobuf::internal::WireFormatLite::WriteFixed64(3, this->invitation_id(), output); @@ -1670,13 +1485,6 @@ void ReceivedInvitationRemovedNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional fixed64 invitation_id = 3; if (has_invitation_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteFixed64ToArray(3, this->invitation_id(), target); @@ -1707,13 +1515,6 @@ int ReceivedInvitationRemovedNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional fixed64 invitation_id = 3; if (has_invitation_id()) { total_size += 1 + 8; @@ -1755,9 +1556,6 @@ void ReceivedInvitationRemovedNotification::MergeFrom(const ReceivedInvitationRe if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::account::v1::AccountId::MergeFrom(from.subscriber_id()); - } if (from.has_invitation_id()) { set_invitation_id(from.invitation_id()); } @@ -1785,16 +1583,12 @@ bool ReceivedInvitationRemovedNotification::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } return true; } void ReceivedInvitationRemovedNotification::Swap(ReceivedInvitationRemovedNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(invitation_id_, other->invitation_id_); std::swap(reason_, other->reason_); std::swap(_has_bits_[0], other->_has_bits_[0]); @@ -1816,7 +1610,6 @@ void ReceivedInvitationRemovedNotification::Swap(ReceivedInvitationRemovedNotifi #ifndef _MSC_VER const int SharedSettingsChangedNotification::kAgentIdFieldNumber; -const int SharedSettingsChangedNotification::kSubscriberIdFieldNumber; const int SharedSettingsChangedNotification::kAssignmentFieldNumber; #endif // !_MSC_VER @@ -1828,7 +1621,6 @@ SharedSettingsChangedNotification::SharedSettingsChangedNotification() void SharedSettingsChangedNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::account::v1::AccountId*>(&::bgs::protocol::account::v1::AccountId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::account::v1::AccountId*>(&::bgs::protocol::account::v1::AccountId::default_instance()); assignment_ = const_cast< ::bgs::protocol::club::v1::ClubSharedSettingsAssignment*>(&::bgs::protocol::club::v1::ClubSharedSettingsAssignment::default_instance()); } @@ -1842,7 +1634,6 @@ SharedSettingsChangedNotification::SharedSettingsChangedNotification(const Share void SharedSettingsChangedNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; assignment_ = NULL; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -1855,7 +1646,6 @@ SharedSettingsChangedNotification::~SharedSettingsChangedNotification() { void SharedSettingsChangedNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; delete assignment_; } } @@ -1882,13 +1672,10 @@ SharedSettingsChangedNotification* SharedSettingsChangedNotification::New() cons } void SharedSettingsChangedNotification::Clear() { - if (_has_bits_[0 / 32] & 7) { + if (_has_bits_[0 / 32] & 3) { if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::account::v1::AccountId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::account::v1::AccountId::Clear(); - } if (has_assignment()) { if (assignment_ != NULL) assignment_->::bgs::protocol::club::v1::ClubSharedSettingsAssignment::Clear(); } @@ -1915,19 +1702,6 @@ bool SharedSettingsChangedNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(34)) goto parse_assignment; break; } @@ -1976,12 +1750,6 @@ void SharedSettingsChangedNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional .bgs.protocol.club.v1.ClubSharedSettingsAssignment assignment = 4; if (has_assignment()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( @@ -2005,13 +1773,6 @@ void SharedSettingsChangedNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional .bgs.protocol.club.v1.ClubSharedSettingsAssignment assignment = 4; if (has_assignment()) { target = ::google::protobuf::internal::WireFormatLite:: @@ -2038,13 +1799,6 @@ int SharedSettingsChangedNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional .bgs.protocol.club.v1.ClubSharedSettingsAssignment assignment = 4; if (has_assignment()) { total_size += 1 + @@ -2082,9 +1836,6 @@ void SharedSettingsChangedNotification::MergeFrom(const SharedSettingsChangedNot if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::account::v1::AccountId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::account::v1::AccountId::MergeFrom(from.subscriber_id()); - } if (from.has_assignment()) { mutable_assignment()->::bgs::protocol::club::v1::ClubSharedSettingsAssignment::MergeFrom(from.assignment()); } @@ -2109,16 +1860,12 @@ bool SharedSettingsChangedNotification::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } return true; } void SharedSettingsChangedNotification::Swap(SharedSettingsChangedNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(assignment_, other->assignment_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); @@ -2139,7 +1886,6 @@ void SharedSettingsChangedNotification::Swap(SharedSettingsChangedNotification* #ifndef _MSC_VER const int StreamMentionAddedNotification::kAgentIdFieldNumber; -const int StreamMentionAddedNotification::kSubscriberIdFieldNumber; const int StreamMentionAddedNotification::kMentionFieldNumber; #endif // !_MSC_VER @@ -2151,7 +1897,6 @@ StreamMentionAddedNotification::StreamMentionAddedNotification() void StreamMentionAddedNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::account::v1::AccountId*>(&::bgs::protocol::account::v1::AccountId::default_instance()); mention_ = const_cast< ::bgs::protocol::club::v1::StreamMention*>(&::bgs::protocol::club::v1::StreamMention::default_instance()); } @@ -2165,7 +1910,6 @@ StreamMentionAddedNotification::StreamMentionAddedNotification(const StreamMenti void StreamMentionAddedNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; mention_ = NULL; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -2178,7 +1922,6 @@ StreamMentionAddedNotification::~StreamMentionAddedNotification() { void StreamMentionAddedNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; delete mention_; } } @@ -2205,13 +1948,10 @@ StreamMentionAddedNotification* StreamMentionAddedNotification::New() const { } void StreamMentionAddedNotification::Clear() { - if (_has_bits_[0 / 32] & 7) { + if (_has_bits_[0 / 32] & 3) { if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::account::v1::AccountId::Clear(); - } if (has_mention()) { if (mention_ != NULL) mention_->::bgs::protocol::club::v1::StreamMention::Clear(); } @@ -2238,19 +1978,6 @@ bool StreamMentionAddedNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(26)) goto parse_mention; break; } @@ -2299,12 +2026,6 @@ void StreamMentionAddedNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional .bgs.protocol.club.v1.StreamMention mention = 3; if (has_mention()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( @@ -2328,13 +2049,6 @@ void StreamMentionAddedNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional .bgs.protocol.club.v1.StreamMention mention = 3; if (has_mention()) { target = ::google::protobuf::internal::WireFormatLite:: @@ -2361,13 +2075,6 @@ int StreamMentionAddedNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional .bgs.protocol.club.v1.StreamMention mention = 3; if (has_mention()) { total_size += 1 + @@ -2405,9 +2112,6 @@ void StreamMentionAddedNotification::MergeFrom(const StreamMentionAddedNotificat if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::account::v1::AccountId::MergeFrom(from.subscriber_id()); - } if (from.has_mention()) { mutable_mention()->::bgs::protocol::club::v1::StreamMention::MergeFrom(from.mention()); } @@ -2432,9 +2136,6 @@ bool StreamMentionAddedNotification::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } if (has_mention()) { if (!this->mention().IsInitialized()) return false; } @@ -2444,7 +2145,6 @@ bool StreamMentionAddedNotification::IsInitialized() const { void StreamMentionAddedNotification::Swap(StreamMentionAddedNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(mention_, other->mention_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); @@ -2465,7 +2165,6 @@ void StreamMentionAddedNotification::Swap(StreamMentionAddedNotification* other) #ifndef _MSC_VER const int StreamMentionRemovedNotification::kAgentIdFieldNumber; -const int StreamMentionRemovedNotification::kSubscriberIdFieldNumber; const int StreamMentionRemovedNotification::kMentionIdFieldNumber; #endif // !_MSC_VER @@ -2477,7 +2176,6 @@ StreamMentionRemovedNotification::StreamMentionRemovedNotification() void StreamMentionRemovedNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::account::v1::AccountId*>(&::bgs::protocol::account::v1::AccountId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::account::v1::AccountId*>(&::bgs::protocol::account::v1::AccountId::default_instance()); mention_id_ = const_cast< ::bgs::protocol::TimeSeriesId*>(&::bgs::protocol::TimeSeriesId::default_instance()); } @@ -2491,7 +2189,6 @@ StreamMentionRemovedNotification::StreamMentionRemovedNotification(const StreamM void StreamMentionRemovedNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; mention_id_ = NULL; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -2504,7 +2201,6 @@ StreamMentionRemovedNotification::~StreamMentionRemovedNotification() { void StreamMentionRemovedNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; delete mention_id_; } } @@ -2531,13 +2227,10 @@ StreamMentionRemovedNotification* StreamMentionRemovedNotification::New() const } void StreamMentionRemovedNotification::Clear() { - if (_has_bits_[0 / 32] & 7) { + if (_has_bits_[0 / 32] & 3) { if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::account::v1::AccountId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::account::v1::AccountId::Clear(); - } if (has_mention_id()) { if (mention_id_ != NULL) mention_id_->::bgs::protocol::TimeSeriesId::Clear(); } @@ -2564,19 +2257,6 @@ bool StreamMentionRemovedNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(26)) goto parse_mention_id; break; } @@ -2625,12 +2305,6 @@ void StreamMentionRemovedNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional .bgs.protocol.TimeSeriesId mention_id = 3; if (has_mention_id()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( @@ -2654,13 +2328,6 @@ void StreamMentionRemovedNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional .bgs.protocol.TimeSeriesId mention_id = 3; if (has_mention_id()) { target = ::google::protobuf::internal::WireFormatLite:: @@ -2687,13 +2354,6 @@ int StreamMentionRemovedNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional .bgs.protocol.TimeSeriesId mention_id = 3; if (has_mention_id()) { total_size += 1 + @@ -2731,9 +2391,6 @@ void StreamMentionRemovedNotification::MergeFrom(const StreamMentionRemovedNotif if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::account::v1::AccountId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::account::v1::AccountId::MergeFrom(from.subscriber_id()); - } if (from.has_mention_id()) { mutable_mention_id()->::bgs::protocol::TimeSeriesId::MergeFrom(from.mention_id()); } @@ -2758,16 +2415,12 @@ bool StreamMentionRemovedNotification::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } return true; } void StreamMentionRemovedNotification::Swap(StreamMentionRemovedNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(mention_id_, other->mention_id_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); @@ -2788,7 +2441,6 @@ void StreamMentionRemovedNotification::Swap(StreamMentionRemovedNotification* ot #ifndef _MSC_VER const int StreamMentionAdvanceViewTimeNotification::kAgentIdFieldNumber; -const int StreamMentionAdvanceViewTimeNotification::kSubscriberIdFieldNumber; const int StreamMentionAdvanceViewTimeNotification::kViewTimeFieldNumber; #endif // !_MSC_VER @@ -2800,7 +2452,6 @@ StreamMentionAdvanceViewTimeNotification::StreamMentionAdvanceViewTimeNotificati void StreamMentionAdvanceViewTimeNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::account::v1::AccountId*>(&::bgs::protocol::account::v1::AccountId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::account::v1::AccountId*>(&::bgs::protocol::account::v1::AccountId::default_instance()); } StreamMentionAdvanceViewTimeNotification::StreamMentionAdvanceViewTimeNotification(const StreamMentionAdvanceViewTimeNotification& from) @@ -2813,7 +2464,6 @@ StreamMentionAdvanceViewTimeNotification::StreamMentionAdvanceViewTimeNotificati void StreamMentionAdvanceViewTimeNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; view_time_ = GOOGLE_ULONGLONG(0); ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -2826,7 +2476,6 @@ StreamMentionAdvanceViewTimeNotification::~StreamMentionAdvanceViewTimeNotificat void StreamMentionAdvanceViewTimeNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; } } @@ -2852,13 +2501,10 @@ StreamMentionAdvanceViewTimeNotification* StreamMentionAdvanceViewTimeNotificati } void StreamMentionAdvanceViewTimeNotification::Clear() { - if (_has_bits_[0 / 32] & 7) { + if (_has_bits_[0 / 32] & 3) { if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::account::v1::AccountId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::account::v1::AccountId::Clear(); - } view_time_ = GOOGLE_ULONGLONG(0); } ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -2883,19 +2529,6 @@ bool StreamMentionAdvanceViewTimeNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(24)) goto parse_view_time; break; } @@ -2946,12 +2579,6 @@ void StreamMentionAdvanceViewTimeNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional uint64 view_time = 3; if (has_view_time()) { ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->view_time(), output); @@ -2974,13 +2601,6 @@ void StreamMentionAdvanceViewTimeNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional uint64 view_time = 3; if (has_view_time()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->view_time(), target); @@ -3005,13 +2625,6 @@ int StreamMentionAdvanceViewTimeNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional uint64 view_time = 3; if (has_view_time()) { total_size += 1 + @@ -3049,9 +2662,6 @@ void StreamMentionAdvanceViewTimeNotification::MergeFrom(const StreamMentionAdva if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::account::v1::AccountId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::account::v1::AccountId::MergeFrom(from.subscriber_id()); - } if (from.has_view_time()) { set_view_time(from.view_time()); } @@ -3076,16 +2686,12 @@ bool StreamMentionAdvanceViewTimeNotification::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } return true; } void StreamMentionAdvanceViewTimeNotification::Swap(StreamMentionAdvanceViewTimeNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(view_time_, other->view_time_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); diff --git a/src/server/proto/Client/club_membership_listener.pb.h b/src/server/proto/Client/club_membership_listener.pb.h index 65278a54e26..25a60e35a6c 100644 --- a/src/server/proto/Client/club_membership_listener.pb.h +++ b/src/server/proto/Client/club_membership_listener.pb.h @@ -115,15 +115,6 @@ class TC_PROTO_API ClubAddedNotification : public ::google::protobuf::Message { inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::account::v1::AccountId& subscriber_id() const; - inline ::bgs::protocol::account::v1::AccountId* mutable_subscriber_id(); - inline ::bgs::protocol::account::v1::AccountId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::account::v1::AccountId* subscriber_id); - // optional .bgs.protocol.club.v1.ClubMembershipDescription membership = 3; inline bool has_membership() const; inline void clear_membership(); @@ -137,8 +128,6 @@ class TC_PROTO_API ClubAddedNotification : public ::google::protobuf::Message { private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_membership(); inline void clear_has_membership(); @@ -147,7 +136,6 @@ class TC_PROTO_API ClubAddedNotification : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::club::v1::MemberId* agent_id_; - ::bgs::protocol::account::v1::AccountId* subscriber_id_; ::bgs::protocol::club::v1::ClubMembershipDescription* membership_; friend void TC_PROTO_API protobuf_AddDesc_club_5fmembership_5flistener_2eproto(); friend void protobuf_AssignDesc_club_5fmembership_5flistener_2eproto(); @@ -220,15 +208,6 @@ class TC_PROTO_API ClubRemovedNotification : public ::google::protobuf::Message inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::account::v1::AccountId& subscriber_id() const; - inline ::bgs::protocol::account::v1::AccountId* mutable_subscriber_id(); - inline ::bgs::protocol::account::v1::AccountId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::account::v1::AccountId* subscriber_id); - // optional .bgs.protocol.club.v1.MemberId member_id = 3; inline bool has_member_id() const; inline void clear_member_id(); @@ -256,8 +235,6 @@ class TC_PROTO_API ClubRemovedNotification : public ::google::protobuf::Message private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_member_id(); inline void clear_has_member_id(); inline void set_has_club_id(); @@ -270,7 +247,6 @@ class TC_PROTO_API ClubRemovedNotification : public ::google::protobuf::Message ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::club::v1::MemberId* agent_id_; - ::bgs::protocol::account::v1::AccountId* subscriber_id_; ::bgs::protocol::club::v1::MemberId* member_id_; ::google::protobuf::uint64 club_id_; int reason_; @@ -345,15 +321,6 @@ class TC_PROTO_API ReceivedInvitationAddedNotification : public ::google::protob inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::account::v1::AccountId& subscriber_id() const; - inline ::bgs::protocol::account::v1::AccountId* mutable_subscriber_id(); - inline ::bgs::protocol::account::v1::AccountId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::account::v1::AccountId* subscriber_id); - // optional .bgs.protocol.club.v1.ClubInvitation invitation = 3; inline bool has_invitation() const; inline void clear_invitation(); @@ -367,8 +334,6 @@ class TC_PROTO_API ReceivedInvitationAddedNotification : public ::google::protob private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_invitation(); inline void clear_has_invitation(); @@ -377,7 +342,6 @@ class TC_PROTO_API ReceivedInvitationAddedNotification : public ::google::protob ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::club::v1::MemberId* agent_id_; - ::bgs::protocol::account::v1::AccountId* subscriber_id_; ::bgs::protocol::club::v1::ClubInvitation* invitation_; friend void TC_PROTO_API protobuf_AddDesc_club_5fmembership_5flistener_2eproto(); friend void protobuf_AssignDesc_club_5fmembership_5flistener_2eproto(); @@ -450,15 +414,6 @@ class TC_PROTO_API ReceivedInvitationRemovedNotification : public ::google::prot inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::account::v1::AccountId& subscriber_id() const; - inline ::bgs::protocol::account::v1::AccountId* mutable_subscriber_id(); - inline ::bgs::protocol::account::v1::AccountId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::account::v1::AccountId* subscriber_id); - // optional fixed64 invitation_id = 3; inline bool has_invitation_id() const; inline void clear_invitation_id(); @@ -477,8 +432,6 @@ class TC_PROTO_API ReceivedInvitationRemovedNotification : public ::google::prot private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_invitation_id(); inline void clear_has_invitation_id(); inline void set_has_reason(); @@ -489,7 +442,6 @@ class TC_PROTO_API ReceivedInvitationRemovedNotification : public ::google::prot ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::club::v1::MemberId* agent_id_; - ::bgs::protocol::account::v1::AccountId* subscriber_id_; ::google::protobuf::uint64 invitation_id_; int reason_; friend void TC_PROTO_API protobuf_AddDesc_club_5fmembership_5flistener_2eproto(); @@ -563,15 +515,6 @@ class TC_PROTO_API SharedSettingsChangedNotification : public ::google::protobuf inline ::bgs::protocol::account::v1::AccountId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::account::v1::AccountId* agent_id); - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::account::v1::AccountId& subscriber_id() const; - inline ::bgs::protocol::account::v1::AccountId* mutable_subscriber_id(); - inline ::bgs::protocol::account::v1::AccountId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::account::v1::AccountId* subscriber_id); - // optional .bgs.protocol.club.v1.ClubSharedSettingsAssignment assignment = 4; inline bool has_assignment() const; inline void clear_assignment(); @@ -585,8 +528,6 @@ class TC_PROTO_API SharedSettingsChangedNotification : public ::google::protobuf private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_assignment(); inline void clear_has_assignment(); @@ -595,7 +536,6 @@ class TC_PROTO_API SharedSettingsChangedNotification : public ::google::protobuf ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::account::v1::AccountId* agent_id_; - ::bgs::protocol::account::v1::AccountId* subscriber_id_; ::bgs::protocol::club::v1::ClubSharedSettingsAssignment* assignment_; friend void TC_PROTO_API protobuf_AddDesc_club_5fmembership_5flistener_2eproto(); friend void protobuf_AssignDesc_club_5fmembership_5flistener_2eproto(); @@ -668,15 +608,6 @@ class TC_PROTO_API StreamMentionAddedNotification : public ::google::protobuf::M inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::account::v1::AccountId& subscriber_id() const; - inline ::bgs::protocol::account::v1::AccountId* mutable_subscriber_id(); - inline ::bgs::protocol::account::v1::AccountId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::account::v1::AccountId* subscriber_id); - // optional .bgs.protocol.club.v1.StreamMention mention = 3; inline bool has_mention() const; inline void clear_mention(); @@ -690,8 +621,6 @@ class TC_PROTO_API StreamMentionAddedNotification : public ::google::protobuf::M private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_mention(); inline void clear_has_mention(); @@ -700,7 +629,6 @@ class TC_PROTO_API StreamMentionAddedNotification : public ::google::protobuf::M ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::club::v1::MemberId* agent_id_; - ::bgs::protocol::account::v1::AccountId* subscriber_id_; ::bgs::protocol::club::v1::StreamMention* mention_; friend void TC_PROTO_API protobuf_AddDesc_club_5fmembership_5flistener_2eproto(); friend void protobuf_AssignDesc_club_5fmembership_5flistener_2eproto(); @@ -773,15 +701,6 @@ class TC_PROTO_API StreamMentionRemovedNotification : public ::google::protobuf: inline ::bgs::protocol::account::v1::AccountId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::account::v1::AccountId* agent_id); - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::account::v1::AccountId& subscriber_id() const; - inline ::bgs::protocol::account::v1::AccountId* mutable_subscriber_id(); - inline ::bgs::protocol::account::v1::AccountId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::account::v1::AccountId* subscriber_id); - // optional .bgs.protocol.TimeSeriesId mention_id = 3; inline bool has_mention_id() const; inline void clear_mention_id(); @@ -795,8 +714,6 @@ class TC_PROTO_API StreamMentionRemovedNotification : public ::google::protobuf: private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_mention_id(); inline void clear_has_mention_id(); @@ -805,7 +722,6 @@ class TC_PROTO_API StreamMentionRemovedNotification : public ::google::protobuf: ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::account::v1::AccountId* agent_id_; - ::bgs::protocol::account::v1::AccountId* subscriber_id_; ::bgs::protocol::TimeSeriesId* mention_id_; friend void TC_PROTO_API protobuf_AddDesc_club_5fmembership_5flistener_2eproto(); friend void protobuf_AssignDesc_club_5fmembership_5flistener_2eproto(); @@ -878,15 +794,6 @@ class TC_PROTO_API StreamMentionAdvanceViewTimeNotification : public ::google::p inline ::bgs::protocol::account::v1::AccountId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::account::v1::AccountId* agent_id); - // optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::account::v1::AccountId& subscriber_id() const; - inline ::bgs::protocol::account::v1::AccountId* mutable_subscriber_id(); - inline ::bgs::protocol::account::v1::AccountId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::account::v1::AccountId* subscriber_id); - // optional uint64 view_time = 3; inline bool has_view_time() const; inline void clear_view_time(); @@ -898,8 +805,6 @@ class TC_PROTO_API StreamMentionAdvanceViewTimeNotification : public ::google::p private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_view_time(); inline void clear_has_view_time(); @@ -908,7 +813,6 @@ class TC_PROTO_API StreamMentionAdvanceViewTimeNotification : public ::google::p ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::account::v1::AccountId* agent_id_; - ::bgs::protocol::account::v1::AccountId* subscriber_id_; ::google::protobuf::uint64 view_time_; friend void TC_PROTO_API protobuf_AddDesc_club_5fmembership_5flistener_2eproto(); friend void protobuf_AssignDesc_club_5fmembership_5flistener_2eproto(); @@ -1009,56 +913,15 @@ inline void ClubAddedNotification::set_allocated_agent_id(::bgs::protocol::club: // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.membership.ClubAddedNotification.agent_id) } -// optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; -inline bool ClubAddedNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void ClubAddedNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void ClubAddedNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void ClubAddedNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::account::v1::AccountId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::account::v1::AccountId& ClubAddedNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.membership.ClubAddedNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::account::v1::AccountId* ClubAddedNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::account::v1::AccountId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.membership.ClubAddedNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::account::v1::AccountId* ClubAddedNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::account::v1::AccountId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void ClubAddedNotification::set_allocated_subscriber_id(::bgs::protocol::account::v1::AccountId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.membership.ClubAddedNotification.subscriber_id) -} - // optional .bgs.protocol.club.v1.ClubMembershipDescription membership = 3; inline bool ClubAddedNotification::has_membership() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } inline void ClubAddedNotification::set_has_membership() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } inline void ClubAddedNotification::clear_has_membership() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } inline void ClubAddedNotification::clear_membership() { if (membership_ != NULL) membership_->::bgs::protocol::club::v1::ClubMembershipDescription::Clear(); @@ -1136,56 +999,15 @@ inline void ClubRemovedNotification::set_allocated_agent_id(::bgs::protocol::clu // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.membership.ClubRemovedNotification.agent_id) } -// optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; -inline bool ClubRemovedNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void ClubRemovedNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void ClubRemovedNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void ClubRemovedNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::account::v1::AccountId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::account::v1::AccountId& ClubRemovedNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.membership.ClubRemovedNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::account::v1::AccountId* ClubRemovedNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::account::v1::AccountId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.membership.ClubRemovedNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::account::v1::AccountId* ClubRemovedNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::account::v1::AccountId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void ClubRemovedNotification::set_allocated_subscriber_id(::bgs::protocol::account::v1::AccountId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.membership.ClubRemovedNotification.subscriber_id) -} - // optional .bgs.protocol.club.v1.MemberId member_id = 3; inline bool ClubRemovedNotification::has_member_id() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } inline void ClubRemovedNotification::set_has_member_id() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } inline void ClubRemovedNotification::clear_has_member_id() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } inline void ClubRemovedNotification::clear_member_id() { if (member_id_ != NULL) member_id_->::bgs::protocol::club::v1::MemberId::Clear(); @@ -1220,13 +1042,13 @@ inline void ClubRemovedNotification::set_allocated_member_id(::bgs::protocol::cl // optional uint64 club_id = 4; inline bool ClubRemovedNotification::has_club_id() const { - return (_has_bits_[0] & 0x00000008u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } inline void ClubRemovedNotification::set_has_club_id() { - _has_bits_[0] |= 0x00000008u; + _has_bits_[0] |= 0x00000004u; } inline void ClubRemovedNotification::clear_has_club_id() { - _has_bits_[0] &= ~0x00000008u; + _has_bits_[0] &= ~0x00000004u; } inline void ClubRemovedNotification::clear_club_id() { club_id_ = GOOGLE_ULONGLONG(0); @@ -1244,13 +1066,13 @@ inline void ClubRemovedNotification::set_club_id(::google::protobuf::uint64 valu // optional .bgs.protocol.club.v1.ClubRemovedReason reason = 5; inline bool ClubRemovedNotification::has_reason() const { - return (_has_bits_[0] & 0x00000010u) != 0; + return (_has_bits_[0] & 0x00000008u) != 0; } inline void ClubRemovedNotification::set_has_reason() { - _has_bits_[0] |= 0x00000010u; + _has_bits_[0] |= 0x00000008u; } inline void ClubRemovedNotification::clear_has_reason() { - _has_bits_[0] &= ~0x00000010u; + _has_bits_[0] &= ~0x00000008u; } inline void ClubRemovedNotification::clear_reason() { reason_ = 0; @@ -1312,56 +1134,15 @@ inline void ReceivedInvitationAddedNotification::set_allocated_agent_id(::bgs::p // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.membership.ReceivedInvitationAddedNotification.agent_id) } -// optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; -inline bool ReceivedInvitationAddedNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void ReceivedInvitationAddedNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void ReceivedInvitationAddedNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void ReceivedInvitationAddedNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::account::v1::AccountId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::account::v1::AccountId& ReceivedInvitationAddedNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.membership.ReceivedInvitationAddedNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::account::v1::AccountId* ReceivedInvitationAddedNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::account::v1::AccountId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.membership.ReceivedInvitationAddedNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::account::v1::AccountId* ReceivedInvitationAddedNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::account::v1::AccountId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void ReceivedInvitationAddedNotification::set_allocated_subscriber_id(::bgs::protocol::account::v1::AccountId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.membership.ReceivedInvitationAddedNotification.subscriber_id) -} - // optional .bgs.protocol.club.v1.ClubInvitation invitation = 3; inline bool ReceivedInvitationAddedNotification::has_invitation() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } inline void ReceivedInvitationAddedNotification::set_has_invitation() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } inline void ReceivedInvitationAddedNotification::clear_has_invitation() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } inline void ReceivedInvitationAddedNotification::clear_invitation() { if (invitation_ != NULL) invitation_->::bgs::protocol::club::v1::ClubInvitation::Clear(); @@ -1439,56 +1220,15 @@ inline void ReceivedInvitationRemovedNotification::set_allocated_agent_id(::bgs: // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.membership.ReceivedInvitationRemovedNotification.agent_id) } -// optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; -inline bool ReceivedInvitationRemovedNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void ReceivedInvitationRemovedNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void ReceivedInvitationRemovedNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void ReceivedInvitationRemovedNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::account::v1::AccountId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::account::v1::AccountId& ReceivedInvitationRemovedNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.membership.ReceivedInvitationRemovedNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::account::v1::AccountId* ReceivedInvitationRemovedNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::account::v1::AccountId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.membership.ReceivedInvitationRemovedNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::account::v1::AccountId* ReceivedInvitationRemovedNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::account::v1::AccountId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void ReceivedInvitationRemovedNotification::set_allocated_subscriber_id(::bgs::protocol::account::v1::AccountId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.membership.ReceivedInvitationRemovedNotification.subscriber_id) -} - // optional fixed64 invitation_id = 3; inline bool ReceivedInvitationRemovedNotification::has_invitation_id() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } inline void ReceivedInvitationRemovedNotification::set_has_invitation_id() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } inline void ReceivedInvitationRemovedNotification::clear_has_invitation_id() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } inline void ReceivedInvitationRemovedNotification::clear_invitation_id() { invitation_id_ = GOOGLE_ULONGLONG(0); @@ -1506,13 +1246,13 @@ inline void ReceivedInvitationRemovedNotification::set_invitation_id(::google::p // optional .bgs.protocol.InvitationRemovedReason reason = 4; inline bool ReceivedInvitationRemovedNotification::has_reason() const { - return (_has_bits_[0] & 0x00000008u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } inline void ReceivedInvitationRemovedNotification::set_has_reason() { - _has_bits_[0] |= 0x00000008u; + _has_bits_[0] |= 0x00000004u; } inline void ReceivedInvitationRemovedNotification::clear_has_reason() { - _has_bits_[0] &= ~0x00000008u; + _has_bits_[0] &= ~0x00000004u; } inline void ReceivedInvitationRemovedNotification::clear_reason() { reason_ = 0; @@ -1574,56 +1314,15 @@ inline void SharedSettingsChangedNotification::set_allocated_agent_id(::bgs::pro // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.membership.SharedSettingsChangedNotification.agent_id) } -// optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; -inline bool SharedSettingsChangedNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void SharedSettingsChangedNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void SharedSettingsChangedNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void SharedSettingsChangedNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::account::v1::AccountId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::account::v1::AccountId& SharedSettingsChangedNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.membership.SharedSettingsChangedNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::account::v1::AccountId* SharedSettingsChangedNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::account::v1::AccountId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.membership.SharedSettingsChangedNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::account::v1::AccountId* SharedSettingsChangedNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::account::v1::AccountId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void SharedSettingsChangedNotification::set_allocated_subscriber_id(::bgs::protocol::account::v1::AccountId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.membership.SharedSettingsChangedNotification.subscriber_id) -} - // optional .bgs.protocol.club.v1.ClubSharedSettingsAssignment assignment = 4; inline bool SharedSettingsChangedNotification::has_assignment() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } inline void SharedSettingsChangedNotification::set_has_assignment() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } inline void SharedSettingsChangedNotification::clear_has_assignment() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } inline void SharedSettingsChangedNotification::clear_assignment() { if (assignment_ != NULL) assignment_->::bgs::protocol::club::v1::ClubSharedSettingsAssignment::Clear(); @@ -1701,56 +1400,15 @@ inline void StreamMentionAddedNotification::set_allocated_agent_id(::bgs::protoc // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.membership.StreamMentionAddedNotification.agent_id) } -// optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; -inline bool StreamMentionAddedNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void StreamMentionAddedNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void StreamMentionAddedNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void StreamMentionAddedNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::account::v1::AccountId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::account::v1::AccountId& StreamMentionAddedNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.membership.StreamMentionAddedNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::account::v1::AccountId* StreamMentionAddedNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::account::v1::AccountId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.membership.StreamMentionAddedNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::account::v1::AccountId* StreamMentionAddedNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::account::v1::AccountId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void StreamMentionAddedNotification::set_allocated_subscriber_id(::bgs::protocol::account::v1::AccountId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.membership.StreamMentionAddedNotification.subscriber_id) -} - // optional .bgs.protocol.club.v1.StreamMention mention = 3; inline bool StreamMentionAddedNotification::has_mention() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } inline void StreamMentionAddedNotification::set_has_mention() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } inline void StreamMentionAddedNotification::clear_has_mention() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } inline void StreamMentionAddedNotification::clear_mention() { if (mention_ != NULL) mention_->::bgs::protocol::club::v1::StreamMention::Clear(); @@ -1828,56 +1486,15 @@ inline void StreamMentionRemovedNotification::set_allocated_agent_id(::bgs::prot // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.membership.StreamMentionRemovedNotification.agent_id) } -// optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; -inline bool StreamMentionRemovedNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void StreamMentionRemovedNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void StreamMentionRemovedNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void StreamMentionRemovedNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::account::v1::AccountId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::account::v1::AccountId& StreamMentionRemovedNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.membership.StreamMentionRemovedNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::account::v1::AccountId* StreamMentionRemovedNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::account::v1::AccountId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.membership.StreamMentionRemovedNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::account::v1::AccountId* StreamMentionRemovedNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::account::v1::AccountId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void StreamMentionRemovedNotification::set_allocated_subscriber_id(::bgs::protocol::account::v1::AccountId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.membership.StreamMentionRemovedNotification.subscriber_id) -} - // optional .bgs.protocol.TimeSeriesId mention_id = 3; inline bool StreamMentionRemovedNotification::has_mention_id() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } inline void StreamMentionRemovedNotification::set_has_mention_id() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } inline void StreamMentionRemovedNotification::clear_has_mention_id() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } inline void StreamMentionRemovedNotification::clear_mention_id() { if (mention_id_ != NULL) mention_id_->::bgs::protocol::TimeSeriesId::Clear(); @@ -1955,56 +1572,15 @@ inline void StreamMentionAdvanceViewTimeNotification::set_allocated_agent_id(::b // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.membership.StreamMentionAdvanceViewTimeNotification.agent_id) } -// optional .bgs.protocol.account.v1.AccountId subscriber_id = 2; -inline bool StreamMentionAdvanceViewTimeNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void StreamMentionAdvanceViewTimeNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void StreamMentionAdvanceViewTimeNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void StreamMentionAdvanceViewTimeNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::account::v1::AccountId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::account::v1::AccountId& StreamMentionAdvanceViewTimeNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.membership.StreamMentionAdvanceViewTimeNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::account::v1::AccountId* StreamMentionAdvanceViewTimeNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::account::v1::AccountId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.membership.StreamMentionAdvanceViewTimeNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::account::v1::AccountId* StreamMentionAdvanceViewTimeNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::account::v1::AccountId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void StreamMentionAdvanceViewTimeNotification::set_allocated_subscriber_id(::bgs::protocol::account::v1::AccountId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.membership.StreamMentionAdvanceViewTimeNotification.subscriber_id) -} - // optional uint64 view_time = 3; inline bool StreamMentionAdvanceViewTimeNotification::has_view_time() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } inline void StreamMentionAdvanceViewTimeNotification::set_has_view_time() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } inline void StreamMentionAdvanceViewTimeNotification::clear_has_view_time() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } inline void StreamMentionAdvanceViewTimeNotification::clear_view_time() { view_time_ = GOOGLE_ULONGLONG(0); diff --git a/src/server/proto/Client/club_membership_service.pb.cc b/src/server/proto/Client/club_membership_service.pb.cc index 945c22514dc..fb747b3750f 100644 --- a/src/server/proto/Client/club_membership_service.pb.cc +++ b/src/server/proto/Client/club_membership_service.pb.cc @@ -70,8 +70,9 @@ void protobuf_AssignDesc_club_5fmembership_5fservice_2eproto() { "club_membership_service.proto"); GOOGLE_CHECK(file != NULL); SubscribeRequest_descriptor_ = file->message_type(0); - static const int SubscribeRequest_offsets_[1] = { + static const int SubscribeRequest_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscribeRequest, agent_id_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscribeRequest, options_), }; SubscribeRequest_reflection_ = new ::google::protobuf::internal::GeneratedMessageReflection( @@ -115,8 +116,9 @@ void protobuf_AssignDesc_club_5fmembership_5fservice_2eproto() { ::google::protobuf::MessageFactory::generated_factory(), sizeof(UnsubscribeRequest)); GetStateRequest_descriptor_ = file->message_type(3); - static const int GetStateRequest_offsets_[1] = { + static const int GetStateRequest_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStateRequest, agent_id_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStateRequest, options_), }; GetStateRequest_reflection_ = new ::google::protobuf::internal::GeneratedMessageReflection( @@ -161,9 +163,10 @@ void protobuf_AssignDesc_club_5fmembership_5fservice_2eproto() { ::google::protobuf::MessageFactory::generated_factory(), sizeof(UpdateClubSharedSettingsRequest)); GetStreamMentionsRequest_descriptor_ = file->message_type(6); - static const int GetStreamMentionsRequest_offsets_[2] = { + static const int GetStreamMentionsRequest_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamMentionsRequest, agent_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamMentionsRequest, options_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamMentionsRequest, fetch_messages_), }; GetStreamMentionsRequest_reflection_ = new ::google::protobuf::internal::GeneratedMessageReflection( @@ -294,56 +297,61 @@ void protobuf_AddDesc_club_5fmembership_5fservice_2eproto() { ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( "\n\035club_membership_service.proto\022\037bgs.pro" "tocol.club.v1.membership\032\020club_types.pro" - "to\032\021club_stream.proto\"H\n\020SubscribeReques" - "t\0224\n\010agent_id\030\001 \001(\0132\".bgs.protocol.accou" - "nt.v1.AccountId\"M\n\021SubscribeResponse\0228\n\005" - "state\030\001 \001(\0132).bgs.protocol.club.v1.ClubM" - "embershipState\"J\n\022UnsubscribeRequest\0224\n\010" - "agent_id\030\001 \001(\0132\".bgs.protocol.account.v1" - ".AccountId\"G\n\017GetStateRequest\0224\n\010agent_i" - "d\030\001 \001(\0132\".bgs.protocol.account.v1.Accoun" - "tId\"L\n\020GetStateResponse\0228\n\005state\030\001 \001(\0132)" - ".bgs.protocol.club.v1.ClubMembershipStat" - "e\"\231\001\n\037UpdateClubSharedSettingsRequest\0224\n" - "\010agent_id\030\001 \001(\0132\".bgs.protocol.account.v" - "1.AccountId\022@\n\007options\030\002 \001(\0132/.bgs.proto" - "col.club.v1.ClubSharedSettingsOptions\"\200\001" - "\n\030GetStreamMentionsRequest\0224\n\010agent_id\030\001" - " \001(\0132\".bgs.protocol.account.v1.AccountId" - "\022.\n\007options\030\002 \001(\0132\035.bgs.protocol.GetEven" - "tOptions\"g\n\031GetStreamMentionsResponse\0224\n" - "\007mention\030\001 \003(\0132#.bgs.protocol.club.v1.St" - "reamMention\022\024\n\014continuation\030\002 \001(\004\"\203\001\n\033Re" - "moveStreamMentionsRequest\0224\n\010agent_id\030\001 " - "\001(\0132\".bgs.protocol.account.v1.AccountId\022" - ".\n\nmention_id\030\002 \003(\0132\032.bgs.protocol.TimeS" - "eriesId\"[\n#AdvanceStreamMentionViewTimeR" - "equest\0224\n\010agent_id\030\001 \001(\0132\".bgs.protocol." - "account.v1.AccountId2\304\007\n\025ClubMembershipS" - "ervice\022z\n\tSubscribe\0221.bgs.protocol.club." - "v1.membership.SubscribeRequest\0322.bgs.pro" - "tocol.club.v1.membership.SubscribeRespon" - "se\"\006\202\371+\002\010\001\022`\n\013Unsubscribe\0223.bgs.protocol" - ".club.v1.membership.UnsubscribeRequest\032\024" - ".bgs.protocol.NoData\"\006\202\371+\002\010\002\022w\n\010GetState" - "\0220.bgs.protocol.club.v1.membership.GetSt" - "ateRequest\0321.bgs.protocol.club.v1.member" - "ship.GetStateResponse\"\006\202\371+\002\010\003\022z\n\030UpdateC" - "lubSharedSettings\022@.bgs.protocol.club.v1" - ".membership.UpdateClubSharedSettingsRequ" - "est\032\024.bgs.protocol.NoData\"\006\202\371+\002\010\004\022\222\001\n\021Ge" - "tStreamMentions\0229.bgs.protocol.club.v1.m" - "embership.GetStreamMentionsRequest\032:.bgs" - ".protocol.club.v1.membership.GetStreamMe" - "ntionsResponse\"\006\202\371+\002\010\005\022r\n\024RemoveStreamMe" - "ntions\022<.bgs.protocol.club.v1.membership" - ".RemoveStreamMentionsRequest\032\024.bgs.proto" - "col.NoData\"\006\202\371+\002\010\006\022\202\001\n\034AdvanceStreamMent" - "ionViewTime\022D.bgs.protocol.club.v1.membe" - "rship.AdvanceStreamMentionViewTimeReques" - "t\032\024.bgs.protocol.NoData\"\006\202\371+\002\010\007\032J\202\371+>\n+b" - "net.protocol.club.v1.ClubMembershipServi" - "ce*\017club_membership\212\371+\004\020\001\030\001B\005H\001\200\001\000", 2074); + "to\032\021club_stream.proto\"\217\001\n\020SubscribeReque" + "st\0224\n\010agent_id\030\001 \001(\0132\".bgs.protocol.acco" + "unt.v1.AccountId\022E\n\007options\030\002 \001(\01324.bgs." + "protocol.club.v1.ClubMembershipSubscribe" + "Options\"M\n\021SubscribeResponse\0228\n\005state\030\001 " + "\001(\0132).bgs.protocol.club.v1.ClubMembershi" + "pState\"J\n\022UnsubscribeRequest\0224\n\010agent_id" + "\030\001 \001(\0132\".bgs.protocol.account.v1.Account" + "Id\"\215\001\n\017GetStateRequest\0224\n\010agent_id\030\001 \001(\013" + "2\".bgs.protocol.account.v1.AccountId\022D\n\007" + "options\030\002 \001(\01323.bgs.protocol.club.v1.Clu" + "bMembershipGetStateOptions\"L\n\020GetStateRe" + "sponse\0228\n\005state\030\001 \001(\0132).bgs.protocol.clu" + "b.v1.ClubMembershipState\"\231\001\n\037UpdateClubS" + "haredSettingsRequest\0224\n\010agent_id\030\001 \001(\0132\"" + ".bgs.protocol.account.v1.AccountId\022@\n\007op" + "tions\030\002 \001(\0132/.bgs.protocol.club.v1.ClubS" + "haredSettingsOptions\"\230\001\n\030GetStreamMentio" + "nsRequest\0224\n\010agent_id\030\001 \001(\0132\".bgs.protoc" + "ol.account.v1.AccountId\022.\n\007options\030\002 \001(\013" + "2\035.bgs.protocol.GetEventOptions\022\026\n\016fetch" + "_messages\030\003 \001(\010\"g\n\031GetStreamMentionsResp" + "onse\0224\n\007mention\030\001 \003(\0132#.bgs.protocol.clu" + "b.v1.StreamMention\022\024\n\014continuation\030\002 \001(\004" + "\"\203\001\n\033RemoveStreamMentionsRequest\0224\n\010agen" + "t_id\030\001 \001(\0132\".bgs.protocol.account.v1.Acc" + "ountId\022.\n\nmention_id\030\002 \003(\0132\032.bgs.protoco" + "l.TimeSeriesId\"[\n#AdvanceStreamMentionVi" + "ewTimeRequest\0224\n\010agent_id\030\001 \001(\0132\".bgs.pr" + "otocol.account.v1.AccountId2\304\007\n\025ClubMemb" + "ershipService\022z\n\tSubscribe\0221.bgs.protoco" + "l.club.v1.membership.SubscribeRequest\0322." + "bgs.protocol.club.v1.membership.Subscrib" + "eResponse\"\006\202\371+\002\010\001\022`\n\013Unsubscribe\0223.bgs.p" + "rotocol.club.v1.membership.UnsubscribeRe" + "quest\032\024.bgs.protocol.NoData\"\006\202\371+\002\010\002\022w\n\010G" + "etState\0220.bgs.protocol.club.v1.membershi" + "p.GetStateRequest\0321.bgs.protocol.club.v1" + ".membership.GetStateResponse\"\006\202\371+\002\010\003\022z\n\030" + "UpdateClubSharedSettings\022@.bgs.protocol." + "club.v1.membership.UpdateClubSharedSetti" + "ngsRequest\032\024.bgs.protocol.NoData\"\006\202\371+\002\010\004" + "\022\222\001\n\021GetStreamMentions\0229.bgs.protocol.cl" + "ub.v1.membership.GetStreamMentionsReques" + "t\032:.bgs.protocol.club.v1.membership.GetS" + "treamMentionsResponse\"\006\202\371+\002\010\005\022r\n\024RemoveS" + "treamMentions\022<.bgs.protocol.club.v1.mem" + "bership.RemoveStreamMentionsRequest\032\024.bg" + "s.protocol.NoData\"\006\202\371+\002\010\006\022\202\001\n\034AdvanceStr" + "eamMentionViewTime\022D.bgs.protocol.club.v" + "1.membership.AdvanceStreamMentionViewTim" + "eRequest\032\024.bgs.protocol.NoData\"\006\202\371+\002\010\007\032J" + "\202\371+>\n+bnet.protocol.club.v1.ClubMembersh" + "ipService*\017club_membership\212\371+\004\020\001\030\001B\005H\001\200\001" + "\000", 2241); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "club_membership_service.proto", &protobuf_RegisterTypes); SubscribeRequest::default_instance_ = new SubscribeRequest(); @@ -380,6 +388,7 @@ struct StaticDescriptorInitializer_club_5fmembership_5fservice_2eproto { #ifndef _MSC_VER const int SubscribeRequest::kAgentIdFieldNumber; +const int SubscribeRequest::kOptionsFieldNumber; #endif // !_MSC_VER SubscribeRequest::SubscribeRequest() @@ -390,6 +399,7 @@ SubscribeRequest::SubscribeRequest() void SubscribeRequest::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::account::v1::AccountId*>(&::bgs::protocol::account::v1::AccountId::default_instance()); + options_ = const_cast< ::bgs::protocol::club::v1::ClubMembershipSubscribeOptions*>(&::bgs::protocol::club::v1::ClubMembershipSubscribeOptions::default_instance()); } SubscribeRequest::SubscribeRequest(const SubscribeRequest& from) @@ -402,6 +412,7 @@ SubscribeRequest::SubscribeRequest(const SubscribeRequest& from) void SubscribeRequest::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; + options_ = NULL; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -413,6 +424,7 @@ SubscribeRequest::~SubscribeRequest() { void SubscribeRequest::SharedDtor() { if (this != default_instance_) { delete agent_id_; + delete options_; } } @@ -438,8 +450,13 @@ SubscribeRequest* SubscribeRequest::New() const { } void SubscribeRequest::Clear() { - if (has_agent_id()) { - if (agent_id_ != NULL) agent_id_->::bgs::protocol::account::v1::AccountId::Clear(); + if (_has_bits_[0 / 32] & 3) { + if (has_agent_id()) { + if (agent_id_ != NULL) agent_id_->::bgs::protocol::account::v1::AccountId::Clear(); + } + if (has_options()) { + if (options_ != NULL) options_->::bgs::protocol::club::v1::ClubMembershipSubscribeOptions::Clear(); + } } ::memset(_has_bits_, 0, sizeof(_has_bits_)); mutable_unknown_fields()->Clear(); @@ -463,6 +480,19 @@ bool SubscribeRequest::MergePartialFromCodedStream( } else { goto handle_unusual; } + if (input->ExpectTag(18)) goto parse_options; + break; + } + + // optional .bgs.protocol.club.v1.ClubMembershipSubscribeOptions options = 2; + case 2: { + if (tag == 18) { + parse_options: + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_options())); + } else { + goto handle_unusual; + } if (input->ExpectAtEnd()) goto success; break; } @@ -498,6 +528,12 @@ void SubscribeRequest::SerializeWithCachedSizes( 1, this->agent_id(), output); } + // optional .bgs.protocol.club.v1.ClubMembershipSubscribeOptions options = 2; + if (has_options()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 2, this->options(), output); + } + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -515,6 +551,13 @@ void SubscribeRequest::SerializeWithCachedSizes( 1, this->agent_id(), target); } + // optional .bgs.protocol.club.v1.ClubMembershipSubscribeOptions options = 2; + if (has_options()) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 2, this->options(), target); + } + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -534,6 +577,13 @@ int SubscribeRequest::ByteSize() const { this->agent_id()); } + // optional .bgs.protocol.club.v1.ClubMembershipSubscribeOptions options = 2; + if (has_options()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->options()); + } + } if (!unknown_fields().empty()) { total_size += @@ -564,6 +614,9 @@ void SubscribeRequest::MergeFrom(const SubscribeRequest& from) { if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::account::v1::AccountId::MergeFrom(from.agent_id()); } + if (from.has_options()) { + mutable_options()->::bgs::protocol::club::v1::ClubMembershipSubscribeOptions::MergeFrom(from.options()); + } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); } @@ -585,12 +638,16 @@ bool SubscribeRequest::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } + if (has_options()) { + if (!this->options().IsInitialized()) return false; + } return true; } void SubscribeRequest::Swap(SubscribeRequest* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); + std::swap(options_, other->options_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); @@ -1070,6 +1127,7 @@ void UnsubscribeRequest::Swap(UnsubscribeRequest* other) { #ifndef _MSC_VER const int GetStateRequest::kAgentIdFieldNumber; +const int GetStateRequest::kOptionsFieldNumber; #endif // !_MSC_VER GetStateRequest::GetStateRequest() @@ -1080,6 +1138,7 @@ GetStateRequest::GetStateRequest() void GetStateRequest::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::account::v1::AccountId*>(&::bgs::protocol::account::v1::AccountId::default_instance()); + options_ = const_cast< ::bgs::protocol::club::v1::ClubMembershipGetStateOptions*>(&::bgs::protocol::club::v1::ClubMembershipGetStateOptions::default_instance()); } GetStateRequest::GetStateRequest(const GetStateRequest& from) @@ -1092,6 +1151,7 @@ GetStateRequest::GetStateRequest(const GetStateRequest& from) void GetStateRequest::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; + options_ = NULL; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -1103,6 +1163,7 @@ GetStateRequest::~GetStateRequest() { void GetStateRequest::SharedDtor() { if (this != default_instance_) { delete agent_id_; + delete options_; } } @@ -1128,8 +1189,13 @@ GetStateRequest* GetStateRequest::New() const { } void GetStateRequest::Clear() { - if (has_agent_id()) { - if (agent_id_ != NULL) agent_id_->::bgs::protocol::account::v1::AccountId::Clear(); + if (_has_bits_[0 / 32] & 3) { + if (has_agent_id()) { + if (agent_id_ != NULL) agent_id_->::bgs::protocol::account::v1::AccountId::Clear(); + } + if (has_options()) { + if (options_ != NULL) options_->::bgs::protocol::club::v1::ClubMembershipGetStateOptions::Clear(); + } } ::memset(_has_bits_, 0, sizeof(_has_bits_)); mutable_unknown_fields()->Clear(); @@ -1153,6 +1219,19 @@ bool GetStateRequest::MergePartialFromCodedStream( } else { goto handle_unusual; } + if (input->ExpectTag(18)) goto parse_options; + break; + } + + // optional .bgs.protocol.club.v1.ClubMembershipGetStateOptions options = 2; + case 2: { + if (tag == 18) { + parse_options: + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_options())); + } else { + goto handle_unusual; + } if (input->ExpectAtEnd()) goto success; break; } @@ -1188,6 +1267,12 @@ void GetStateRequest::SerializeWithCachedSizes( 1, this->agent_id(), output); } + // optional .bgs.protocol.club.v1.ClubMembershipGetStateOptions options = 2; + if (has_options()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 2, this->options(), output); + } + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -1205,6 +1290,13 @@ void GetStateRequest::SerializeWithCachedSizes( 1, this->agent_id(), target); } + // optional .bgs.protocol.club.v1.ClubMembershipGetStateOptions options = 2; + if (has_options()) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 2, this->options(), target); + } + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -1224,6 +1316,13 @@ int GetStateRequest::ByteSize() const { this->agent_id()); } + // optional .bgs.protocol.club.v1.ClubMembershipGetStateOptions options = 2; + if (has_options()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->options()); + } + } if (!unknown_fields().empty()) { total_size += @@ -1254,6 +1353,9 @@ void GetStateRequest::MergeFrom(const GetStateRequest& from) { if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::account::v1::AccountId::MergeFrom(from.agent_id()); } + if (from.has_options()) { + mutable_options()->::bgs::protocol::club::v1::ClubMembershipGetStateOptions::MergeFrom(from.options()); + } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); } @@ -1275,12 +1377,16 @@ bool GetStateRequest::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } + if (has_options()) { + if (!this->options().IsInitialized()) return false; + } return true; } void GetStateRequest::Swap(GetStateRequest* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); + std::swap(options_, other->options_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); @@ -1807,6 +1913,7 @@ void UpdateClubSharedSettingsRequest::Swap(UpdateClubSharedSettingsRequest* othe #ifndef _MSC_VER const int GetStreamMentionsRequest::kAgentIdFieldNumber; const int GetStreamMentionsRequest::kOptionsFieldNumber; +const int GetStreamMentionsRequest::kFetchMessagesFieldNumber; #endif // !_MSC_VER GetStreamMentionsRequest::GetStreamMentionsRequest() @@ -1831,6 +1938,7 @@ void GetStreamMentionsRequest::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; options_ = NULL; + fetch_messages_ = false; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -1868,13 +1976,14 @@ GetStreamMentionsRequest* GetStreamMentionsRequest::New() const { } void GetStreamMentionsRequest::Clear() { - if (_has_bits_[0 / 32] & 3) { + if (_has_bits_[0 / 32] & 7) { if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::account::v1::AccountId::Clear(); } if (has_options()) { if (options_ != NULL) options_->::bgs::protocol::GetEventOptions::Clear(); } + fetch_messages_ = false; } ::memset(_has_bits_, 0, sizeof(_has_bits_)); mutable_unknown_fields()->Clear(); @@ -1911,6 +2020,21 @@ bool GetStreamMentionsRequest::MergePartialFromCodedStream( } else { goto handle_unusual; } + if (input->ExpectTag(24)) goto parse_fetch_messages; + break; + } + + // optional bool fetch_messages = 3; + case 3: { + if (tag == 24) { + parse_fetch_messages: + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( + input, &fetch_messages_))); + set_has_fetch_messages(); + } else { + goto handle_unusual; + } if (input->ExpectAtEnd()) goto success; break; } @@ -1952,6 +2076,11 @@ void GetStreamMentionsRequest::SerializeWithCachedSizes( 2, this->options(), output); } + // optional bool fetch_messages = 3; + if (has_fetch_messages()) { + ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->fetch_messages(), output); + } + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -1976,6 +2105,11 @@ void GetStreamMentionsRequest::SerializeWithCachedSizes( 2, this->options(), target); } + // optional bool fetch_messages = 3; + if (has_fetch_messages()) { + target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->fetch_messages(), target); + } + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -2002,6 +2136,11 @@ int GetStreamMentionsRequest::ByteSize() const { this->options()); } + // optional bool fetch_messages = 3; + if (has_fetch_messages()) { + total_size += 1 + 1; + } + } if (!unknown_fields().empty()) { total_size += @@ -2035,6 +2174,9 @@ void GetStreamMentionsRequest::MergeFrom(const GetStreamMentionsRequest& from) { if (from.has_options()) { mutable_options()->::bgs::protocol::GetEventOptions::MergeFrom(from.options()); } + if (from.has_fetch_messages()) { + set_fetch_messages(from.fetch_messages()); + } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); } @@ -2063,6 +2205,7 @@ void GetStreamMentionsRequest::Swap(GetStreamMentionsRequest* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); std::swap(options_, other->options_); + std::swap(fetch_messages_, other->fetch_messages_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); diff --git a/src/server/proto/Client/club_membership_service.pb.h b/src/server/proto/Client/club_membership_service.pb.h index d6a3db8084a..89f9aed3a56 100644 --- a/src/server/proto/Client/club_membership_service.pb.h +++ b/src/server/proto/Client/club_membership_service.pb.h @@ -118,16 +118,28 @@ class TC_PROTO_API SubscribeRequest : public ::google::protobuf::Message { inline ::bgs::protocol::account::v1::AccountId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::account::v1::AccountId* agent_id); + // optional .bgs.protocol.club.v1.ClubMembershipSubscribeOptions options = 2; + inline bool has_options() const; + inline void clear_options(); + static const int kOptionsFieldNumber = 2; + inline const ::bgs::protocol::club::v1::ClubMembershipSubscribeOptions& options() const; + inline ::bgs::protocol::club::v1::ClubMembershipSubscribeOptions* mutable_options(); + inline ::bgs::protocol::club::v1::ClubMembershipSubscribeOptions* release_options(); + inline void set_allocated_options(::bgs::protocol::club::v1::ClubMembershipSubscribeOptions* options); + // @@protoc_insertion_point(class_scope:bgs.protocol.club.v1.membership.SubscribeRequest) private: inline void set_has_agent_id(); inline void clear_has_agent_id(); + inline void set_has_options(); + inline void clear_has_options(); ::google::protobuf::UnknownFieldSet _unknown_fields_; ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::account::v1::AccountId* agent_id_; + ::bgs::protocol::club::v1::ClubMembershipSubscribeOptions* options_; friend void TC_PROTO_API protobuf_AddDesc_club_5fmembership_5fservice_2eproto(); friend void protobuf_AssignDesc_club_5fmembership_5fservice_2eproto(); friend void protobuf_ShutdownFile_club_5fmembership_5fservice_2eproto(); @@ -361,16 +373,28 @@ class TC_PROTO_API GetStateRequest : public ::google::protobuf::Message { inline ::bgs::protocol::account::v1::AccountId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::account::v1::AccountId* agent_id); + // optional .bgs.protocol.club.v1.ClubMembershipGetStateOptions options = 2; + inline bool has_options() const; + inline void clear_options(); + static const int kOptionsFieldNumber = 2; + inline const ::bgs::protocol::club::v1::ClubMembershipGetStateOptions& options() const; + inline ::bgs::protocol::club::v1::ClubMembershipGetStateOptions* mutable_options(); + inline ::bgs::protocol::club::v1::ClubMembershipGetStateOptions* release_options(); + inline void set_allocated_options(::bgs::protocol::club::v1::ClubMembershipGetStateOptions* options); + // @@protoc_insertion_point(class_scope:bgs.protocol.club.v1.membership.GetStateRequest) private: inline void set_has_agent_id(); inline void clear_has_agent_id(); + inline void set_has_options(); + inline void clear_has_options(); ::google::protobuf::UnknownFieldSet _unknown_fields_; ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::account::v1::AccountId* agent_id_; + ::bgs::protocol::club::v1::ClubMembershipGetStateOptions* options_; friend void TC_PROTO_API protobuf_AddDesc_club_5fmembership_5fservice_2eproto(); friend void protobuf_AssignDesc_club_5fmembership_5fservice_2eproto(); friend void protobuf_ShutdownFile_club_5fmembership_5fservice_2eproto(); @@ -625,12 +649,21 @@ class TC_PROTO_API GetStreamMentionsRequest : public ::google::protobuf::Message inline ::bgs::protocol::GetEventOptions* release_options(); inline void set_allocated_options(::bgs::protocol::GetEventOptions* options); + // optional bool fetch_messages = 3; + inline bool has_fetch_messages() const; + inline void clear_fetch_messages(); + static const int kFetchMessagesFieldNumber = 3; + inline bool fetch_messages() const; + inline void set_fetch_messages(bool value); + // @@protoc_insertion_point(class_scope:bgs.protocol.club.v1.membership.GetStreamMentionsRequest) private: inline void set_has_agent_id(); inline void clear_has_agent_id(); inline void set_has_options(); inline void clear_has_options(); + inline void set_has_fetch_messages(); + inline void clear_has_fetch_messages(); ::google::protobuf::UnknownFieldSet _unknown_fields_; @@ -638,6 +671,7 @@ class TC_PROTO_API GetStreamMentionsRequest : public ::google::protobuf::Message mutable int _cached_size_; ::bgs::protocol::account::v1::AccountId* agent_id_; ::bgs::protocol::GetEventOptions* options_; + bool fetch_messages_; friend void TC_PROTO_API protobuf_AddDesc_club_5fmembership_5fservice_2eproto(); friend void protobuf_AssignDesc_club_5fmembership_5fservice_2eproto(); friend void protobuf_ShutdownFile_club_5fmembership_5fservice_2eproto(); @@ -1002,6 +1036,47 @@ inline void SubscribeRequest::set_allocated_agent_id(::bgs::protocol::account::v // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.membership.SubscribeRequest.agent_id) } +// optional .bgs.protocol.club.v1.ClubMembershipSubscribeOptions options = 2; +inline bool SubscribeRequest::has_options() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +inline void SubscribeRequest::set_has_options() { + _has_bits_[0] |= 0x00000002u; +} +inline void SubscribeRequest::clear_has_options() { + _has_bits_[0] &= ~0x00000002u; +} +inline void SubscribeRequest::clear_options() { + if (options_ != NULL) options_->::bgs::protocol::club::v1::ClubMembershipSubscribeOptions::Clear(); + clear_has_options(); +} +inline const ::bgs::protocol::club::v1::ClubMembershipSubscribeOptions& SubscribeRequest::options() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.membership.SubscribeRequest.options) + return options_ != NULL ? *options_ : *default_instance_->options_; +} +inline ::bgs::protocol::club::v1::ClubMembershipSubscribeOptions* SubscribeRequest::mutable_options() { + set_has_options(); + if (options_ == NULL) options_ = new ::bgs::protocol::club::v1::ClubMembershipSubscribeOptions; + // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.membership.SubscribeRequest.options) + return options_; +} +inline ::bgs::protocol::club::v1::ClubMembershipSubscribeOptions* SubscribeRequest::release_options() { + clear_has_options(); + ::bgs::protocol::club::v1::ClubMembershipSubscribeOptions* temp = options_; + options_ = NULL; + return temp; +} +inline void SubscribeRequest::set_allocated_options(::bgs::protocol::club::v1::ClubMembershipSubscribeOptions* options) { + delete options_; + options_ = options; + if (options) { + set_has_options(); + } else { + clear_has_options(); + } + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.membership.SubscribeRequest.options) +} + // ------------------------------------------------------------------- // SubscribeResponse @@ -1137,6 +1212,47 @@ inline void GetStateRequest::set_allocated_agent_id(::bgs::protocol::account::v1 // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.membership.GetStateRequest.agent_id) } +// optional .bgs.protocol.club.v1.ClubMembershipGetStateOptions options = 2; +inline bool GetStateRequest::has_options() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +inline void GetStateRequest::set_has_options() { + _has_bits_[0] |= 0x00000002u; +} +inline void GetStateRequest::clear_has_options() { + _has_bits_[0] &= ~0x00000002u; +} +inline void GetStateRequest::clear_options() { + if (options_ != NULL) options_->::bgs::protocol::club::v1::ClubMembershipGetStateOptions::Clear(); + clear_has_options(); +} +inline const ::bgs::protocol::club::v1::ClubMembershipGetStateOptions& GetStateRequest::options() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.membership.GetStateRequest.options) + return options_ != NULL ? *options_ : *default_instance_->options_; +} +inline ::bgs::protocol::club::v1::ClubMembershipGetStateOptions* GetStateRequest::mutable_options() { + set_has_options(); + if (options_ == NULL) options_ = new ::bgs::protocol::club::v1::ClubMembershipGetStateOptions; + // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.membership.GetStateRequest.options) + return options_; +} +inline ::bgs::protocol::club::v1::ClubMembershipGetStateOptions* GetStateRequest::release_options() { + clear_has_options(); + ::bgs::protocol::club::v1::ClubMembershipGetStateOptions* temp = options_; + options_ = NULL; + return temp; +} +inline void GetStateRequest::set_allocated_options(::bgs::protocol::club::v1::ClubMembershipGetStateOptions* options) { + delete options_; + options_ = options; + if (options) { + set_has_options(); + } else { + clear_has_options(); + } + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.membership.GetStateRequest.options) +} + // ------------------------------------------------------------------- // GetStateResponse @@ -1354,6 +1470,30 @@ inline void GetStreamMentionsRequest::set_allocated_options(::bgs::protocol::Get // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.membership.GetStreamMentionsRequest.options) } +// optional bool fetch_messages = 3; +inline bool GetStreamMentionsRequest::has_fetch_messages() const { + return (_has_bits_[0] & 0x00000004u) != 0; +} +inline void GetStreamMentionsRequest::set_has_fetch_messages() { + _has_bits_[0] |= 0x00000004u; +} +inline void GetStreamMentionsRequest::clear_has_fetch_messages() { + _has_bits_[0] &= ~0x00000004u; +} +inline void GetStreamMentionsRequest::clear_fetch_messages() { + fetch_messages_ = false; + clear_has_fetch_messages(); +} +inline bool GetStreamMentionsRequest::fetch_messages() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.membership.GetStreamMentionsRequest.fetch_messages) + return fetch_messages_; +} +inline void GetStreamMentionsRequest::set_fetch_messages(bool value) { + set_has_fetch_messages(); + fetch_messages_ = value; + // @@protoc_insertion_point(field_set:bgs.protocol.club.v1.membership.GetStreamMentionsRequest.fetch_messages) +} + // ------------------------------------------------------------------- // GetStreamMentionsResponse diff --git a/src/server/proto/Client/club_membership_types.pb.cc b/src/server/proto/Client/club_membership_types.pb.cc index 6bf2e595cd4..b2583776c22 100644 --- a/src/server/proto/Client/club_membership_types.pb.cc +++ b/src/server/proto/Client/club_membership_types.pb.cc @@ -25,6 +25,15 @@ namespace v1 { namespace { +const ::google::protobuf::Descriptor* ClubMembershipFilter_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + ClubMembershipFilter_reflection_ = NULL; +const ::google::protobuf::Descriptor* ClubMembershipSubscribeOptions_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + ClubMembershipSubscribeOptions_reflection_ = NULL; +const ::google::protobuf::Descriptor* ClubMembershipGetStateOptions_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + ClubMembershipGetStateOptions_reflection_ = NULL; const ::google::protobuf::Descriptor* ClubMembershipDescription_descriptor_ = NULL; const ::google::protobuf::internal::GeneratedMessageReflection* ClubMembershipDescription_reflection_ = NULL; @@ -53,7 +62,53 @@ void protobuf_AssignDesc_club_5fmembership_5ftypes_2eproto() { ::google::protobuf::DescriptorPool::generated_pool()->FindFileByName( "club_membership_types.proto"); GOOGLE_CHECK(file != NULL); - ClubMembershipDescription_descriptor_ = file->message_type(0); + ClubMembershipFilter_descriptor_ = file->message_type(0); + static const int ClubMembershipFilter_offsets_[2] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubMembershipFilter, member_id_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubMembershipFilter, type_), + }; + ClubMembershipFilter_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + ClubMembershipFilter_descriptor_, + ClubMembershipFilter::default_instance_, + ClubMembershipFilter_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubMembershipFilter, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubMembershipFilter, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(ClubMembershipFilter)); + ClubMembershipSubscribeOptions_descriptor_ = file->message_type(1); + static const int ClubMembershipSubscribeOptions_offsets_[1] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubMembershipSubscribeOptions, filter_), + }; + ClubMembershipSubscribeOptions_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + ClubMembershipSubscribeOptions_descriptor_, + ClubMembershipSubscribeOptions::default_instance_, + ClubMembershipSubscribeOptions_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubMembershipSubscribeOptions, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubMembershipSubscribeOptions, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(ClubMembershipSubscribeOptions)); + ClubMembershipGetStateOptions_descriptor_ = file->message_type(2); + static const int ClubMembershipGetStateOptions_offsets_[1] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubMembershipGetStateOptions, filter_), + }; + ClubMembershipGetStateOptions_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + ClubMembershipGetStateOptions_descriptor_, + ClubMembershipGetStateOptions::default_instance_, + ClubMembershipGetStateOptions_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubMembershipGetStateOptions, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubMembershipGetStateOptions, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(ClubMembershipGetStateOptions)); + ClubMembershipDescription_descriptor_ = file->message_type(3); static const int ClubMembershipDescription_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubMembershipDescription, member_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubMembershipDescription, club_), @@ -69,7 +124,7 @@ void protobuf_AssignDesc_club_5fmembership_5ftypes_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(ClubMembershipDescription)); - ClubMembershipState_descriptor_ = file->message_type(1); + ClubMembershipState_descriptor_ = file->message_type(4); static const int ClubMembershipState_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubMembershipState, description_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubMembershipState, invitation_), @@ -87,7 +142,7 @@ void protobuf_AssignDesc_club_5fmembership_5ftypes_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(ClubMembershipState)); - ClubPosition_descriptor_ = file->message_type(2); + ClubPosition_descriptor_ = file->message_type(5); static const int ClubPosition_offsets_[1] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubPosition, club_id_), }; @@ -102,7 +157,7 @@ void protobuf_AssignDesc_club_5fmembership_5ftypes_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(ClubPosition)); - ClubSharedSettings_descriptor_ = file->message_type(3); + ClubSharedSettings_descriptor_ = file->message_type(6); static const int ClubSharedSettings_offsets_[1] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubSharedSettings, club_position_), }; @@ -117,7 +172,7 @@ void protobuf_AssignDesc_club_5fmembership_5ftypes_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(ClubSharedSettings)); - ClubSharedSettingsOptions_descriptor_ = file->message_type(4); + ClubSharedSettingsOptions_descriptor_ = file->message_type(7); static const int ClubSharedSettingsOptions_offsets_[1] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubSharedSettingsOptions, club_position_), }; @@ -132,7 +187,7 @@ void protobuf_AssignDesc_club_5fmembership_5ftypes_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(ClubSharedSettingsOptions)); - ClubSharedSettingsAssignment_descriptor_ = file->message_type(5); + ClubSharedSettingsAssignment_descriptor_ = file->message_type(8); static const int ClubSharedSettingsAssignment_offsets_[1] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubSharedSettingsAssignment, club_position_), }; @@ -160,6 +215,12 @@ inline void protobuf_AssignDescriptorsOnce() { void protobuf_RegisterTypes(const ::std::string&) { protobuf_AssignDescriptorsOnce(); ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + ClubMembershipFilter_descriptor_, &ClubMembershipFilter::default_instance()); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + ClubMembershipSubscribeOptions_descriptor_, &ClubMembershipSubscribeOptions::default_instance()); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + ClubMembershipGetStateOptions_descriptor_, &ClubMembershipGetStateOptions::default_instance()); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( ClubMembershipDescription_descriptor_, &ClubMembershipDescription::default_instance()); ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( ClubMembershipState_descriptor_, &ClubMembershipState::default_instance()); @@ -176,6 +237,12 @@ void protobuf_RegisterTypes(const ::std::string&) { } // namespace void protobuf_ShutdownFile_club_5fmembership_5ftypes_2eproto() { + delete ClubMembershipFilter::default_instance_; + delete ClubMembershipFilter_reflection_; + delete ClubMembershipSubscribeOptions::default_instance_; + delete ClubMembershipSubscribeOptions_reflection_; + delete ClubMembershipGetStateOptions::default_instance_; + delete ClubMembershipGetStateOptions_reflection_; delete ClubMembershipDescription::default_instance_; delete ClubMembershipDescription_reflection_; delete ClubMembershipState::default_instance_; @@ -200,36 +267,52 @@ void protobuf_AddDesc_club_5fmembership_5ftypes_2eproto() { ::bgs::protocol::club::v1::protobuf_AddDesc_club_5fmember_2eproto(); ::bgs::protocol::club::v1::protobuf_AddDesc_club_5finvitation_2eproto(); ::bgs::protocol::protobuf_AddDesc_event_5fview_5ftypes_2eproto(); + ::bgs::protocol::protobuf_AddDesc_rpc_5ftypes_2eproto(); ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( "\n\033club_membership_types.proto\022\024bgs.proto" "col.club.v1\032\017club_core.proto\032\021club_membe" "r.proto\032\025club_invitation.proto\032\026event_vi" - "ew_types.proto\"\203\001\n\031ClubMembershipDescrip" - "tion\0221\n\tmember_id\030\001 \001(\0132\036.bgs.protocol.c" - "lub.v1.MemberId\0223\n\004club\030\002 \001(\0132%.bgs.prot" - "ocol.club.v1.ClubDescription\"\200\002\n\023ClubMem" - "bershipState\022D\n\013description\030\001 \003(\0132/.bgs." - "protocol.club.v1.ClubMembershipDescripti" - "on\0228\n\ninvitation\030\002 \003(\0132$.bgs.protocol.cl" - "ub.v1.ClubInvitation\0229\n\007setting\030\003 \001(\0132(." - "bgs.protocol.club.v1.ClubSharedSettings\022" - ".\n\014mention_view\030\004 \001(\0132\030.bgs.protocol.Vie" - "wMarker\"#\n\014ClubPosition\022\023\n\007club_id\030\001 \003(\004" - "B\002\020\001\"O\n\022ClubSharedSettings\0229\n\rclub_posit" - "ion\030\001 \001(\0132\".bgs.protocol.club.v1.ClubPos" - "ition\"V\n\031ClubSharedSettingsOptions\0229\n\rcl" - "ub_position\030\001 \001(\0132\".bgs.protocol.club.v1" - ".ClubPosition\"Y\n\034ClubSharedSettingsAssig" - "nment\0229\n\rclub_position\030\001 \001(\0132\".bgs.proto" - "col.club.v1.ClubPositionB\002H\001", 828); + "ew_types.proto\032\017rpc_types.proto\"}\n\024ClubM" + "embershipFilter\0221\n\tmember_id\030\001 \001(\0132\036.bgs" + ".protocol.club.v1.MemberId\0222\n\004type\030\002 \001(\013" + "2$.bgs.protocol.club.v1.UniqueClubType\"j" + "\n\036ClubMembershipSubscribeOptions\022H\n\006filt" + "er\030\001 \003(\0132*.bgs.protocol.club.v1.ClubMemb" + "ershipFilterB\014\212\371+\010*\006\n\004\010\000\020\031\"i\n\035ClubMember" + "shipGetStateOptions\022H\n\006filter\030\001 \003(\0132*.bg" + "s.protocol.club.v1.ClubMembershipFilterB" + "\014\212\371+\010*\006\n\004\010\000\020\031\"\203\001\n\031ClubMembershipDescript" + "ion\0221\n\tmember_id\030\001 \001(\0132\036.bgs.protocol.cl" + "ub.v1.MemberId\0223\n\004club\030\002 \001(\0132%.bgs.proto" + "col.club.v1.ClubDescription\"\200\002\n\023ClubMemb" + "ershipState\022D\n\013description\030\001 \003(\0132/.bgs.p" + "rotocol.club.v1.ClubMembershipDescriptio" + "n\0228\n\ninvitation\030\002 \003(\0132$.bgs.protocol.clu" + "b.v1.ClubInvitation\0229\n\007setting\030\003 \001(\0132(.b" + "gs.protocol.club.v1.ClubSharedSettings\022." + "\n\014mention_view\030\004 \001(\0132\030.bgs.protocol.View" + "Marker\"#\n\014ClubPosition\022\023\n\007club_id\030\001 \003(\004B" + "\002\020\001\"O\n\022ClubSharedSettings\0229\n\rclub_positi" + "on\030\001 \001(\0132\".bgs.protocol.club.v1.ClubPosi" + "tion\"V\n\031ClubSharedSettingsOptions\0229\n\rclu" + "b_position\030\001 \001(\0132\".bgs.protocol.club.v1." + "ClubPosition\"Y\n\034ClubSharedSettingsAssign" + "ment\0229\n\rclub_position\030\001 \001(\0132\".bgs.protoc" + "ol.club.v1.ClubPositionB\002H\001", 1187); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "club_membership_types.proto", &protobuf_RegisterTypes); + ClubMembershipFilter::default_instance_ = new ClubMembershipFilter(); + ClubMembershipSubscribeOptions::default_instance_ = new ClubMembershipSubscribeOptions(); + ClubMembershipGetStateOptions::default_instance_ = new ClubMembershipGetStateOptions(); ClubMembershipDescription::default_instance_ = new ClubMembershipDescription(); ClubMembershipState::default_instance_ = new ClubMembershipState(); ClubPosition::default_instance_ = new ClubPosition(); ClubSharedSettings::default_instance_ = new ClubSharedSettings(); ClubSharedSettingsOptions::default_instance_ = new ClubSharedSettingsOptions(); ClubSharedSettingsAssignment::default_instance_ = new ClubSharedSettingsAssignment(); + ClubMembershipFilter::default_instance_->InitAsDefaultInstance(); + ClubMembershipSubscribeOptions::default_instance_->InitAsDefaultInstance(); + ClubMembershipGetStateOptions::default_instance_->InitAsDefaultInstance(); ClubMembershipDescription::default_instance_->InitAsDefaultInstance(); ClubMembershipState::default_instance_->InitAsDefaultInstance(); ClubPosition::default_instance_->InitAsDefaultInstance(); @@ -249,6 +332,722 @@ struct StaticDescriptorInitializer_club_5fmembership_5ftypes_2eproto { // =================================================================== #ifndef _MSC_VER +const int ClubMembershipFilter::kMemberIdFieldNumber; +const int ClubMembershipFilter::kTypeFieldNumber; +#endif // !_MSC_VER + +ClubMembershipFilter::ClubMembershipFilter() + : ::google::protobuf::Message() { + SharedCtor(); + // @@protoc_insertion_point(constructor:bgs.protocol.club.v1.ClubMembershipFilter) +} + +void ClubMembershipFilter::InitAsDefaultInstance() { + member_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); + type_ = const_cast< ::bgs::protocol::club::v1::UniqueClubType*>(&::bgs::protocol::club::v1::UniqueClubType::default_instance()); +} + +ClubMembershipFilter::ClubMembershipFilter(const ClubMembershipFilter& from) + : ::google::protobuf::Message() { + SharedCtor(); + MergeFrom(from); + // @@protoc_insertion_point(copy_constructor:bgs.protocol.club.v1.ClubMembershipFilter) +} + +void ClubMembershipFilter::SharedCtor() { + _cached_size_ = 0; + member_id_ = NULL; + type_ = NULL; + ::memset(_has_bits_, 0, sizeof(_has_bits_)); +} + +ClubMembershipFilter::~ClubMembershipFilter() { + // @@protoc_insertion_point(destructor:bgs.protocol.club.v1.ClubMembershipFilter) + SharedDtor(); +} + +void ClubMembershipFilter::SharedDtor() { + if (this != default_instance_) { + delete member_id_; + delete type_; + } +} + +void ClubMembershipFilter::SetCachedSize(int size) const { + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); +} +const ::google::protobuf::Descriptor* ClubMembershipFilter::descriptor() { + protobuf_AssignDescriptorsOnce(); + return ClubMembershipFilter_descriptor_; +} + +const ClubMembershipFilter& ClubMembershipFilter::default_instance() { + if (default_instance_ == NULL) protobuf_AddDesc_club_5fmembership_5ftypes_2eproto(); + return *default_instance_; +} + +ClubMembershipFilter* ClubMembershipFilter::default_instance_ = NULL; + +ClubMembershipFilter* ClubMembershipFilter::New() const { + return new ClubMembershipFilter; +} + +void ClubMembershipFilter::Clear() { + if (_has_bits_[0 / 32] & 3) { + if (has_member_id()) { + if (member_id_ != NULL) member_id_->::bgs::protocol::club::v1::MemberId::Clear(); + } + if (has_type()) { + if (type_ != NULL) type_->::bgs::protocol::club::v1::UniqueClubType::Clear(); + } + } + ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); +} + +bool ClubMembershipFilter::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:bgs.protocol.club.v1.ClubMembershipFilter) + for (;;) { + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // optional .bgs.protocol.club.v1.MemberId member_id = 1; + case 1: { + if (tag == 10) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_member_id())); + } else { + goto handle_unusual; + } + if (input->ExpectTag(18)) goto parse_type; + break; + } + + // optional .bgs.protocol.club.v1.UniqueClubType type = 2; + case 2: { + if (tag == 18) { + parse_type: + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_type())); + } else { + goto handle_unusual; + } + if (input->ExpectAtEnd()) goto success; + break; + } + + default: { + handle_unusual: + if (tag == 0 || + ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:bgs.protocol.club.v1.ClubMembershipFilter) + return true; +failure: + // @@protoc_insertion_point(parse_failure:bgs.protocol.club.v1.ClubMembershipFilter) + return false; +#undef DO_ +} + +void ClubMembershipFilter::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:bgs.protocol.club.v1.ClubMembershipFilter) + // optional .bgs.protocol.club.v1.MemberId member_id = 1; + if (has_member_id()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, this->member_id(), output); + } + + // optional .bgs.protocol.club.v1.UniqueClubType type = 2; + if (has_type()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 2, this->type(), output); + } + + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:bgs.protocol.club.v1.ClubMembershipFilter) +} + +::google::protobuf::uint8* ClubMembershipFilter::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.club.v1.ClubMembershipFilter) + // optional .bgs.protocol.club.v1.MemberId member_id = 1; + if (has_member_id()) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 1, this->member_id(), target); + } + + // optional .bgs.protocol.club.v1.UniqueClubType type = 2; + if (has_type()) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 2, this->type(), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.club.v1.ClubMembershipFilter) + return target; +} + +int ClubMembershipFilter::ByteSize() const { + int total_size = 0; + + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { + // optional .bgs.protocol.club.v1.MemberId member_id = 1; + if (has_member_id()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->member_id()); + } + + // optional .bgs.protocol.club.v1.UniqueClubType type = 2; + if (has_type()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->type()); + } + + } + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = total_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} + +void ClubMembershipFilter::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const ClubMembershipFilter* source = + ::google::protobuf::internal::dynamic_cast_if_available<const ClubMembershipFilter*>( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } +} + +void ClubMembershipFilter::MergeFrom(const ClubMembershipFilter& from) { + GOOGLE_CHECK_NE(&from, this); + if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from.has_member_id()) { + mutable_member_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.member_id()); + } + if (from.has_type()) { + mutable_type()->::bgs::protocol::club::v1::UniqueClubType::MergeFrom(from.type()); + } + } + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void ClubMembershipFilter::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void ClubMembershipFilter::CopyFrom(const ClubMembershipFilter& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool ClubMembershipFilter::IsInitialized() const { + + if (has_member_id()) { + if (!this->member_id().IsInitialized()) return false; + } + return true; +} + +void ClubMembershipFilter::Swap(ClubMembershipFilter* other) { + if (other != this) { + std::swap(member_id_, other->member_id_); + std::swap(type_, other->type_); + std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); + std::swap(_cached_size_, other->_cached_size_); + } +} + +::google::protobuf::Metadata ClubMembershipFilter::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = ClubMembershipFilter_descriptor_; + metadata.reflection = ClubMembershipFilter_reflection_; + return metadata; +} + + +// =================================================================== + +#ifndef _MSC_VER +const int ClubMembershipSubscribeOptions::kFilterFieldNumber; +#endif // !_MSC_VER + +ClubMembershipSubscribeOptions::ClubMembershipSubscribeOptions() + : ::google::protobuf::Message() { + SharedCtor(); + // @@protoc_insertion_point(constructor:bgs.protocol.club.v1.ClubMembershipSubscribeOptions) +} + +void ClubMembershipSubscribeOptions::InitAsDefaultInstance() { +} + +ClubMembershipSubscribeOptions::ClubMembershipSubscribeOptions(const ClubMembershipSubscribeOptions& from) + : ::google::protobuf::Message() { + SharedCtor(); + MergeFrom(from); + // @@protoc_insertion_point(copy_constructor:bgs.protocol.club.v1.ClubMembershipSubscribeOptions) +} + +void ClubMembershipSubscribeOptions::SharedCtor() { + _cached_size_ = 0; + ::memset(_has_bits_, 0, sizeof(_has_bits_)); +} + +ClubMembershipSubscribeOptions::~ClubMembershipSubscribeOptions() { + // @@protoc_insertion_point(destructor:bgs.protocol.club.v1.ClubMembershipSubscribeOptions) + SharedDtor(); +} + +void ClubMembershipSubscribeOptions::SharedDtor() { + if (this != default_instance_) { + } +} + +void ClubMembershipSubscribeOptions::SetCachedSize(int size) const { + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); +} +const ::google::protobuf::Descriptor* ClubMembershipSubscribeOptions::descriptor() { + protobuf_AssignDescriptorsOnce(); + return ClubMembershipSubscribeOptions_descriptor_; +} + +const ClubMembershipSubscribeOptions& ClubMembershipSubscribeOptions::default_instance() { + if (default_instance_ == NULL) protobuf_AddDesc_club_5fmembership_5ftypes_2eproto(); + return *default_instance_; +} + +ClubMembershipSubscribeOptions* ClubMembershipSubscribeOptions::default_instance_ = NULL; + +ClubMembershipSubscribeOptions* ClubMembershipSubscribeOptions::New() const { + return new ClubMembershipSubscribeOptions; +} + +void ClubMembershipSubscribeOptions::Clear() { + filter_.Clear(); + ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); +} + +bool ClubMembershipSubscribeOptions::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:bgs.protocol.club.v1.ClubMembershipSubscribeOptions) + for (;;) { + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // repeated .bgs.protocol.club.v1.ClubMembershipFilter filter = 1; + case 1: { + if (tag == 10) { + parse_filter: + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, add_filter())); + } else { + goto handle_unusual; + } + if (input->ExpectTag(10)) goto parse_filter; + if (input->ExpectAtEnd()) goto success; + break; + } + + default: { + handle_unusual: + if (tag == 0 || + ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:bgs.protocol.club.v1.ClubMembershipSubscribeOptions) + return true; +failure: + // @@protoc_insertion_point(parse_failure:bgs.protocol.club.v1.ClubMembershipSubscribeOptions) + return false; +#undef DO_ +} + +void ClubMembershipSubscribeOptions::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:bgs.protocol.club.v1.ClubMembershipSubscribeOptions) + // repeated .bgs.protocol.club.v1.ClubMembershipFilter filter = 1; + for (int i = 0; i < this->filter_size(); i++) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, this->filter(i), output); + } + + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:bgs.protocol.club.v1.ClubMembershipSubscribeOptions) +} + +::google::protobuf::uint8* ClubMembershipSubscribeOptions::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.club.v1.ClubMembershipSubscribeOptions) + // repeated .bgs.protocol.club.v1.ClubMembershipFilter filter = 1; + for (int i = 0; i < this->filter_size(); i++) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 1, this->filter(i), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.club.v1.ClubMembershipSubscribeOptions) + return target; +} + +int ClubMembershipSubscribeOptions::ByteSize() const { + int total_size = 0; + + // repeated .bgs.protocol.club.v1.ClubMembershipFilter filter = 1; + total_size += 1 * this->filter_size(); + for (int i = 0; i < this->filter_size(); i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->filter(i)); + } + + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = total_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} + +void ClubMembershipSubscribeOptions::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const ClubMembershipSubscribeOptions* source = + ::google::protobuf::internal::dynamic_cast_if_available<const ClubMembershipSubscribeOptions*>( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } +} + +void ClubMembershipSubscribeOptions::MergeFrom(const ClubMembershipSubscribeOptions& from) { + GOOGLE_CHECK_NE(&from, this); + filter_.MergeFrom(from.filter_); + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void ClubMembershipSubscribeOptions::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void ClubMembershipSubscribeOptions::CopyFrom(const ClubMembershipSubscribeOptions& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool ClubMembershipSubscribeOptions::IsInitialized() const { + + if (!::google::protobuf::internal::AllAreInitialized(this->filter())) return false; + return true; +} + +void ClubMembershipSubscribeOptions::Swap(ClubMembershipSubscribeOptions* other) { + if (other != this) { + filter_.Swap(&other->filter_); + std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); + std::swap(_cached_size_, other->_cached_size_); + } +} + +::google::protobuf::Metadata ClubMembershipSubscribeOptions::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = ClubMembershipSubscribeOptions_descriptor_; + metadata.reflection = ClubMembershipSubscribeOptions_reflection_; + return metadata; +} + + +// =================================================================== + +#ifndef _MSC_VER +const int ClubMembershipGetStateOptions::kFilterFieldNumber; +#endif // !_MSC_VER + +ClubMembershipGetStateOptions::ClubMembershipGetStateOptions() + : ::google::protobuf::Message() { + SharedCtor(); + // @@protoc_insertion_point(constructor:bgs.protocol.club.v1.ClubMembershipGetStateOptions) +} + +void ClubMembershipGetStateOptions::InitAsDefaultInstance() { +} + +ClubMembershipGetStateOptions::ClubMembershipGetStateOptions(const ClubMembershipGetStateOptions& from) + : ::google::protobuf::Message() { + SharedCtor(); + MergeFrom(from); + // @@protoc_insertion_point(copy_constructor:bgs.protocol.club.v1.ClubMembershipGetStateOptions) +} + +void ClubMembershipGetStateOptions::SharedCtor() { + _cached_size_ = 0; + ::memset(_has_bits_, 0, sizeof(_has_bits_)); +} + +ClubMembershipGetStateOptions::~ClubMembershipGetStateOptions() { + // @@protoc_insertion_point(destructor:bgs.protocol.club.v1.ClubMembershipGetStateOptions) + SharedDtor(); +} + +void ClubMembershipGetStateOptions::SharedDtor() { + if (this != default_instance_) { + } +} + +void ClubMembershipGetStateOptions::SetCachedSize(int size) const { + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); +} +const ::google::protobuf::Descriptor* ClubMembershipGetStateOptions::descriptor() { + protobuf_AssignDescriptorsOnce(); + return ClubMembershipGetStateOptions_descriptor_; +} + +const ClubMembershipGetStateOptions& ClubMembershipGetStateOptions::default_instance() { + if (default_instance_ == NULL) protobuf_AddDesc_club_5fmembership_5ftypes_2eproto(); + return *default_instance_; +} + +ClubMembershipGetStateOptions* ClubMembershipGetStateOptions::default_instance_ = NULL; + +ClubMembershipGetStateOptions* ClubMembershipGetStateOptions::New() const { + return new ClubMembershipGetStateOptions; +} + +void ClubMembershipGetStateOptions::Clear() { + filter_.Clear(); + ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); +} + +bool ClubMembershipGetStateOptions::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:bgs.protocol.club.v1.ClubMembershipGetStateOptions) + for (;;) { + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // repeated .bgs.protocol.club.v1.ClubMembershipFilter filter = 1; + case 1: { + if (tag == 10) { + parse_filter: + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, add_filter())); + } else { + goto handle_unusual; + } + if (input->ExpectTag(10)) goto parse_filter; + if (input->ExpectAtEnd()) goto success; + break; + } + + default: { + handle_unusual: + if (tag == 0 || + ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:bgs.protocol.club.v1.ClubMembershipGetStateOptions) + return true; +failure: + // @@protoc_insertion_point(parse_failure:bgs.protocol.club.v1.ClubMembershipGetStateOptions) + return false; +#undef DO_ +} + +void ClubMembershipGetStateOptions::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:bgs.protocol.club.v1.ClubMembershipGetStateOptions) + // repeated .bgs.protocol.club.v1.ClubMembershipFilter filter = 1; + for (int i = 0; i < this->filter_size(); i++) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, this->filter(i), output); + } + + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:bgs.protocol.club.v1.ClubMembershipGetStateOptions) +} + +::google::protobuf::uint8* ClubMembershipGetStateOptions::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.club.v1.ClubMembershipGetStateOptions) + // repeated .bgs.protocol.club.v1.ClubMembershipFilter filter = 1; + for (int i = 0; i < this->filter_size(); i++) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 1, this->filter(i), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.club.v1.ClubMembershipGetStateOptions) + return target; +} + +int ClubMembershipGetStateOptions::ByteSize() const { + int total_size = 0; + + // repeated .bgs.protocol.club.v1.ClubMembershipFilter filter = 1; + total_size += 1 * this->filter_size(); + for (int i = 0; i < this->filter_size(); i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->filter(i)); + } + + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = total_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} + +void ClubMembershipGetStateOptions::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const ClubMembershipGetStateOptions* source = + ::google::protobuf::internal::dynamic_cast_if_available<const ClubMembershipGetStateOptions*>( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } +} + +void ClubMembershipGetStateOptions::MergeFrom(const ClubMembershipGetStateOptions& from) { + GOOGLE_CHECK_NE(&from, this); + filter_.MergeFrom(from.filter_); + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void ClubMembershipGetStateOptions::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void ClubMembershipGetStateOptions::CopyFrom(const ClubMembershipGetStateOptions& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool ClubMembershipGetStateOptions::IsInitialized() const { + + if (!::google::protobuf::internal::AllAreInitialized(this->filter())) return false; + return true; +} + +void ClubMembershipGetStateOptions::Swap(ClubMembershipGetStateOptions* other) { + if (other != this) { + filter_.Swap(&other->filter_); + std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); + std::swap(_cached_size_, other->_cached_size_); + } +} + +::google::protobuf::Metadata ClubMembershipGetStateOptions::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = ClubMembershipGetStateOptions_descriptor_; + metadata.reflection = ClubMembershipGetStateOptions_reflection_; + return metadata; +} + + +// =================================================================== + +#ifndef _MSC_VER const int ClubMembershipDescription::kMemberIdFieldNumber; const int ClubMembershipDescription::kClubFieldNumber; #endif // !_MSC_VER diff --git a/src/server/proto/Client/club_membership_types.pb.h b/src/server/proto/Client/club_membership_types.pb.h index ef7197b1dc1..8720b94ddad 100644 --- a/src/server/proto/Client/club_membership_types.pb.h +++ b/src/server/proto/Client/club_membership_types.pb.h @@ -28,6 +28,7 @@ #include "club_member.pb.h" #include "club_invitation.pb.h" #include "event_view_types.pb.h" +#include "rpc_types.pb.h" #include "Define.h" // for TC_PROTO_API // @@protoc_insertion_point(includes) @@ -41,6 +42,9 @@ void TC_PROTO_API protobuf_AddDesc_club_5fmembership_5ftypes_2eproto(); void protobuf_AssignDesc_club_5fmembership_5ftypes_2eproto(); void protobuf_ShutdownFile_club_5fmembership_5ftypes_2eproto(); +class ClubMembershipFilter; +class ClubMembershipSubscribeOptions; +class ClubMembershipGetStateOptions; class ClubMembershipDescription; class ClubMembershipState; class ClubPosition; @@ -50,6 +54,263 @@ class ClubSharedSettingsAssignment; // =================================================================== +class TC_PROTO_API ClubMembershipFilter : public ::google::protobuf::Message { + public: + ClubMembershipFilter(); + virtual ~ClubMembershipFilter(); + + ClubMembershipFilter(const ClubMembershipFilter& from); + + inline ClubMembershipFilter& operator=(const ClubMembershipFilter& from) { + CopyFrom(from); + return *this; + } + + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); + static const ClubMembershipFilter& default_instance(); + + void Swap(ClubMembershipFilter* other); + + // implements Message ---------------------------------------------- + + ClubMembershipFilter* New() const; + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); + void CopyFrom(const ClubMembershipFilter& from); + void MergeFrom(const ClubMembershipFilter& from); + void Clear(); + bool IsInitialized() const; + + int ByteSize() const; + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input); + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; + int GetCachedSize() const { return _cached_size_; } + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const; + public: + ::google::protobuf::Metadata GetMetadata() const; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // optional .bgs.protocol.club.v1.MemberId member_id = 1; + inline bool has_member_id() const; + inline void clear_member_id(); + static const int kMemberIdFieldNumber = 1; + inline const ::bgs::protocol::club::v1::MemberId& member_id() const; + inline ::bgs::protocol::club::v1::MemberId* mutable_member_id(); + inline ::bgs::protocol::club::v1::MemberId* release_member_id(); + inline void set_allocated_member_id(::bgs::protocol::club::v1::MemberId* member_id); + + // optional .bgs.protocol.club.v1.UniqueClubType type = 2; + inline bool has_type() const; + inline void clear_type(); + static const int kTypeFieldNumber = 2; + inline const ::bgs::protocol::club::v1::UniqueClubType& type() const; + inline ::bgs::protocol::club::v1::UniqueClubType* mutable_type(); + inline ::bgs::protocol::club::v1::UniqueClubType* release_type(); + inline void set_allocated_type(::bgs::protocol::club::v1::UniqueClubType* type); + + // @@protoc_insertion_point(class_scope:bgs.protocol.club.v1.ClubMembershipFilter) + private: + inline void set_has_member_id(); + inline void clear_has_member_id(); + inline void set_has_type(); + inline void clear_has_type(); + + ::google::protobuf::UnknownFieldSet _unknown_fields_; + + ::google::protobuf::uint32 _has_bits_[1]; + mutable int _cached_size_; + ::bgs::protocol::club::v1::MemberId* member_id_; + ::bgs::protocol::club::v1::UniqueClubType* type_; + friend void TC_PROTO_API protobuf_AddDesc_club_5fmembership_5ftypes_2eproto(); + friend void protobuf_AssignDesc_club_5fmembership_5ftypes_2eproto(); + friend void protobuf_ShutdownFile_club_5fmembership_5ftypes_2eproto(); + + void InitAsDefaultInstance(); + static ClubMembershipFilter* default_instance_; +}; +// ------------------------------------------------------------------- + +class TC_PROTO_API ClubMembershipSubscribeOptions : public ::google::protobuf::Message { + public: + ClubMembershipSubscribeOptions(); + virtual ~ClubMembershipSubscribeOptions(); + + ClubMembershipSubscribeOptions(const ClubMembershipSubscribeOptions& from); + + inline ClubMembershipSubscribeOptions& operator=(const ClubMembershipSubscribeOptions& from) { + CopyFrom(from); + return *this; + } + + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); + static const ClubMembershipSubscribeOptions& default_instance(); + + void Swap(ClubMembershipSubscribeOptions* other); + + // implements Message ---------------------------------------------- + + ClubMembershipSubscribeOptions* New() const; + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); + void CopyFrom(const ClubMembershipSubscribeOptions& from); + void MergeFrom(const ClubMembershipSubscribeOptions& from); + void Clear(); + bool IsInitialized() const; + + int ByteSize() const; + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input); + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; + int GetCachedSize() const { return _cached_size_; } + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const; + public: + ::google::protobuf::Metadata GetMetadata() const; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // repeated .bgs.protocol.club.v1.ClubMembershipFilter filter = 1; + inline int filter_size() const; + inline void clear_filter(); + static const int kFilterFieldNumber = 1; + inline const ::bgs::protocol::club::v1::ClubMembershipFilter& filter(int index) const; + inline ::bgs::protocol::club::v1::ClubMembershipFilter* mutable_filter(int index); + inline ::bgs::protocol::club::v1::ClubMembershipFilter* add_filter(); + inline const ::google::protobuf::RepeatedPtrField< ::bgs::protocol::club::v1::ClubMembershipFilter >& + filter() const; + inline ::google::protobuf::RepeatedPtrField< ::bgs::protocol::club::v1::ClubMembershipFilter >* + mutable_filter(); + + // @@protoc_insertion_point(class_scope:bgs.protocol.club.v1.ClubMembershipSubscribeOptions) + private: + + ::google::protobuf::UnknownFieldSet _unknown_fields_; + + ::google::protobuf::uint32 _has_bits_[1]; + mutable int _cached_size_; + ::google::protobuf::RepeatedPtrField< ::bgs::protocol::club::v1::ClubMembershipFilter > filter_; + friend void TC_PROTO_API protobuf_AddDesc_club_5fmembership_5ftypes_2eproto(); + friend void protobuf_AssignDesc_club_5fmembership_5ftypes_2eproto(); + friend void protobuf_ShutdownFile_club_5fmembership_5ftypes_2eproto(); + + void InitAsDefaultInstance(); + static ClubMembershipSubscribeOptions* default_instance_; +}; +// ------------------------------------------------------------------- + +class TC_PROTO_API ClubMembershipGetStateOptions : public ::google::protobuf::Message { + public: + ClubMembershipGetStateOptions(); + virtual ~ClubMembershipGetStateOptions(); + + ClubMembershipGetStateOptions(const ClubMembershipGetStateOptions& from); + + inline ClubMembershipGetStateOptions& operator=(const ClubMembershipGetStateOptions& from) { + CopyFrom(from); + return *this; + } + + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); + static const ClubMembershipGetStateOptions& default_instance(); + + void Swap(ClubMembershipGetStateOptions* other); + + // implements Message ---------------------------------------------- + + ClubMembershipGetStateOptions* New() const; + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); + void CopyFrom(const ClubMembershipGetStateOptions& from); + void MergeFrom(const ClubMembershipGetStateOptions& from); + void Clear(); + bool IsInitialized() const; + + int ByteSize() const; + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input); + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; + int GetCachedSize() const { return _cached_size_; } + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const; + public: + ::google::protobuf::Metadata GetMetadata() const; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // repeated .bgs.protocol.club.v1.ClubMembershipFilter filter = 1; + inline int filter_size() const; + inline void clear_filter(); + static const int kFilterFieldNumber = 1; + inline const ::bgs::protocol::club::v1::ClubMembershipFilter& filter(int index) const; + inline ::bgs::protocol::club::v1::ClubMembershipFilter* mutable_filter(int index); + inline ::bgs::protocol::club::v1::ClubMembershipFilter* add_filter(); + inline const ::google::protobuf::RepeatedPtrField< ::bgs::protocol::club::v1::ClubMembershipFilter >& + filter() const; + inline ::google::protobuf::RepeatedPtrField< ::bgs::protocol::club::v1::ClubMembershipFilter >* + mutable_filter(); + + // @@protoc_insertion_point(class_scope:bgs.protocol.club.v1.ClubMembershipGetStateOptions) + private: + + ::google::protobuf::UnknownFieldSet _unknown_fields_; + + ::google::protobuf::uint32 _has_bits_[1]; + mutable int _cached_size_; + ::google::protobuf::RepeatedPtrField< ::bgs::protocol::club::v1::ClubMembershipFilter > filter_; + friend void TC_PROTO_API protobuf_AddDesc_club_5fmembership_5ftypes_2eproto(); + friend void protobuf_AssignDesc_club_5fmembership_5ftypes_2eproto(); + friend void protobuf_ShutdownFile_club_5fmembership_5ftypes_2eproto(); + + void InitAsDefaultInstance(); + static ClubMembershipGetStateOptions* default_instance_; +}; +// ------------------------------------------------------------------- + class TC_PROTO_API ClubMembershipDescription : public ::google::protobuf::Message { public: ClubMembershipDescription(); @@ -594,6 +855,160 @@ class TC_PROTO_API ClubSharedSettingsAssignment : public ::google::protobuf::Mes // =================================================================== +// ClubMembershipFilter + +// optional .bgs.protocol.club.v1.MemberId member_id = 1; +inline bool ClubMembershipFilter::has_member_id() const { + return (_has_bits_[0] & 0x00000001u) != 0; +} +inline void ClubMembershipFilter::set_has_member_id() { + _has_bits_[0] |= 0x00000001u; +} +inline void ClubMembershipFilter::clear_has_member_id() { + _has_bits_[0] &= ~0x00000001u; +} +inline void ClubMembershipFilter::clear_member_id() { + if (member_id_ != NULL) member_id_->::bgs::protocol::club::v1::MemberId::Clear(); + clear_has_member_id(); +} +inline const ::bgs::protocol::club::v1::MemberId& ClubMembershipFilter::member_id() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.ClubMembershipFilter.member_id) + return member_id_ != NULL ? *member_id_ : *default_instance_->member_id_; +} +inline ::bgs::protocol::club::v1::MemberId* ClubMembershipFilter::mutable_member_id() { + set_has_member_id(); + if (member_id_ == NULL) member_id_ = new ::bgs::protocol::club::v1::MemberId; + // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.ClubMembershipFilter.member_id) + return member_id_; +} +inline ::bgs::protocol::club::v1::MemberId* ClubMembershipFilter::release_member_id() { + clear_has_member_id(); + ::bgs::protocol::club::v1::MemberId* temp = member_id_; + member_id_ = NULL; + return temp; +} +inline void ClubMembershipFilter::set_allocated_member_id(::bgs::protocol::club::v1::MemberId* member_id) { + delete member_id_; + member_id_ = member_id; + if (member_id) { + set_has_member_id(); + } else { + clear_has_member_id(); + } + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.ClubMembershipFilter.member_id) +} + +// optional .bgs.protocol.club.v1.UniqueClubType type = 2; +inline bool ClubMembershipFilter::has_type() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +inline void ClubMembershipFilter::set_has_type() { + _has_bits_[0] |= 0x00000002u; +} +inline void ClubMembershipFilter::clear_has_type() { + _has_bits_[0] &= ~0x00000002u; +} +inline void ClubMembershipFilter::clear_type() { + if (type_ != NULL) type_->::bgs::protocol::club::v1::UniqueClubType::Clear(); + clear_has_type(); +} +inline const ::bgs::protocol::club::v1::UniqueClubType& ClubMembershipFilter::type() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.ClubMembershipFilter.type) + return type_ != NULL ? *type_ : *default_instance_->type_; +} +inline ::bgs::protocol::club::v1::UniqueClubType* ClubMembershipFilter::mutable_type() { + set_has_type(); + if (type_ == NULL) type_ = new ::bgs::protocol::club::v1::UniqueClubType; + // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.ClubMembershipFilter.type) + return type_; +} +inline ::bgs::protocol::club::v1::UniqueClubType* ClubMembershipFilter::release_type() { + clear_has_type(); + ::bgs::protocol::club::v1::UniqueClubType* temp = type_; + type_ = NULL; + return temp; +} +inline void ClubMembershipFilter::set_allocated_type(::bgs::protocol::club::v1::UniqueClubType* type) { + delete type_; + type_ = type; + if (type) { + set_has_type(); + } else { + clear_has_type(); + } + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.ClubMembershipFilter.type) +} + +// ------------------------------------------------------------------- + +// ClubMembershipSubscribeOptions + +// repeated .bgs.protocol.club.v1.ClubMembershipFilter filter = 1; +inline int ClubMembershipSubscribeOptions::filter_size() const { + return filter_.size(); +} +inline void ClubMembershipSubscribeOptions::clear_filter() { + filter_.Clear(); +} +inline const ::bgs::protocol::club::v1::ClubMembershipFilter& ClubMembershipSubscribeOptions::filter(int index) const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.ClubMembershipSubscribeOptions.filter) + return filter_.Get(index); +} +inline ::bgs::protocol::club::v1::ClubMembershipFilter* ClubMembershipSubscribeOptions::mutable_filter(int index) { + // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.ClubMembershipSubscribeOptions.filter) + return filter_.Mutable(index); +} +inline ::bgs::protocol::club::v1::ClubMembershipFilter* ClubMembershipSubscribeOptions::add_filter() { + // @@protoc_insertion_point(field_add:bgs.protocol.club.v1.ClubMembershipSubscribeOptions.filter) + return filter_.Add(); +} +inline const ::google::protobuf::RepeatedPtrField< ::bgs::protocol::club::v1::ClubMembershipFilter >& +ClubMembershipSubscribeOptions::filter() const { + // @@protoc_insertion_point(field_list:bgs.protocol.club.v1.ClubMembershipSubscribeOptions.filter) + return filter_; +} +inline ::google::protobuf::RepeatedPtrField< ::bgs::protocol::club::v1::ClubMembershipFilter >* +ClubMembershipSubscribeOptions::mutable_filter() { + // @@protoc_insertion_point(field_mutable_list:bgs.protocol.club.v1.ClubMembershipSubscribeOptions.filter) + return &filter_; +} + +// ------------------------------------------------------------------- + +// ClubMembershipGetStateOptions + +// repeated .bgs.protocol.club.v1.ClubMembershipFilter filter = 1; +inline int ClubMembershipGetStateOptions::filter_size() const { + return filter_.size(); +} +inline void ClubMembershipGetStateOptions::clear_filter() { + filter_.Clear(); +} +inline const ::bgs::protocol::club::v1::ClubMembershipFilter& ClubMembershipGetStateOptions::filter(int index) const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.ClubMembershipGetStateOptions.filter) + return filter_.Get(index); +} +inline ::bgs::protocol::club::v1::ClubMembershipFilter* ClubMembershipGetStateOptions::mutable_filter(int index) { + // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.ClubMembershipGetStateOptions.filter) + return filter_.Mutable(index); +} +inline ::bgs::protocol::club::v1::ClubMembershipFilter* ClubMembershipGetStateOptions::add_filter() { + // @@protoc_insertion_point(field_add:bgs.protocol.club.v1.ClubMembershipGetStateOptions.filter) + return filter_.Add(); +} +inline const ::google::protobuf::RepeatedPtrField< ::bgs::protocol::club::v1::ClubMembershipFilter >& +ClubMembershipGetStateOptions::filter() const { + // @@protoc_insertion_point(field_list:bgs.protocol.club.v1.ClubMembershipGetStateOptions.filter) + return filter_; +} +inline ::google::protobuf::RepeatedPtrField< ::bgs::protocol::club::v1::ClubMembershipFilter >* +ClubMembershipGetStateOptions::mutable_filter() { + // @@protoc_insertion_point(field_mutable_list:bgs.protocol.club.v1.ClubMembershipGetStateOptions.filter) + return &filter_; +} + +// ------------------------------------------------------------------- + // ClubMembershipDescription // optional .bgs.protocol.club.v1.MemberId member_id = 1; diff --git a/src/server/proto/Client/club_notification.pb.cc b/src/server/proto/Client/club_notification.pb.cc index e2581bb9c02..286398d204e 100644 --- a/src/server/proto/Client/club_notification.pb.cc +++ b/src/server/proto/Client/club_notification.pb.cc @@ -52,6 +52,12 @@ const ::google::protobuf::internal::GeneratedMessageReflection* const ::google::protobuf::Descriptor* MemberRoleChangedNotification_descriptor_ = NULL; const ::google::protobuf::internal::GeneratedMessageReflection* MemberRoleChangedNotification_reflection_ = NULL; +const ::google::protobuf::Descriptor* InvitationAddedNotification_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + InvitationAddedNotification_reflection_ = NULL; +const ::google::protobuf::Descriptor* InvitationRemovedNotification_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + InvitationRemovedNotification_reflection_ = NULL; const ::google::protobuf::Descriptor* SuggestionAddedNotification_descriptor_ = NULL; const ::google::protobuf::internal::GeneratedMessageReflection* SuggestionAddedNotification_reflection_ = NULL; @@ -82,9 +88,6 @@ const ::google::protobuf::internal::GeneratedMessageReflection* const ::google::protobuf::Descriptor* StreamAdvanceViewTimeNotification_descriptor_ = NULL; const ::google::protobuf::internal::GeneratedMessageReflection* StreamAdvanceViewTimeNotification_reflection_ = NULL; -const ::google::protobuf::Descriptor* ClubActivityNotification_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - ClubActivityNotification_reflection_ = NULL; } // namespace @@ -96,9 +99,8 @@ void protobuf_AssignDesc_club_5fnotification_2eproto() { "club_notification.proto"); GOOGLE_CHECK(file != NULL); SubscribeNotification_descriptor_ = file->message_type(0); - static const int SubscribeNotification_offsets_[7] = { + static const int SubscribeNotification_offsets_[6] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscribeNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscribeNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscribeNotification, club_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscribeNotification, club_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscribeNotification, view_), @@ -117,9 +119,8 @@ void protobuf_AssignDesc_club_5fnotification_2eproto() { ::google::protobuf::MessageFactory::generated_factory(), sizeof(SubscribeNotification)); UnsubscribeNotification_descriptor_ = file->message_type(1); - static const int UnsubscribeNotification_offsets_[3] = { + static const int UnsubscribeNotification_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UnsubscribeNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UnsubscribeNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UnsubscribeNotification, club_id_), }; UnsubscribeNotification_reflection_ = @@ -134,9 +135,8 @@ void protobuf_AssignDesc_club_5fnotification_2eproto() { ::google::protobuf::MessageFactory::generated_factory(), sizeof(UnsubscribeNotification)); StateChangedNotification_descriptor_ = file->message_type(2); - static const int StateChangedNotification_offsets_[4] = { + static const int StateChangedNotification_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StateChangedNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StateChangedNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StateChangedNotification, club_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StateChangedNotification, assignment_), }; @@ -152,9 +152,8 @@ void protobuf_AssignDesc_club_5fnotification_2eproto() { ::google::protobuf::MessageFactory::generated_factory(), sizeof(StateChangedNotification)); SettingsChangedNotification_descriptor_ = file->message_type(3); - static const int SettingsChangedNotification_offsets_[4] = { + static const int SettingsChangedNotification_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SettingsChangedNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SettingsChangedNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SettingsChangedNotification, club_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SettingsChangedNotification, assignment_), }; @@ -170,9 +169,8 @@ void protobuf_AssignDesc_club_5fnotification_2eproto() { ::google::protobuf::MessageFactory::generated_factory(), sizeof(SettingsChangedNotification)); MemberAddedNotification_descriptor_ = file->message_type(4); - static const int MemberAddedNotification_offsets_[4] = { + static const int MemberAddedNotification_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberAddedNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberAddedNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberAddedNotification, club_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberAddedNotification, member_), }; @@ -188,9 +186,8 @@ void protobuf_AssignDesc_club_5fnotification_2eproto() { ::google::protobuf::MessageFactory::generated_factory(), sizeof(MemberAddedNotification)); MemberRemovedNotification_descriptor_ = file->message_type(5); - static const int MemberRemovedNotification_offsets_[4] = { + static const int MemberRemovedNotification_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberRemovedNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberRemovedNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberRemovedNotification, club_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberRemovedNotification, member_), }; @@ -206,9 +203,8 @@ void protobuf_AssignDesc_club_5fnotification_2eproto() { ::google::protobuf::MessageFactory::generated_factory(), sizeof(MemberRemovedNotification)); MemberStateChangedNotification_descriptor_ = file->message_type(6); - static const int MemberStateChangedNotification_offsets_[4] = { + static const int MemberStateChangedNotification_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberStateChangedNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberStateChangedNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberStateChangedNotification, club_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberStateChangedNotification, assignment_), }; @@ -224,9 +220,8 @@ void protobuf_AssignDesc_club_5fnotification_2eproto() { ::google::protobuf::MessageFactory::generated_factory(), sizeof(MemberStateChangedNotification)); SubscriberStateChangedNotification_descriptor_ = file->message_type(7); - static const int SubscriberStateChangedNotification_offsets_[4] = { + static const int SubscriberStateChangedNotification_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscriberStateChangedNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscriberStateChangedNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscriberStateChangedNotification, club_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SubscriberStateChangedNotification, assignment_), }; @@ -242,9 +237,8 @@ void protobuf_AssignDesc_club_5fnotification_2eproto() { ::google::protobuf::MessageFactory::generated_factory(), sizeof(SubscriberStateChangedNotification)); MemberRoleChangedNotification_descriptor_ = file->message_type(8); - static const int MemberRoleChangedNotification_offsets_[4] = { + static const int MemberRoleChangedNotification_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberRoleChangedNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberRoleChangedNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberRoleChangedNotification, club_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MemberRoleChangedNotification, assignment_), }; @@ -259,10 +253,44 @@ void protobuf_AssignDesc_club_5fnotification_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(MemberRoleChangedNotification)); - SuggestionAddedNotification_descriptor_ = file->message_type(9); - static const int SuggestionAddedNotification_offsets_[4] = { + InvitationAddedNotification_descriptor_ = file->message_type(9); + static const int InvitationAddedNotification_offsets_[3] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(InvitationAddedNotification, agent_id_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(InvitationAddedNotification, club_id_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(InvitationAddedNotification, invitation_), + }; + InvitationAddedNotification_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + InvitationAddedNotification_descriptor_, + InvitationAddedNotification::default_instance_, + InvitationAddedNotification_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(InvitationAddedNotification, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(InvitationAddedNotification, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(InvitationAddedNotification)); + InvitationRemovedNotification_descriptor_ = file->message_type(10); + static const int InvitationRemovedNotification_offsets_[4] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(InvitationRemovedNotification, agent_id_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(InvitationRemovedNotification, club_id_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(InvitationRemovedNotification, invitation_id_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(InvitationRemovedNotification, reason_), + }; + InvitationRemovedNotification_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + InvitationRemovedNotification_descriptor_, + InvitationRemovedNotification::default_instance_, + InvitationRemovedNotification_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(InvitationRemovedNotification, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(InvitationRemovedNotification, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(InvitationRemovedNotification)); + SuggestionAddedNotification_descriptor_ = file->message_type(11); + static const int SuggestionAddedNotification_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SuggestionAddedNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SuggestionAddedNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SuggestionAddedNotification, club_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SuggestionAddedNotification, suggestion_), }; @@ -277,10 +305,9 @@ void protobuf_AssignDesc_club_5fnotification_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SuggestionAddedNotification)); - SuggestionRemovedNotification_descriptor_ = file->message_type(10); - static const int SuggestionRemovedNotification_offsets_[5] = { + SuggestionRemovedNotification_descriptor_ = file->message_type(12); + static const int SuggestionRemovedNotification_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SuggestionRemovedNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SuggestionRemovedNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SuggestionRemovedNotification, club_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SuggestionRemovedNotification, suggestion_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SuggestionRemovedNotification, reason_), @@ -296,10 +323,9 @@ void protobuf_AssignDesc_club_5fnotification_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SuggestionRemovedNotification)); - StreamAddedNotification_descriptor_ = file->message_type(11); - static const int StreamAddedNotification_offsets_[4] = { + StreamAddedNotification_descriptor_ = file->message_type(13); + static const int StreamAddedNotification_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamAddedNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamAddedNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamAddedNotification, club_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamAddedNotification, stream_), }; @@ -314,10 +340,9 @@ void protobuf_AssignDesc_club_5fnotification_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(StreamAddedNotification)); - StreamRemovedNotification_descriptor_ = file->message_type(12); - static const int StreamRemovedNotification_offsets_[4] = { + StreamRemovedNotification_descriptor_ = file->message_type(14); + static const int StreamRemovedNotification_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamRemovedNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamRemovedNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamRemovedNotification, club_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamRemovedNotification, stream_id_), }; @@ -332,10 +357,9 @@ void protobuf_AssignDesc_club_5fnotification_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(StreamRemovedNotification)); - StreamStateChangedNotification_descriptor_ = file->message_type(13); - static const int StreamStateChangedNotification_offsets_[5] = { + StreamStateChangedNotification_descriptor_ = file->message_type(15); + static const int StreamStateChangedNotification_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamStateChangedNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamStateChangedNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamStateChangedNotification, club_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamStateChangedNotification, stream_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamStateChangedNotification, assignment_), @@ -351,10 +375,9 @@ void protobuf_AssignDesc_club_5fnotification_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(StreamStateChangedNotification)); - StreamMessageAddedNotification_descriptor_ = file->message_type(14); - static const int StreamMessageAddedNotification_offsets_[5] = { + StreamMessageAddedNotification_descriptor_ = file->message_type(16); + static const int StreamMessageAddedNotification_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMessageAddedNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMessageAddedNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMessageAddedNotification, club_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMessageAddedNotification, stream_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMessageAddedNotification, message_), @@ -370,10 +393,9 @@ void protobuf_AssignDesc_club_5fnotification_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(StreamMessageAddedNotification)); - StreamMessageUpdatedNotification_descriptor_ = file->message_type(15); - static const int StreamMessageUpdatedNotification_offsets_[5] = { + StreamMessageUpdatedNotification_descriptor_ = file->message_type(17); + static const int StreamMessageUpdatedNotification_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMessageUpdatedNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMessageUpdatedNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMessageUpdatedNotification, club_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMessageUpdatedNotification, stream_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMessageUpdatedNotification, message_), @@ -389,10 +411,9 @@ void protobuf_AssignDesc_club_5fnotification_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(StreamMessageUpdatedNotification)); - StreamTypingIndicatorNotification_descriptor_ = file->message_type(16); - static const int StreamTypingIndicatorNotification_offsets_[5] = { + StreamTypingIndicatorNotification_descriptor_ = file->message_type(18); + static const int StreamTypingIndicatorNotification_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamTypingIndicatorNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamTypingIndicatorNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamTypingIndicatorNotification, club_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamTypingIndicatorNotification, stream_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamTypingIndicatorNotification, indicator_), @@ -408,10 +429,9 @@ void protobuf_AssignDesc_club_5fnotification_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(StreamTypingIndicatorNotification)); - StreamUnreadIndicatorNotification_descriptor_ = file->message_type(17); - static const int StreamUnreadIndicatorNotification_offsets_[4] = { + StreamUnreadIndicatorNotification_descriptor_ = file->message_type(19); + static const int StreamUnreadIndicatorNotification_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamUnreadIndicatorNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamUnreadIndicatorNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamUnreadIndicatorNotification, club_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamUnreadIndicatorNotification, event_), }; @@ -426,10 +446,9 @@ void protobuf_AssignDesc_club_5fnotification_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(StreamUnreadIndicatorNotification)); - StreamAdvanceViewTimeNotification_descriptor_ = file->message_type(18); - static const int StreamAdvanceViewTimeNotification_offsets_[4] = { + StreamAdvanceViewTimeNotification_descriptor_ = file->message_type(20); + static const int StreamAdvanceViewTimeNotification_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamAdvanceViewTimeNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamAdvanceViewTimeNotification, subscriber_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamAdvanceViewTimeNotification, club_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamAdvanceViewTimeNotification, view_), }; @@ -444,23 +463,6 @@ void protobuf_AssignDesc_club_5fnotification_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(StreamAdvanceViewTimeNotification)); - ClubActivityNotification_descriptor_ = file->message_type(19); - static const int ClubActivityNotification_offsets_[3] = { - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubActivityNotification, agent_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubActivityNotification, subscriber_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubActivityNotification, club_id_), - }; - ClubActivityNotification_reflection_ = - new ::google::protobuf::internal::GeneratedMessageReflection( - ClubActivityNotification_descriptor_, - ClubActivityNotification::default_instance_, - ClubActivityNotification_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubActivityNotification, _has_bits_[0]), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubActivityNotification, _unknown_fields_), - -1, - ::google::protobuf::DescriptorPool::generated_pool(), - ::google::protobuf::MessageFactory::generated_factory(), - sizeof(ClubActivityNotification)); } namespace { @@ -492,6 +494,10 @@ void protobuf_RegisterTypes(const ::std::string&) { ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( MemberRoleChangedNotification_descriptor_, &MemberRoleChangedNotification::default_instance()); ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + InvitationAddedNotification_descriptor_, &InvitationAddedNotification::default_instance()); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + InvitationRemovedNotification_descriptor_, &InvitationRemovedNotification::default_instance()); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( SuggestionAddedNotification_descriptor_, &SuggestionAddedNotification::default_instance()); ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( SuggestionRemovedNotification_descriptor_, &SuggestionRemovedNotification::default_instance()); @@ -511,8 +517,6 @@ void protobuf_RegisterTypes(const ::std::string&) { StreamUnreadIndicatorNotification_descriptor_, &StreamUnreadIndicatorNotification::default_instance()); ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( StreamAdvanceViewTimeNotification_descriptor_, &StreamAdvanceViewTimeNotification::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - ClubActivityNotification_descriptor_, &ClubActivityNotification::default_instance()); } } // namespace @@ -536,6 +540,10 @@ void protobuf_ShutdownFile_club_5fnotification_2eproto() { delete SubscriberStateChangedNotification_reflection_; delete MemberRoleChangedNotification::default_instance_; delete MemberRoleChangedNotification_reflection_; + delete InvitationAddedNotification::default_instance_; + delete InvitationAddedNotification_reflection_; + delete InvitationRemovedNotification::default_instance_; + delete InvitationRemovedNotification_reflection_; delete SuggestionAddedNotification::default_instance_; delete SuggestionAddedNotification_reflection_; delete SuggestionRemovedNotification::default_instance_; @@ -556,8 +564,6 @@ void protobuf_ShutdownFile_club_5fnotification_2eproto() { delete StreamUnreadIndicatorNotification_reflection_; delete StreamAdvanceViewTimeNotification::default_instance_; delete StreamAdvanceViewTimeNotification_reflection_; - delete ClubActivityNotification::default_instance_; - delete ClubActivityNotification_reflection_; } void protobuf_AddDesc_club_5fnotification_2eproto() { @@ -571,115 +577,97 @@ void protobuf_AddDesc_club_5fnotification_2eproto() { ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( "\n\027club_notification.proto\022\024bgs.protocol." "club.v1\032\020club_types.proto\032\017rpc_types.pro" - "to\"\315\002\n\025SubscribeNotification\0220\n\010agent_id" - "\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\0225" - "\n\rsubscriber_id\030\002 \001(\0132\036.bgs.protocol.clu" - "b.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\022(\n\004club\030\004" - " \001(\0132\032.bgs.protocol.club.v1.Club\022,\n\004view" - "\030\005 \001(\0132\036.bgs.protocol.club.v1.ClubView\0224" - "\n\010settings\030\n \001(\0132\".bgs.protocol.club.v1." - "ClubSettings\022,\n\006member\030\013 \001(\0132\034.bgs.proto" - "col.club.v1.Member\"\223\001\n\027UnsubscribeNotifi" - "cation\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol." - "club.v1.MemberId\0225\n\rsubscriber_id\030\002 \001(\0132" - "\036.bgs.protocol.club.v1.MemberId\022\017\n\007club_" - "id\030\003 \001(\004\"\323\001\n\030StateChangedNotification\0220\n" - "\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v1.M" - "emberId\0225\n\rsubscriber_id\030\002 \001(\0132\036.bgs.pro" - "tocol.club.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\022" - "=\n\nassignment\030\005 \001(\0132).bgs.protocol.club." - "v1.ClubStateAssignment\"\331\001\n\033SettingsChang" - "edNotification\0220\n\010agent_id\030\001 \001(\0132\036.bgs.p" - "rotocol.club.v1.MemberId\0225\n\rsubscriber_i" - "d\030\002 \001(\0132\036.bgs.protocol.club.v1.MemberId\022" - "\017\n\007club_id\030\003 \001(\004\022@\n\nassignment\030\004 \001(\0132,.b" - "gs.protocol.club.v1.ClubSettingsAssignme" - "nt\"\301\001\n\027MemberAddedNotification\0220\n\010agent_" + "to\"\226\002\n\025SubscribeNotification\0220\n\010agent_id" + "\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022\017" + "\n\007club_id\030\003 \001(\004\022(\n\004club\030\004 \001(\0132\032.bgs.prot" + "ocol.club.v1.Club\022,\n\004view\030\005 \001(\0132\036.bgs.pr" + "otocol.club.v1.ClubView\0224\n\010settings\030\n \001(" + "\0132\".bgs.protocol.club.v1.ClubSettings\022,\n" + "\006member\030\013 \001(\0132\034.bgs.protocol.club.v1.Mem" + "ber\"\\\n\027UnsubscribeNotification\0220\n\010agent_" "id\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId" - "\0225\n\rsubscriber_id\030\002 \001(\0132\036.bgs.protocol.c" - "lub.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\022,\n\006memb" - "er\030\004 \003(\0132\034.bgs.protocol.club.v1.Member\"\324" - "\001\n\031MemberRemovedNotification\0220\n\010agent_id" - "\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\0225" - "\n\rsubscriber_id\030\002 \001(\0132\036.bgs.protocol.clu" - "b.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\022=\n\006member" - "\030\004 \003(\0132-.bgs.protocol.club.v1.MemberRemo" - "vedAssignment\"\333\001\n\036MemberStateChangedNoti" + "\022\017\n\007club_id\030\003 \001(\004\"\244\001\n\030StateChangedNotifi" + "cation\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol." + "club.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\022=\n\nass" + "ignment\030\005 \001(\0132).bgs.protocol.club.v1.Clu" + "bStateAssignment:\006\202\371+\002\030\001\"\252\001\n\033SettingsCha" + "ngedNotification\0220\n\010agent_id\030\001 \001(\0132\036.bgs" + ".protocol.club.v1.MemberId\022\017\n\007club_id\030\003 " + "\001(\004\022@\n\nassignment\030\004 \001(\0132,.bgs.protocol.c" + "lub.v1.ClubSettingsAssignment:\006\202\371+\002\030\001\"\222\001" + "\n\027MemberAddedNotification\0220\n\010agent_id\030\001 " + "\001(\0132\036.bgs.protocol.club.v1.MemberId\022\017\n\007c" + "lub_id\030\003 \001(\004\022,\n\006member\030\004 \003(\0132\034.bgs.proto" + "col.club.v1.Member:\006\202\371+\002\030\001\"\245\001\n\031MemberRem" + "ovedNotification\0220\n\010agent_id\030\001 \001(\0132\036.bgs" + ".protocol.club.v1.MemberId\022\017\n\007club_id\030\003 " + "\001(\004\022=\n\006member\030\004 \003(\0132-.bgs.protocol.club." + "v1.MemberRemovedAssignment:\006\202\371+\002\030\001\"\254\001\n\036M" + "emberStateChangedNotification\0220\n\010agent_i" + "d\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022" + "\017\n\007club_id\030\003 \001(\004\022\?\n\nassignment\030\004 \003(\0132+.b" + "gs.protocol.club.v1.MemberStateAssignmen" + "t:\006\202\371+\002\030\001\"\264\001\n\"SubscriberStateChangedNoti" "fication\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protoco" - "l.club.v1.MemberId\0225\n\rsubscriber_id\030\002 \001(" - "\0132\036.bgs.protocol.club.v1.MemberId\022\017\n\007clu" - "b_id\030\003 \001(\004\022\?\n\nassignment\030\004 \003(\0132+.bgs.pro" - "tocol.club.v1.MemberStateAssignment\"\343\001\n\"" - "SubscriberStateChangedNotification\0220\n\010ag" - "ent_id\030\001 \001(\0132\036.bgs.protocol.club.v1.Memb" - "erId\0225\n\rsubscriber_id\030\002 \001(\0132\036.bgs.protoc" - "ol.club.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\022C\n\n" - "assignment\030\004 \003(\0132/.bgs.protocol.club.v1." - "SubscriberStateAssignment\"\323\001\n\035MemberRole" - "ChangedNotification\0220\n\010agent_id\030\001 \001(\0132\036." - "bgs.protocol.club.v1.MemberId\0225\n\rsubscri" - "ber_id\030\002 \001(\0132\036.bgs.protocol.club.v1.Memb" - "erId\022\017\n\007club_id\030\003 \001(\004\0228\n\nassignment\030\004 \003(" - "\0132$.bgs.protocol.club.v1.RoleAssignment\"" - "\321\001\n\033SuggestionAddedNotification\0220\n\010agent" + "l.club.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\022C\n\na" + "ssignment\030\004 \003(\0132/.bgs.protocol.club.v1.S" + "ubscriberStateAssignment:\006\202\371+\002\030\001\"\244\001\n\035Mem" + "berRoleChangedNotification\0220\n\010agent_id\030\001" + " \001(\0132\036.bgs.protocol.club.v1.MemberId\022\017\n\007" + "club_id\030\003 \001(\004\0228\n\nassignment\030\004 \003(\0132$.bgs." + "protocol.club.v1.RoleAssignment:\006\202\371+\002\030\001\"" + "\242\001\n\033InvitationAddedNotification\0220\n\010agent" "_id\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberI" - "d\0225\n\rsubscriber_id\030\002 \001(\0132\036.bgs.protocol." - "club.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\0228\n\nsug" - "gestion\030\004 \002(\0132$.bgs.protocol.club.v1.Clu" - "bSuggestion\"\347\001\n\035SuggestionRemovedNotific" - "ation\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.c" - "lub.v1.MemberId\0225\n\rsubscriber_id\030\002 \001(\0132\036" - ".bgs.protocol.club.v1.MemberId\022\017\n\007club_i" - "d\030\003 \001(\004\022\025\n\rsuggestion_id\030\004 \001(\006\0225\n\006reason" - "\030\005 \001(\0162%.bgs.protocol.SuggestionRemovedR" - "eason\"\301\001\n\027StreamAddedNotification\0220\n\010age" - "nt_id\030\001 \001(\0132\036.bgs.protocol.club.v1.Membe" - "rId\0225\n\rsubscriber_id\030\002 \001(\0132\036.bgs.protoco" - "l.club.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\022,\n\006s" - "tream\030\004 \001(\0132\034.bgs.protocol.club.v1.Strea" - "m\"\250\001\n\031StreamRemovedNotification\0220\n\010agent" - "_id\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberI" - "d\0225\n\rsubscriber_id\030\002 \001(\0132\036.bgs.protocol." - "club.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\022\021\n\tstr" - "eam_id\030\004 \001(\004\"\356\001\n\036StreamStateChangedNotif" - "ication\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol" - ".club.v1.MemberId\0225\n\rsubscriber_id\030\002 \001(\013" - "2\036.bgs.protocol.club.v1.MemberId\022\017\n\007club" - "_id\030\003 \001(\004\022\021\n\tstream_id\030\004 \001(\004\022\?\n\nassignme" - "nt\030\005 \001(\0132+.bgs.protocol.club.v1.StreamSt" - "ateAssignment\"\343\001\n\036StreamMessageAddedNoti" - "fication\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protoco" - "l.club.v1.MemberId\0225\n\rsubscriber_id\030\002 \001(" + "d\022\017\n\007club_id\030\003 \001(\004\0228\n\ninvitation\030\004 \001(\0132$" + ".bgs.protocol.club.v1.ClubInvitation:\006\202\371" + "+\002\030\001\"\270\001\n\035InvitationRemovedNotification\0220" + "\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v1." + "MemberId\022\017\n\007club_id\030\003 \001(\004\022\025\n\rinvitation_" + "id\030\004 \001(\006\0225\n\006reason\030\005 \001(\0162%.bgs.protocol." + "InvitationRemovedReason:\006\202\371+\002\030\001\"\242\001\n\033Sugg" + "estionAddedNotification\0220\n\010agent_id\030\001 \001(" "\0132\036.bgs.protocol.club.v1.MemberId\022\017\n\007clu" - "b_id\030\003 \001(\004\022\021\n\tstream_id\030\004 \001(\004\0224\n\007message" - "\030\005 \001(\0132#.bgs.protocol.club.v1.StreamMess" - "age\"\345\001\n StreamMessageUpdatedNotification" - "\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v" - "1.MemberId\0225\n\rsubscriber_id\030\002 \001(\0132\036.bgs." + "b_id\030\003 \001(\004\0228\n\nsuggestion\030\004 \001(\0132$.bgs.pro" + "tocol.club.v1.ClubSuggestion:\006\202\371+\002\030\001\"\270\001\n" + "\035SuggestionRemovedNotification\0220\n\010agent_" + "id\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId" + "\022\017\n\007club_id\030\003 \001(\004\022\025\n\rsuggestion_id\030\004 \001(\006" + "\0225\n\006reason\030\005 \001(\0162%.bgs.protocol.Suggesti" + "onRemovedReason:\006\202\371+\002\030\001\"\222\001\n\027StreamAddedN" + "otification\0220\n\010agent_id\030\001 \001(\0132\036.bgs.prot" + "ocol.club.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\022," + "\n\006stream\030\004 \001(\0132\034.bgs.protocol.club.v1.St" + "ream:\006\202\371+\002\030\001\"y\n\031StreamRemovedNotificatio" + "n\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club." + "v1.MemberId\022\017\n\007club_id\030\003 \001(\004\022\021\n\tstream_i" + "d\030\004 \001(\004:\006\202\371+\002\030\001\"\277\001\n\036StreamStateChangedNo" + "tification\0220\n\010agent_id\030\001 \001(\0132\036.bgs.proto" + "col.club.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\022\021\n" + "\tstream_id\030\004 \001(\004\022\?\n\nassignment\030\005 \001(\0132+.b" + "gs.protocol.club.v1.StreamStateAssignmen" + "t:\006\202\371+\002\030\001\"\264\001\n\036StreamMessageAddedNotifica" + "tion\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.cl" + "ub.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\022\021\n\tstrea" + "m_id\030\004 \001(\004\0224\n\007message\030\005 \001(\0132#.bgs.protoc" + "ol.club.v1.StreamMessage:\006\202\371+\002\030\001\"\266\001\n Str" + "eamMessageUpdatedNotification\0220\n\010agent_i" + "d\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022" + "\017\n\007club_id\030\003 \001(\004\022\021\n\tstream_id\030\004 \001(\004\0224\n\007m" + "essage\030\005 \001(\0132#.bgs.protocol.club.v1.Stre" + "amMessage:\006\202\371+\002\030\001\"\301\001\n!StreamTypingIndica" + "torNotification\0220\n\010agent_id\030\001 \001(\0132\036.bgs." "protocol.club.v1.MemberId\022\017\n\007club_id\030\003 \001" - "(\004\022\021\n\tstream_id\030\004 \001(\004\0224\n\007message\030\005 \001(\0132#" - ".bgs.protocol.club.v1.StreamMessage\"\360\001\n!" - "StreamTypingIndicatorNotification\0220\n\010age" - "nt_id\030\001 \001(\0132\036.bgs.protocol.club.v1.Membe" - "rId\0225\n\rsubscriber_id\030\002 \001(\0132\036.bgs.protoco" - "l.club.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\022\021\n\ts" - "tream_id\030\004 \001(\004\022>\n\tindicator\030\005 \003(\0132+.bgs." - "protocol.club.v1.StreamTypingIndicator\"\323" - "\001\n!StreamUnreadIndicatorNotification\0220\n\010" - "agent_id\030\001 \001(\0132\036.bgs.protocol.club.v1.Me" - "mberId\0225\n\rsubscriber_id\030\002 \001(\0132\036.bgs.prot" + "(\004\022\021\n\tstream_id\030\004 \001(\004\022>\n\tindicator\030\005 \003(\013" + "2+.bgs.protocol.club.v1.StreamTypingIndi" + "cator:\006\202\371+\002\030\001\"\244\001\n!StreamUnreadIndicatorN" + "otification\0220\n\010agent_id\030\001 \001(\0132\036.bgs.prot" "ocol.club.v1.MemberId\022\017\n\007club_id\030\003 \001(\004\0224" "\n\005event\030\004 \001(\0132%.bgs.protocol.club.v1.Str" - "eamEventTime\"\330\001\n!StreamAdvanceViewTimeNo" - "tification\0220\n\010agent_id\030\001 \001(\0132\036.bgs.proto" - "col.club.v1.MemberId\0225\n\rsubscriber_id\030\002 " - "\001(\0132\036.bgs.protocol.club.v1.MemberId\022\017\n\007c" - "lub_id\030\003 \001(\004\0229\n\004view\030\004 \003(\0132+.bgs.protoco" - "l.club.v1.StreamAdvanceViewTime\"\224\001\n\030Club" - "ActivityNotification\0220\n\010agent_id\030\001 \001(\0132\036" - ".bgs.protocol.club.v1.MemberId\0225\n\rsubscr" - "iber_id\030\002 \001(\0132\036.bgs.protocol.club.v1.Mem" - "berId\022\017\n\007club_id\030\003 \001(\004B\002H\001P\000P\001", 4430); + "eamEventTime:\006\202\371+\002\030\001\"\251\001\n!StreamAdvanceVi" + "ewTimeNotification\0220\n\010agent_id\030\001 \001(\0132\036.b" + "gs.protocol.club.v1.MemberId\022\017\n\007club_id\030" + "\003 \001(\004\0229\n\004view\030\004 \003(\0132+.bgs.protocol.club." + "v1.StreamAdvanceViewTime:\006\202\371+\002\030\001B\002H\001P\000P\001", 3720); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "club_notification.proto", &protobuf_RegisterTypes); SubscribeNotification::default_instance_ = new SubscribeNotification(); @@ -691,6 +679,8 @@ void protobuf_AddDesc_club_5fnotification_2eproto() { MemberStateChangedNotification::default_instance_ = new MemberStateChangedNotification(); SubscriberStateChangedNotification::default_instance_ = new SubscriberStateChangedNotification(); MemberRoleChangedNotification::default_instance_ = new MemberRoleChangedNotification(); + InvitationAddedNotification::default_instance_ = new InvitationAddedNotification(); + InvitationRemovedNotification::default_instance_ = new InvitationRemovedNotification(); SuggestionAddedNotification::default_instance_ = new SuggestionAddedNotification(); SuggestionRemovedNotification::default_instance_ = new SuggestionRemovedNotification(); StreamAddedNotification::default_instance_ = new StreamAddedNotification(); @@ -701,7 +691,6 @@ void protobuf_AddDesc_club_5fnotification_2eproto() { StreamTypingIndicatorNotification::default_instance_ = new StreamTypingIndicatorNotification(); StreamUnreadIndicatorNotification::default_instance_ = new StreamUnreadIndicatorNotification(); StreamAdvanceViewTimeNotification::default_instance_ = new StreamAdvanceViewTimeNotification(); - ClubActivityNotification::default_instance_ = new ClubActivityNotification(); SubscribeNotification::default_instance_->InitAsDefaultInstance(); UnsubscribeNotification::default_instance_->InitAsDefaultInstance(); StateChangedNotification::default_instance_->InitAsDefaultInstance(); @@ -711,6 +700,8 @@ void protobuf_AddDesc_club_5fnotification_2eproto() { MemberStateChangedNotification::default_instance_->InitAsDefaultInstance(); SubscriberStateChangedNotification::default_instance_->InitAsDefaultInstance(); MemberRoleChangedNotification::default_instance_->InitAsDefaultInstance(); + InvitationAddedNotification::default_instance_->InitAsDefaultInstance(); + InvitationRemovedNotification::default_instance_->InitAsDefaultInstance(); SuggestionAddedNotification::default_instance_->InitAsDefaultInstance(); SuggestionRemovedNotification::default_instance_->InitAsDefaultInstance(); StreamAddedNotification::default_instance_->InitAsDefaultInstance(); @@ -721,7 +712,6 @@ void protobuf_AddDesc_club_5fnotification_2eproto() { StreamTypingIndicatorNotification::default_instance_->InitAsDefaultInstance(); StreamUnreadIndicatorNotification::default_instance_->InitAsDefaultInstance(); StreamAdvanceViewTimeNotification::default_instance_->InitAsDefaultInstance(); - ClubActivityNotification::default_instance_->InitAsDefaultInstance(); ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_club_5fnotification_2eproto); } @@ -736,7 +726,6 @@ struct StaticDescriptorInitializer_club_5fnotification_2eproto { #ifndef _MSC_VER const int SubscribeNotification::kAgentIdFieldNumber; -const int SubscribeNotification::kSubscriberIdFieldNumber; const int SubscribeNotification::kClubIdFieldNumber; const int SubscribeNotification::kClubFieldNumber; const int SubscribeNotification::kViewFieldNumber; @@ -752,7 +741,6 @@ SubscribeNotification::SubscribeNotification() void SubscribeNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); club_ = const_cast< ::bgs::protocol::club::v1::Club*>(&::bgs::protocol::club::v1::Club::default_instance()); view_ = const_cast< ::bgs::protocol::club::v1::ClubView*>(&::bgs::protocol::club::v1::ClubView::default_instance()); settings_ = const_cast< ::bgs::protocol::club::v1::ClubSettings*>(&::bgs::protocol::club::v1::ClubSettings::default_instance()); @@ -769,7 +757,6 @@ SubscribeNotification::SubscribeNotification(const SubscribeNotification& from) void SubscribeNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; club_id_ = GOOGLE_ULONGLONG(0); club_ = NULL; view_ = NULL; @@ -786,7 +773,6 @@ SubscribeNotification::~SubscribeNotification() { void SubscribeNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; delete club_; delete view_; delete settings_; @@ -816,13 +802,10 @@ SubscribeNotification* SubscribeNotification::New() const { } void SubscribeNotification::Clear() { - if (_has_bits_[0 / 32] & 127) { + if (_has_bits_[0 / 32] & 63) { if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - } club_id_ = GOOGLE_ULONGLONG(0); if (has_club()) { if (club_ != NULL) club_->::bgs::protocol::club::v1::Club::Clear(); @@ -859,19 +842,6 @@ bool SubscribeNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(24)) goto parse_club_id; break; } @@ -974,12 +944,6 @@ void SubscribeNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional uint64 club_id = 3; if (has_club_id()) { ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->club_id(), output); @@ -1026,13 +990,6 @@ void SubscribeNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional uint64 club_id = 3; if (has_club_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->club_id(), target); @@ -1085,13 +1042,6 @@ int SubscribeNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional uint64 club_id = 3; if (has_club_id()) { total_size += 1 + @@ -1157,9 +1107,6 @@ void SubscribeNotification::MergeFrom(const SubscribeNotification& from) { if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.subscriber_id()); - } if (from.has_club_id()) { set_club_id(from.club_id()); } @@ -1196,9 +1143,6 @@ bool SubscribeNotification::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } if (has_club()) { if (!this->club().IsInitialized()) return false; } @@ -1211,7 +1155,6 @@ bool SubscribeNotification::IsInitialized() const { void SubscribeNotification::Swap(SubscribeNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(club_id_, other->club_id_); std::swap(club_, other->club_); std::swap(view_, other->view_); @@ -1236,7 +1179,6 @@ void SubscribeNotification::Swap(SubscribeNotification* other) { #ifndef _MSC_VER const int UnsubscribeNotification::kAgentIdFieldNumber; -const int UnsubscribeNotification::kSubscriberIdFieldNumber; const int UnsubscribeNotification::kClubIdFieldNumber; #endif // !_MSC_VER @@ -1248,7 +1190,6 @@ UnsubscribeNotification::UnsubscribeNotification() void UnsubscribeNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); } UnsubscribeNotification::UnsubscribeNotification(const UnsubscribeNotification& from) @@ -1261,7 +1202,6 @@ UnsubscribeNotification::UnsubscribeNotification(const UnsubscribeNotification& void UnsubscribeNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; club_id_ = GOOGLE_ULONGLONG(0); ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -1274,7 +1214,6 @@ UnsubscribeNotification::~UnsubscribeNotification() { void UnsubscribeNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; } } @@ -1300,13 +1239,10 @@ UnsubscribeNotification* UnsubscribeNotification::New() const { } void UnsubscribeNotification::Clear() { - if (_has_bits_[0 / 32] & 7) { + if (_has_bits_[0 / 32] & 3) { if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - } club_id_ = GOOGLE_ULONGLONG(0); } ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -1331,19 +1267,6 @@ bool UnsubscribeNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(24)) goto parse_club_id; break; } @@ -1394,12 +1317,6 @@ void UnsubscribeNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional uint64 club_id = 3; if (has_club_id()) { ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->club_id(), output); @@ -1422,13 +1339,6 @@ void UnsubscribeNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional uint64 club_id = 3; if (has_club_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->club_id(), target); @@ -1453,13 +1363,6 @@ int UnsubscribeNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional uint64 club_id = 3; if (has_club_id()) { total_size += 1 + @@ -1497,9 +1400,6 @@ void UnsubscribeNotification::MergeFrom(const UnsubscribeNotification& from) { if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.subscriber_id()); - } if (from.has_club_id()) { set_club_id(from.club_id()); } @@ -1524,16 +1424,12 @@ bool UnsubscribeNotification::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } return true; } void UnsubscribeNotification::Swap(UnsubscribeNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(club_id_, other->club_id_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); @@ -1554,7 +1450,6 @@ void UnsubscribeNotification::Swap(UnsubscribeNotification* other) { #ifndef _MSC_VER const int StateChangedNotification::kAgentIdFieldNumber; -const int StateChangedNotification::kSubscriberIdFieldNumber; const int StateChangedNotification::kClubIdFieldNumber; const int StateChangedNotification::kAssignmentFieldNumber; #endif // !_MSC_VER @@ -1567,7 +1462,6 @@ StateChangedNotification::StateChangedNotification() void StateChangedNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); assignment_ = const_cast< ::bgs::protocol::club::v1::ClubStateAssignment*>(&::bgs::protocol::club::v1::ClubStateAssignment::default_instance()); } @@ -1581,7 +1475,6 @@ StateChangedNotification::StateChangedNotification(const StateChangedNotificatio void StateChangedNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; club_id_ = GOOGLE_ULONGLONG(0); assignment_ = NULL; ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -1595,7 +1488,6 @@ StateChangedNotification::~StateChangedNotification() { void StateChangedNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; delete assignment_; } } @@ -1622,13 +1514,10 @@ StateChangedNotification* StateChangedNotification::New() const { } void StateChangedNotification::Clear() { - if (_has_bits_[0 / 32] & 15) { + if (_has_bits_[0 / 32] & 7) { if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - } club_id_ = GOOGLE_ULONGLONG(0); if (has_assignment()) { if (assignment_ != NULL) assignment_->::bgs::protocol::club::v1::ClubStateAssignment::Clear(); @@ -1656,19 +1545,6 @@ bool StateChangedNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(24)) goto parse_club_id; break; } @@ -1732,12 +1608,6 @@ void StateChangedNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional uint64 club_id = 3; if (has_club_id()) { ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->club_id(), output); @@ -1766,13 +1636,6 @@ void StateChangedNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional uint64 club_id = 3; if (has_club_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->club_id(), target); @@ -1804,13 +1667,6 @@ int StateChangedNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional uint64 club_id = 3; if (has_club_id()) { total_size += 1 + @@ -1855,9 +1711,6 @@ void StateChangedNotification::MergeFrom(const StateChangedNotification& from) { if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.subscriber_id()); - } if (from.has_club_id()) { set_club_id(from.club_id()); } @@ -1885,9 +1738,6 @@ bool StateChangedNotification::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } if (has_assignment()) { if (!this->assignment().IsInitialized()) return false; } @@ -1897,7 +1747,6 @@ bool StateChangedNotification::IsInitialized() const { void StateChangedNotification::Swap(StateChangedNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(club_id_, other->club_id_); std::swap(assignment_, other->assignment_); std::swap(_has_bits_[0], other->_has_bits_[0]); @@ -1919,7 +1768,6 @@ void StateChangedNotification::Swap(StateChangedNotification* other) { #ifndef _MSC_VER const int SettingsChangedNotification::kAgentIdFieldNumber; -const int SettingsChangedNotification::kSubscriberIdFieldNumber; const int SettingsChangedNotification::kClubIdFieldNumber; const int SettingsChangedNotification::kAssignmentFieldNumber; #endif // !_MSC_VER @@ -1932,7 +1780,6 @@ SettingsChangedNotification::SettingsChangedNotification() void SettingsChangedNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); assignment_ = const_cast< ::bgs::protocol::club::v1::ClubSettingsAssignment*>(&::bgs::protocol::club::v1::ClubSettingsAssignment::default_instance()); } @@ -1946,7 +1793,6 @@ SettingsChangedNotification::SettingsChangedNotification(const SettingsChangedNo void SettingsChangedNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; club_id_ = GOOGLE_ULONGLONG(0); assignment_ = NULL; ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -1960,7 +1806,6 @@ SettingsChangedNotification::~SettingsChangedNotification() { void SettingsChangedNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; delete assignment_; } } @@ -1987,13 +1832,10 @@ SettingsChangedNotification* SettingsChangedNotification::New() const { } void SettingsChangedNotification::Clear() { - if (_has_bits_[0 / 32] & 15) { + if (_has_bits_[0 / 32] & 7) { if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - } club_id_ = GOOGLE_ULONGLONG(0); if (has_assignment()) { if (assignment_ != NULL) assignment_->::bgs::protocol::club::v1::ClubSettingsAssignment::Clear(); @@ -2021,19 +1863,6 @@ bool SettingsChangedNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(24)) goto parse_club_id; break; } @@ -2097,12 +1926,6 @@ void SettingsChangedNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional uint64 club_id = 3; if (has_club_id()) { ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->club_id(), output); @@ -2131,13 +1954,6 @@ void SettingsChangedNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional uint64 club_id = 3; if (has_club_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->club_id(), target); @@ -2169,13 +1985,6 @@ int SettingsChangedNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional uint64 club_id = 3; if (has_club_id()) { total_size += 1 + @@ -2220,9 +2029,6 @@ void SettingsChangedNotification::MergeFrom(const SettingsChangedNotification& f if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.subscriber_id()); - } if (from.has_club_id()) { set_club_id(from.club_id()); } @@ -2250,16 +2056,12 @@ bool SettingsChangedNotification::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } return true; } void SettingsChangedNotification::Swap(SettingsChangedNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(club_id_, other->club_id_); std::swap(assignment_, other->assignment_); std::swap(_has_bits_[0], other->_has_bits_[0]); @@ -2281,7 +2083,6 @@ void SettingsChangedNotification::Swap(SettingsChangedNotification* other) { #ifndef _MSC_VER const int MemberAddedNotification::kAgentIdFieldNumber; -const int MemberAddedNotification::kSubscriberIdFieldNumber; const int MemberAddedNotification::kClubIdFieldNumber; const int MemberAddedNotification::kMemberFieldNumber; #endif // !_MSC_VER @@ -2294,7 +2095,6 @@ MemberAddedNotification::MemberAddedNotification() void MemberAddedNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); } MemberAddedNotification::MemberAddedNotification(const MemberAddedNotification& from) @@ -2307,7 +2107,6 @@ MemberAddedNotification::MemberAddedNotification(const MemberAddedNotification& void MemberAddedNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; club_id_ = GOOGLE_ULONGLONG(0); ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -2320,7 +2119,6 @@ MemberAddedNotification::~MemberAddedNotification() { void MemberAddedNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; } } @@ -2346,13 +2144,10 @@ MemberAddedNotification* MemberAddedNotification::New() const { } void MemberAddedNotification::Clear() { - if (_has_bits_[0 / 32] & 7) { + if (_has_bits_[0 / 32] & 3) { if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - } club_id_ = GOOGLE_ULONGLONG(0); } member_.Clear(); @@ -2378,19 +2173,6 @@ bool MemberAddedNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(24)) goto parse_club_id; break; } @@ -2455,12 +2237,6 @@ void MemberAddedNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional uint64 club_id = 3; if (has_club_id()) { ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->club_id(), output); @@ -2489,13 +2265,6 @@ void MemberAddedNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional uint64 club_id = 3; if (has_club_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->club_id(), target); @@ -2527,13 +2296,6 @@ int MemberAddedNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional uint64 club_id = 3; if (has_club_id()) { total_size += 1 + @@ -2580,9 +2342,6 @@ void MemberAddedNotification::MergeFrom(const MemberAddedNotification& from) { if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.subscriber_id()); - } if (from.has_club_id()) { set_club_id(from.club_id()); } @@ -2607,9 +2366,6 @@ bool MemberAddedNotification::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } if (!::google::protobuf::internal::AllAreInitialized(this->member())) return false; return true; } @@ -2617,7 +2373,6 @@ bool MemberAddedNotification::IsInitialized() const { void MemberAddedNotification::Swap(MemberAddedNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(club_id_, other->club_id_); member_.Swap(&other->member_); std::swap(_has_bits_[0], other->_has_bits_[0]); @@ -2639,7 +2394,6 @@ void MemberAddedNotification::Swap(MemberAddedNotification* other) { #ifndef _MSC_VER const int MemberRemovedNotification::kAgentIdFieldNumber; -const int MemberRemovedNotification::kSubscriberIdFieldNumber; const int MemberRemovedNotification::kClubIdFieldNumber; const int MemberRemovedNotification::kMemberFieldNumber; #endif // !_MSC_VER @@ -2652,7 +2406,6 @@ MemberRemovedNotification::MemberRemovedNotification() void MemberRemovedNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); } MemberRemovedNotification::MemberRemovedNotification(const MemberRemovedNotification& from) @@ -2665,7 +2418,6 @@ MemberRemovedNotification::MemberRemovedNotification(const MemberRemovedNotifica void MemberRemovedNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; club_id_ = GOOGLE_ULONGLONG(0); ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -2678,7 +2430,6 @@ MemberRemovedNotification::~MemberRemovedNotification() { void MemberRemovedNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; } } @@ -2704,13 +2455,10 @@ MemberRemovedNotification* MemberRemovedNotification::New() const { } void MemberRemovedNotification::Clear() { - if (_has_bits_[0 / 32] & 7) { + if (_has_bits_[0 / 32] & 3) { if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - } club_id_ = GOOGLE_ULONGLONG(0); } member_.Clear(); @@ -2736,19 +2484,6 @@ bool MemberRemovedNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(24)) goto parse_club_id; break; } @@ -2813,12 +2548,6 @@ void MemberRemovedNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional uint64 club_id = 3; if (has_club_id()) { ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->club_id(), output); @@ -2847,13 +2576,6 @@ void MemberRemovedNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional uint64 club_id = 3; if (has_club_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->club_id(), target); @@ -2885,13 +2607,6 @@ int MemberRemovedNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional uint64 club_id = 3; if (has_club_id()) { total_size += 1 + @@ -2938,9 +2653,6 @@ void MemberRemovedNotification::MergeFrom(const MemberRemovedNotification& from) if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.subscriber_id()); - } if (from.has_club_id()) { set_club_id(from.club_id()); } @@ -2965,9 +2677,6 @@ bool MemberRemovedNotification::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } if (!::google::protobuf::internal::AllAreInitialized(this->member())) return false; return true; } @@ -2975,7 +2684,6 @@ bool MemberRemovedNotification::IsInitialized() const { void MemberRemovedNotification::Swap(MemberRemovedNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(club_id_, other->club_id_); member_.Swap(&other->member_); std::swap(_has_bits_[0], other->_has_bits_[0]); @@ -2997,7 +2705,6 @@ void MemberRemovedNotification::Swap(MemberRemovedNotification* other) { #ifndef _MSC_VER const int MemberStateChangedNotification::kAgentIdFieldNumber; -const int MemberStateChangedNotification::kSubscriberIdFieldNumber; const int MemberStateChangedNotification::kClubIdFieldNumber; const int MemberStateChangedNotification::kAssignmentFieldNumber; #endif // !_MSC_VER @@ -3010,7 +2717,6 @@ MemberStateChangedNotification::MemberStateChangedNotification() void MemberStateChangedNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); } MemberStateChangedNotification::MemberStateChangedNotification(const MemberStateChangedNotification& from) @@ -3023,7 +2729,6 @@ MemberStateChangedNotification::MemberStateChangedNotification(const MemberState void MemberStateChangedNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; club_id_ = GOOGLE_ULONGLONG(0); ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -3036,7 +2741,6 @@ MemberStateChangedNotification::~MemberStateChangedNotification() { void MemberStateChangedNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; } } @@ -3062,13 +2766,10 @@ MemberStateChangedNotification* MemberStateChangedNotification::New() const { } void MemberStateChangedNotification::Clear() { - if (_has_bits_[0 / 32] & 7) { + if (_has_bits_[0 / 32] & 3) { if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - } club_id_ = GOOGLE_ULONGLONG(0); } assignment_.Clear(); @@ -3094,19 +2795,6 @@ bool MemberStateChangedNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(24)) goto parse_club_id; break; } @@ -3171,12 +2859,6 @@ void MemberStateChangedNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional uint64 club_id = 3; if (has_club_id()) { ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->club_id(), output); @@ -3205,13 +2887,6 @@ void MemberStateChangedNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional uint64 club_id = 3; if (has_club_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->club_id(), target); @@ -3243,13 +2918,6 @@ int MemberStateChangedNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional uint64 club_id = 3; if (has_club_id()) { total_size += 1 + @@ -3296,9 +2964,6 @@ void MemberStateChangedNotification::MergeFrom(const MemberStateChangedNotificat if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.subscriber_id()); - } if (from.has_club_id()) { set_club_id(from.club_id()); } @@ -3323,9 +2988,6 @@ bool MemberStateChangedNotification::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } if (!::google::protobuf::internal::AllAreInitialized(this->assignment())) return false; return true; } @@ -3333,7 +2995,6 @@ bool MemberStateChangedNotification::IsInitialized() const { void MemberStateChangedNotification::Swap(MemberStateChangedNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(club_id_, other->club_id_); assignment_.Swap(&other->assignment_); std::swap(_has_bits_[0], other->_has_bits_[0]); @@ -3355,7 +3016,6 @@ void MemberStateChangedNotification::Swap(MemberStateChangedNotification* other) #ifndef _MSC_VER const int SubscriberStateChangedNotification::kAgentIdFieldNumber; -const int SubscriberStateChangedNotification::kSubscriberIdFieldNumber; const int SubscriberStateChangedNotification::kClubIdFieldNumber; const int SubscriberStateChangedNotification::kAssignmentFieldNumber; #endif // !_MSC_VER @@ -3368,7 +3028,6 @@ SubscriberStateChangedNotification::SubscriberStateChangedNotification() void SubscriberStateChangedNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); } SubscriberStateChangedNotification::SubscriberStateChangedNotification(const SubscriberStateChangedNotification& from) @@ -3381,7 +3040,6 @@ SubscriberStateChangedNotification::SubscriberStateChangedNotification(const Sub void SubscriberStateChangedNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; club_id_ = GOOGLE_ULONGLONG(0); ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -3394,7 +3052,6 @@ SubscriberStateChangedNotification::~SubscriberStateChangedNotification() { void SubscriberStateChangedNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; } } @@ -3420,13 +3077,10 @@ SubscriberStateChangedNotification* SubscriberStateChangedNotification::New() co } void SubscriberStateChangedNotification::Clear() { - if (_has_bits_[0 / 32] & 7) { + if (_has_bits_[0 / 32] & 3) { if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - } club_id_ = GOOGLE_ULONGLONG(0); } assignment_.Clear(); @@ -3452,19 +3106,6 @@ bool SubscriberStateChangedNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(24)) goto parse_club_id; break; } @@ -3529,12 +3170,6 @@ void SubscriberStateChangedNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional uint64 club_id = 3; if (has_club_id()) { ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->club_id(), output); @@ -3563,13 +3198,6 @@ void SubscriberStateChangedNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional uint64 club_id = 3; if (has_club_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->club_id(), target); @@ -3601,13 +3229,6 @@ int SubscriberStateChangedNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional uint64 club_id = 3; if (has_club_id()) { total_size += 1 + @@ -3654,9 +3275,6 @@ void SubscriberStateChangedNotification::MergeFrom(const SubscriberStateChangedN if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.subscriber_id()); - } if (from.has_club_id()) { set_club_id(from.club_id()); } @@ -3681,9 +3299,6 @@ bool SubscriberStateChangedNotification::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } if (!::google::protobuf::internal::AllAreInitialized(this->assignment())) return false; return true; } @@ -3691,7 +3306,6 @@ bool SubscriberStateChangedNotification::IsInitialized() const { void SubscriberStateChangedNotification::Swap(SubscriberStateChangedNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(club_id_, other->club_id_); assignment_.Swap(&other->assignment_); std::swap(_has_bits_[0], other->_has_bits_[0]); @@ -3713,7 +3327,6 @@ void SubscriberStateChangedNotification::Swap(SubscriberStateChangedNotification #ifndef _MSC_VER const int MemberRoleChangedNotification::kAgentIdFieldNumber; -const int MemberRoleChangedNotification::kSubscriberIdFieldNumber; const int MemberRoleChangedNotification::kClubIdFieldNumber; const int MemberRoleChangedNotification::kAssignmentFieldNumber; #endif // !_MSC_VER @@ -3726,7 +3339,6 @@ MemberRoleChangedNotification::MemberRoleChangedNotification() void MemberRoleChangedNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); } MemberRoleChangedNotification::MemberRoleChangedNotification(const MemberRoleChangedNotification& from) @@ -3739,7 +3351,6 @@ MemberRoleChangedNotification::MemberRoleChangedNotification(const MemberRoleCha void MemberRoleChangedNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; club_id_ = GOOGLE_ULONGLONG(0); ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -3752,7 +3363,6 @@ MemberRoleChangedNotification::~MemberRoleChangedNotification() { void MemberRoleChangedNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; } } @@ -3778,13 +3388,10 @@ MemberRoleChangedNotification* MemberRoleChangedNotification::New() const { } void MemberRoleChangedNotification::Clear() { - if (_has_bits_[0 / 32] & 7) { + if (_has_bits_[0 / 32] & 3) { if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - } club_id_ = GOOGLE_ULONGLONG(0); } assignment_.Clear(); @@ -3810,19 +3417,6 @@ bool MemberRoleChangedNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(24)) goto parse_club_id; break; } @@ -3887,12 +3481,6 @@ void MemberRoleChangedNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional uint64 club_id = 3; if (has_club_id()) { ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->club_id(), output); @@ -3921,13 +3509,6 @@ void MemberRoleChangedNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional uint64 club_id = 3; if (has_club_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->club_id(), target); @@ -3959,13 +3540,6 @@ int MemberRoleChangedNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional uint64 club_id = 3; if (has_club_id()) { total_size += 1 + @@ -4012,9 +3586,6 @@ void MemberRoleChangedNotification::MergeFrom(const MemberRoleChangedNotificatio if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.subscriber_id()); - } if (from.has_club_id()) { set_club_id(from.club_id()); } @@ -4039,9 +3610,6 @@ bool MemberRoleChangedNotification::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } if (!::google::protobuf::internal::AllAreInitialized(this->assignment())) return false; return true; } @@ -4049,7 +3617,6 @@ bool MemberRoleChangedNotification::IsInitialized() const { void MemberRoleChangedNotification::Swap(MemberRoleChangedNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(club_id_, other->club_id_); assignment_.Swap(&other->assignment_); std::swap(_has_bits_[0], other->_has_bits_[0]); @@ -4070,8 +3637,690 @@ void MemberRoleChangedNotification::Swap(MemberRoleChangedNotification* other) { // =================================================================== #ifndef _MSC_VER +const int InvitationAddedNotification::kAgentIdFieldNumber; +const int InvitationAddedNotification::kClubIdFieldNumber; +const int InvitationAddedNotification::kInvitationFieldNumber; +#endif // !_MSC_VER + +InvitationAddedNotification::InvitationAddedNotification() + : ::google::protobuf::Message() { + SharedCtor(); + // @@protoc_insertion_point(constructor:bgs.protocol.club.v1.InvitationAddedNotification) +} + +void InvitationAddedNotification::InitAsDefaultInstance() { + agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); + invitation_ = const_cast< ::bgs::protocol::club::v1::ClubInvitation*>(&::bgs::protocol::club::v1::ClubInvitation::default_instance()); +} + +InvitationAddedNotification::InvitationAddedNotification(const InvitationAddedNotification& from) + : ::google::protobuf::Message() { + SharedCtor(); + MergeFrom(from); + // @@protoc_insertion_point(copy_constructor:bgs.protocol.club.v1.InvitationAddedNotification) +} + +void InvitationAddedNotification::SharedCtor() { + _cached_size_ = 0; + agent_id_ = NULL; + club_id_ = GOOGLE_ULONGLONG(0); + invitation_ = NULL; + ::memset(_has_bits_, 0, sizeof(_has_bits_)); +} + +InvitationAddedNotification::~InvitationAddedNotification() { + // @@protoc_insertion_point(destructor:bgs.protocol.club.v1.InvitationAddedNotification) + SharedDtor(); +} + +void InvitationAddedNotification::SharedDtor() { + if (this != default_instance_) { + delete agent_id_; + delete invitation_; + } +} + +void InvitationAddedNotification::SetCachedSize(int size) const { + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); +} +const ::google::protobuf::Descriptor* InvitationAddedNotification::descriptor() { + protobuf_AssignDescriptorsOnce(); + return InvitationAddedNotification_descriptor_; +} + +const InvitationAddedNotification& InvitationAddedNotification::default_instance() { + if (default_instance_ == NULL) protobuf_AddDesc_club_5fnotification_2eproto(); + return *default_instance_; +} + +InvitationAddedNotification* InvitationAddedNotification::default_instance_ = NULL; + +InvitationAddedNotification* InvitationAddedNotification::New() const { + return new InvitationAddedNotification; +} + +void InvitationAddedNotification::Clear() { + if (_has_bits_[0 / 32] & 7) { + if (has_agent_id()) { + if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); + } + club_id_ = GOOGLE_ULONGLONG(0); + if (has_invitation()) { + if (invitation_ != NULL) invitation_->::bgs::protocol::club::v1::ClubInvitation::Clear(); + } + } + ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); +} + +bool InvitationAddedNotification::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:bgs.protocol.club.v1.InvitationAddedNotification) + for (;;) { + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // optional .bgs.protocol.club.v1.MemberId agent_id = 1; + case 1: { + if (tag == 10) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_agent_id())); + } else { + goto handle_unusual; + } + if (input->ExpectTag(24)) goto parse_club_id; + break; + } + + // optional uint64 club_id = 3; + case 3: { + if (tag == 24) { + parse_club_id: + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>( + input, &club_id_))); + set_has_club_id(); + } else { + goto handle_unusual; + } + if (input->ExpectTag(34)) goto parse_invitation; + break; + } + + // optional .bgs.protocol.club.v1.ClubInvitation invitation = 4; + case 4: { + if (tag == 34) { + parse_invitation: + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_invitation())); + } else { + goto handle_unusual; + } + if (input->ExpectAtEnd()) goto success; + break; + } + + default: { + handle_unusual: + if (tag == 0 || + ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:bgs.protocol.club.v1.InvitationAddedNotification) + return true; +failure: + // @@protoc_insertion_point(parse_failure:bgs.protocol.club.v1.InvitationAddedNotification) + return false; +#undef DO_ +} + +void InvitationAddedNotification::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:bgs.protocol.club.v1.InvitationAddedNotification) + // optional .bgs.protocol.club.v1.MemberId agent_id = 1; + if (has_agent_id()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, this->agent_id(), output); + } + + // optional uint64 club_id = 3; + if (has_club_id()) { + ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->club_id(), output); + } + + // optional .bgs.protocol.club.v1.ClubInvitation invitation = 4; + if (has_invitation()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 4, this->invitation(), output); + } + + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:bgs.protocol.club.v1.InvitationAddedNotification) +} + +::google::protobuf::uint8* InvitationAddedNotification::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.club.v1.InvitationAddedNotification) + // optional .bgs.protocol.club.v1.MemberId agent_id = 1; + if (has_agent_id()) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 1, this->agent_id(), target); + } + + // optional uint64 club_id = 3; + if (has_club_id()) { + target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->club_id(), target); + } + + // optional .bgs.protocol.club.v1.ClubInvitation invitation = 4; + if (has_invitation()) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 4, this->invitation(), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.club.v1.InvitationAddedNotification) + return target; +} + +int InvitationAddedNotification::ByteSize() const { + int total_size = 0; + + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { + // optional .bgs.protocol.club.v1.MemberId agent_id = 1; + if (has_agent_id()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->agent_id()); + } + + // optional uint64 club_id = 3; + if (has_club_id()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::UInt64Size( + this->club_id()); + } + + // optional .bgs.protocol.club.v1.ClubInvitation invitation = 4; + if (has_invitation()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->invitation()); + } + + } + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = total_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} + +void InvitationAddedNotification::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const InvitationAddedNotification* source = + ::google::protobuf::internal::dynamic_cast_if_available<const InvitationAddedNotification*>( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } +} + +void InvitationAddedNotification::MergeFrom(const InvitationAddedNotification& from) { + GOOGLE_CHECK_NE(&from, this); + if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from.has_agent_id()) { + mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); + } + if (from.has_club_id()) { + set_club_id(from.club_id()); + } + if (from.has_invitation()) { + mutable_invitation()->::bgs::protocol::club::v1::ClubInvitation::MergeFrom(from.invitation()); + } + } + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void InvitationAddedNotification::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void InvitationAddedNotification::CopyFrom(const InvitationAddedNotification& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool InvitationAddedNotification::IsInitialized() const { + + if (has_agent_id()) { + if (!this->agent_id().IsInitialized()) return false; + } + if (has_invitation()) { + if (!this->invitation().IsInitialized()) return false; + } + return true; +} + +void InvitationAddedNotification::Swap(InvitationAddedNotification* other) { + if (other != this) { + std::swap(agent_id_, other->agent_id_); + std::swap(club_id_, other->club_id_); + std::swap(invitation_, other->invitation_); + std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); + std::swap(_cached_size_, other->_cached_size_); + } +} + +::google::protobuf::Metadata InvitationAddedNotification::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = InvitationAddedNotification_descriptor_; + metadata.reflection = InvitationAddedNotification_reflection_; + return metadata; +} + + +// =================================================================== + +#ifndef _MSC_VER +const int InvitationRemovedNotification::kAgentIdFieldNumber; +const int InvitationRemovedNotification::kClubIdFieldNumber; +const int InvitationRemovedNotification::kInvitationIdFieldNumber; +const int InvitationRemovedNotification::kReasonFieldNumber; +#endif // !_MSC_VER + +InvitationRemovedNotification::InvitationRemovedNotification() + : ::google::protobuf::Message() { + SharedCtor(); + // @@protoc_insertion_point(constructor:bgs.protocol.club.v1.InvitationRemovedNotification) +} + +void InvitationRemovedNotification::InitAsDefaultInstance() { + agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); +} + +InvitationRemovedNotification::InvitationRemovedNotification(const InvitationRemovedNotification& from) + : ::google::protobuf::Message() { + SharedCtor(); + MergeFrom(from); + // @@protoc_insertion_point(copy_constructor:bgs.protocol.club.v1.InvitationRemovedNotification) +} + +void InvitationRemovedNotification::SharedCtor() { + _cached_size_ = 0; + agent_id_ = NULL; + club_id_ = GOOGLE_ULONGLONG(0); + invitation_id_ = GOOGLE_ULONGLONG(0); + reason_ = 0; + ::memset(_has_bits_, 0, sizeof(_has_bits_)); +} + +InvitationRemovedNotification::~InvitationRemovedNotification() { + // @@protoc_insertion_point(destructor:bgs.protocol.club.v1.InvitationRemovedNotification) + SharedDtor(); +} + +void InvitationRemovedNotification::SharedDtor() { + if (this != default_instance_) { + delete agent_id_; + } +} + +void InvitationRemovedNotification::SetCachedSize(int size) const { + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); +} +const ::google::protobuf::Descriptor* InvitationRemovedNotification::descriptor() { + protobuf_AssignDescriptorsOnce(); + return InvitationRemovedNotification_descriptor_; +} + +const InvitationRemovedNotification& InvitationRemovedNotification::default_instance() { + if (default_instance_ == NULL) protobuf_AddDesc_club_5fnotification_2eproto(); + return *default_instance_; +} + +InvitationRemovedNotification* InvitationRemovedNotification::default_instance_ = NULL; + +InvitationRemovedNotification* InvitationRemovedNotification::New() const { + return new InvitationRemovedNotification; +} + +void InvitationRemovedNotification::Clear() { +#define OFFSET_OF_FIELD_(f) (reinterpret_cast<char*>( \ + &reinterpret_cast<InvitationRemovedNotification*>(16)->f) - \ + reinterpret_cast<char*>(16)) + +#define ZR_(first, last) do { \ + size_t f = OFFSET_OF_FIELD_(first); \ + size_t n = OFFSET_OF_FIELD_(last) - f + sizeof(last); \ + ::memset(&first, 0, n); \ + } while (0) + + if (_has_bits_[0 / 32] & 15) { + ZR_(club_id_, reason_); + if (has_agent_id()) { + if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); + } + } + +#undef OFFSET_OF_FIELD_ +#undef ZR_ + + ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); +} + +bool InvitationRemovedNotification::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:bgs.protocol.club.v1.InvitationRemovedNotification) + for (;;) { + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // optional .bgs.protocol.club.v1.MemberId agent_id = 1; + case 1: { + if (tag == 10) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_agent_id())); + } else { + goto handle_unusual; + } + if (input->ExpectTag(24)) goto parse_club_id; + break; + } + + // optional uint64 club_id = 3; + case 3: { + if (tag == 24) { + parse_club_id: + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>( + input, &club_id_))); + set_has_club_id(); + } else { + goto handle_unusual; + } + if (input->ExpectTag(33)) goto parse_invitation_id; + break; + } + + // optional fixed64 invitation_id = 4; + case 4: { + if (tag == 33) { + parse_invitation_id: + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_FIXED64>( + input, &invitation_id_))); + set_has_invitation_id(); + } else { + goto handle_unusual; + } + if (input->ExpectTag(40)) goto parse_reason; + break; + } + + // optional .bgs.protocol.InvitationRemovedReason reason = 5; + case 5: { + if (tag == 40) { + parse_reason: + int value; + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( + input, &value))); + if (::bgs::protocol::InvitationRemovedReason_IsValid(value)) { + set_reason(static_cast< ::bgs::protocol::InvitationRemovedReason >(value)); + } else { + mutable_unknown_fields()->AddVarint(5, value); + } + } else { + goto handle_unusual; + } + if (input->ExpectAtEnd()) goto success; + break; + } + + default: { + handle_unusual: + if (tag == 0 || + ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:bgs.protocol.club.v1.InvitationRemovedNotification) + return true; +failure: + // @@protoc_insertion_point(parse_failure:bgs.protocol.club.v1.InvitationRemovedNotification) + return false; +#undef DO_ +} + +void InvitationRemovedNotification::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:bgs.protocol.club.v1.InvitationRemovedNotification) + // optional .bgs.protocol.club.v1.MemberId agent_id = 1; + if (has_agent_id()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, this->agent_id(), output); + } + + // optional uint64 club_id = 3; + if (has_club_id()) { + ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->club_id(), output); + } + + // optional fixed64 invitation_id = 4; + if (has_invitation_id()) { + ::google::protobuf::internal::WireFormatLite::WriteFixed64(4, this->invitation_id(), output); + } + + // optional .bgs.protocol.InvitationRemovedReason reason = 5; + if (has_reason()) { + ::google::protobuf::internal::WireFormatLite::WriteEnum( + 5, this->reason(), output); + } + + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:bgs.protocol.club.v1.InvitationRemovedNotification) +} + +::google::protobuf::uint8* InvitationRemovedNotification::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.club.v1.InvitationRemovedNotification) + // optional .bgs.protocol.club.v1.MemberId agent_id = 1; + if (has_agent_id()) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 1, this->agent_id(), target); + } + + // optional uint64 club_id = 3; + if (has_club_id()) { + target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->club_id(), target); + } + + // optional fixed64 invitation_id = 4; + if (has_invitation_id()) { + target = ::google::protobuf::internal::WireFormatLite::WriteFixed64ToArray(4, this->invitation_id(), target); + } + + // optional .bgs.protocol.InvitationRemovedReason reason = 5; + if (has_reason()) { + target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( + 5, this->reason(), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.club.v1.InvitationRemovedNotification) + return target; +} + +int InvitationRemovedNotification::ByteSize() const { + int total_size = 0; + + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { + // optional .bgs.protocol.club.v1.MemberId agent_id = 1; + if (has_agent_id()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->agent_id()); + } + + // optional uint64 club_id = 3; + if (has_club_id()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::UInt64Size( + this->club_id()); + } + + // optional fixed64 invitation_id = 4; + if (has_invitation_id()) { + total_size += 1 + 8; + } + + // optional .bgs.protocol.InvitationRemovedReason reason = 5; + if (has_reason()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::EnumSize(this->reason()); + } + + } + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = total_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} + +void InvitationRemovedNotification::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const InvitationRemovedNotification* source = + ::google::protobuf::internal::dynamic_cast_if_available<const InvitationRemovedNotification*>( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } +} + +void InvitationRemovedNotification::MergeFrom(const InvitationRemovedNotification& from) { + GOOGLE_CHECK_NE(&from, this); + if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from.has_agent_id()) { + mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); + } + if (from.has_club_id()) { + set_club_id(from.club_id()); + } + if (from.has_invitation_id()) { + set_invitation_id(from.invitation_id()); + } + if (from.has_reason()) { + set_reason(from.reason()); + } + } + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void InvitationRemovedNotification::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void InvitationRemovedNotification::CopyFrom(const InvitationRemovedNotification& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool InvitationRemovedNotification::IsInitialized() const { + + if (has_agent_id()) { + if (!this->agent_id().IsInitialized()) return false; + } + return true; +} + +void InvitationRemovedNotification::Swap(InvitationRemovedNotification* other) { + if (other != this) { + std::swap(agent_id_, other->agent_id_); + std::swap(club_id_, other->club_id_); + std::swap(invitation_id_, other->invitation_id_); + std::swap(reason_, other->reason_); + std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); + std::swap(_cached_size_, other->_cached_size_); + } +} + +::google::protobuf::Metadata InvitationRemovedNotification::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = InvitationRemovedNotification_descriptor_; + metadata.reflection = InvitationRemovedNotification_reflection_; + return metadata; +} + + +// =================================================================== + +#ifndef _MSC_VER const int SuggestionAddedNotification::kAgentIdFieldNumber; -const int SuggestionAddedNotification::kSubscriberIdFieldNumber; const int SuggestionAddedNotification::kClubIdFieldNumber; const int SuggestionAddedNotification::kSuggestionFieldNumber; #endif // !_MSC_VER @@ -4084,7 +4333,6 @@ SuggestionAddedNotification::SuggestionAddedNotification() void SuggestionAddedNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); suggestion_ = const_cast< ::bgs::protocol::club::v1::ClubSuggestion*>(&::bgs::protocol::club::v1::ClubSuggestion::default_instance()); } @@ -4098,7 +4346,6 @@ SuggestionAddedNotification::SuggestionAddedNotification(const SuggestionAddedNo void SuggestionAddedNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; club_id_ = GOOGLE_ULONGLONG(0); suggestion_ = NULL; ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -4112,7 +4359,6 @@ SuggestionAddedNotification::~SuggestionAddedNotification() { void SuggestionAddedNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; delete suggestion_; } } @@ -4139,13 +4385,10 @@ SuggestionAddedNotification* SuggestionAddedNotification::New() const { } void SuggestionAddedNotification::Clear() { - if (_has_bits_[0 / 32] & 15) { + if (_has_bits_[0 / 32] & 7) { if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - } club_id_ = GOOGLE_ULONGLONG(0); if (has_suggestion()) { if (suggestion_ != NULL) suggestion_->::bgs::protocol::club::v1::ClubSuggestion::Clear(); @@ -4173,19 +4416,6 @@ bool SuggestionAddedNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(24)) goto parse_club_id; break; } @@ -4205,7 +4435,7 @@ bool SuggestionAddedNotification::MergePartialFromCodedStream( break; } - // required .bgs.protocol.club.v1.ClubSuggestion suggestion = 4; + // optional .bgs.protocol.club.v1.ClubSuggestion suggestion = 4; case 4: { if (tag == 34) { parse_suggestion: @@ -4249,18 +4479,12 @@ void SuggestionAddedNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional uint64 club_id = 3; if (has_club_id()) { ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->club_id(), output); } - // required .bgs.protocol.club.v1.ClubSuggestion suggestion = 4; + // optional .bgs.protocol.club.v1.ClubSuggestion suggestion = 4; if (has_suggestion()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( 4, this->suggestion(), output); @@ -4283,19 +4507,12 @@ void SuggestionAddedNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional uint64 club_id = 3; if (has_club_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->club_id(), target); } - // required .bgs.protocol.club.v1.ClubSuggestion suggestion = 4; + // optional .bgs.protocol.club.v1.ClubSuggestion suggestion = 4; if (has_suggestion()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( @@ -4321,13 +4538,6 @@ int SuggestionAddedNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional uint64 club_id = 3; if (has_club_id()) { total_size += 1 + @@ -4335,7 +4545,7 @@ int SuggestionAddedNotification::ByteSize() const { this->club_id()); } - // required .bgs.protocol.club.v1.ClubSuggestion suggestion = 4; + // optional .bgs.protocol.club.v1.ClubSuggestion suggestion = 4; if (has_suggestion()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -4372,9 +4582,6 @@ void SuggestionAddedNotification::MergeFrom(const SuggestionAddedNotification& f if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.subscriber_id()); - } if (from.has_club_id()) { set_club_id(from.club_id()); } @@ -4398,14 +4605,10 @@ void SuggestionAddedNotification::CopyFrom(const SuggestionAddedNotification& fr } bool SuggestionAddedNotification::IsInitialized() const { - if ((_has_bits_[0] & 0x00000008) != 0x00000008) return false; if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } if (has_suggestion()) { if (!this->suggestion().IsInitialized()) return false; } @@ -4415,7 +4618,6 @@ bool SuggestionAddedNotification::IsInitialized() const { void SuggestionAddedNotification::Swap(SuggestionAddedNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(club_id_, other->club_id_); std::swap(suggestion_, other->suggestion_); std::swap(_has_bits_[0], other->_has_bits_[0]); @@ -4437,7 +4639,6 @@ void SuggestionAddedNotification::Swap(SuggestionAddedNotification* other) { #ifndef _MSC_VER const int SuggestionRemovedNotification::kAgentIdFieldNumber; -const int SuggestionRemovedNotification::kSubscriberIdFieldNumber; const int SuggestionRemovedNotification::kClubIdFieldNumber; const int SuggestionRemovedNotification::kSuggestionIdFieldNumber; const int SuggestionRemovedNotification::kReasonFieldNumber; @@ -4451,7 +4652,6 @@ SuggestionRemovedNotification::SuggestionRemovedNotification() void SuggestionRemovedNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); } SuggestionRemovedNotification::SuggestionRemovedNotification(const SuggestionRemovedNotification& from) @@ -4464,7 +4664,6 @@ SuggestionRemovedNotification::SuggestionRemovedNotification(const SuggestionRem void SuggestionRemovedNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; club_id_ = GOOGLE_ULONGLONG(0); suggestion_id_ = GOOGLE_ULONGLONG(0); reason_ = 0; @@ -4479,7 +4678,6 @@ SuggestionRemovedNotification::~SuggestionRemovedNotification() { void SuggestionRemovedNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; } } @@ -4515,14 +4713,11 @@ void SuggestionRemovedNotification::Clear() { ::memset(&first, 0, n); \ } while (0) - if (_has_bits_[0 / 32] & 31) { + if (_has_bits_[0 / 32] & 15) { ZR_(club_id_, reason_); if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - } } #undef OFFSET_OF_FIELD_ @@ -4550,19 +4745,6 @@ bool SuggestionRemovedNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(24)) goto parse_club_id; break; } @@ -4648,12 +4830,6 @@ void SuggestionRemovedNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional uint64 club_id = 3; if (has_club_id()) { ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->club_id(), output); @@ -4687,13 +4863,6 @@ void SuggestionRemovedNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional uint64 club_id = 3; if (has_club_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->club_id(), target); @@ -4729,13 +4898,6 @@ int SuggestionRemovedNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional uint64 club_id = 3; if (has_club_id()) { total_size += 1 + @@ -4784,9 +4946,6 @@ void SuggestionRemovedNotification::MergeFrom(const SuggestionRemovedNotificatio if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.subscriber_id()); - } if (from.has_club_id()) { set_club_id(from.club_id()); } @@ -4817,16 +4976,12 @@ bool SuggestionRemovedNotification::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } return true; } void SuggestionRemovedNotification::Swap(SuggestionRemovedNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(club_id_, other->club_id_); std::swap(suggestion_id_, other->suggestion_id_); std::swap(reason_, other->reason_); @@ -4849,7 +5004,6 @@ void SuggestionRemovedNotification::Swap(SuggestionRemovedNotification* other) { #ifndef _MSC_VER const int StreamAddedNotification::kAgentIdFieldNumber; -const int StreamAddedNotification::kSubscriberIdFieldNumber; const int StreamAddedNotification::kClubIdFieldNumber; const int StreamAddedNotification::kStreamFieldNumber; #endif // !_MSC_VER @@ -4862,7 +5016,6 @@ StreamAddedNotification::StreamAddedNotification() void StreamAddedNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); stream_ = const_cast< ::bgs::protocol::club::v1::Stream*>(&::bgs::protocol::club::v1::Stream::default_instance()); } @@ -4876,7 +5029,6 @@ StreamAddedNotification::StreamAddedNotification(const StreamAddedNotification& void StreamAddedNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; club_id_ = GOOGLE_ULONGLONG(0); stream_ = NULL; ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -4890,7 +5042,6 @@ StreamAddedNotification::~StreamAddedNotification() { void StreamAddedNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; delete stream_; } } @@ -4917,13 +5068,10 @@ StreamAddedNotification* StreamAddedNotification::New() const { } void StreamAddedNotification::Clear() { - if (_has_bits_[0 / 32] & 15) { + if (_has_bits_[0 / 32] & 7) { if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - } club_id_ = GOOGLE_ULONGLONG(0); if (has_stream()) { if (stream_ != NULL) stream_->::bgs::protocol::club::v1::Stream::Clear(); @@ -4951,19 +5099,6 @@ bool StreamAddedNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(24)) goto parse_club_id; break; } @@ -5027,12 +5162,6 @@ void StreamAddedNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional uint64 club_id = 3; if (has_club_id()) { ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->club_id(), output); @@ -5061,13 +5190,6 @@ void StreamAddedNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional uint64 club_id = 3; if (has_club_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->club_id(), target); @@ -5099,13 +5221,6 @@ int StreamAddedNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional uint64 club_id = 3; if (has_club_id()) { total_size += 1 + @@ -5150,9 +5265,6 @@ void StreamAddedNotification::MergeFrom(const StreamAddedNotification& from) { if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.subscriber_id()); - } if (from.has_club_id()) { set_club_id(from.club_id()); } @@ -5180,16 +5292,12 @@ bool StreamAddedNotification::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } return true; } void StreamAddedNotification::Swap(StreamAddedNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(club_id_, other->club_id_); std::swap(stream_, other->stream_); std::swap(_has_bits_[0], other->_has_bits_[0]); @@ -5211,7 +5319,6 @@ void StreamAddedNotification::Swap(StreamAddedNotification* other) { #ifndef _MSC_VER const int StreamRemovedNotification::kAgentIdFieldNumber; -const int StreamRemovedNotification::kSubscriberIdFieldNumber; const int StreamRemovedNotification::kClubIdFieldNumber; const int StreamRemovedNotification::kStreamIdFieldNumber; #endif // !_MSC_VER @@ -5224,7 +5331,6 @@ StreamRemovedNotification::StreamRemovedNotification() void StreamRemovedNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); } StreamRemovedNotification::StreamRemovedNotification(const StreamRemovedNotification& from) @@ -5237,7 +5343,6 @@ StreamRemovedNotification::StreamRemovedNotification(const StreamRemovedNotifica void StreamRemovedNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; club_id_ = GOOGLE_ULONGLONG(0); stream_id_ = GOOGLE_ULONGLONG(0); ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -5251,7 +5356,6 @@ StreamRemovedNotification::~StreamRemovedNotification() { void StreamRemovedNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; } } @@ -5287,14 +5391,11 @@ void StreamRemovedNotification::Clear() { ::memset(&first, 0, n); \ } while (0) - if (_has_bits_[0 / 32] & 15) { + if (_has_bits_[0 / 32] & 7) { ZR_(club_id_, stream_id_); if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - } } #undef OFFSET_OF_FIELD_ @@ -5322,19 +5423,6 @@ bool StreamRemovedNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(24)) goto parse_club_id; break; } @@ -5400,12 +5488,6 @@ void StreamRemovedNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional uint64 club_id = 3; if (has_club_id()) { ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->club_id(), output); @@ -5433,13 +5515,6 @@ void StreamRemovedNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional uint64 club_id = 3; if (has_club_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->club_id(), target); @@ -5469,13 +5544,6 @@ int StreamRemovedNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional uint64 club_id = 3; if (has_club_id()) { total_size += 1 + @@ -5520,9 +5588,6 @@ void StreamRemovedNotification::MergeFrom(const StreamRemovedNotification& from) if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.subscriber_id()); - } if (from.has_club_id()) { set_club_id(from.club_id()); } @@ -5550,16 +5615,12 @@ bool StreamRemovedNotification::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } return true; } void StreamRemovedNotification::Swap(StreamRemovedNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(club_id_, other->club_id_); std::swap(stream_id_, other->stream_id_); std::swap(_has_bits_[0], other->_has_bits_[0]); @@ -5581,7 +5642,6 @@ void StreamRemovedNotification::Swap(StreamRemovedNotification* other) { #ifndef _MSC_VER const int StreamStateChangedNotification::kAgentIdFieldNumber; -const int StreamStateChangedNotification::kSubscriberIdFieldNumber; const int StreamStateChangedNotification::kClubIdFieldNumber; const int StreamStateChangedNotification::kStreamIdFieldNumber; const int StreamStateChangedNotification::kAssignmentFieldNumber; @@ -5595,7 +5655,6 @@ StreamStateChangedNotification::StreamStateChangedNotification() void StreamStateChangedNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); assignment_ = const_cast< ::bgs::protocol::club::v1::StreamStateAssignment*>(&::bgs::protocol::club::v1::StreamStateAssignment::default_instance()); } @@ -5609,7 +5668,6 @@ StreamStateChangedNotification::StreamStateChangedNotification(const StreamState void StreamStateChangedNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; club_id_ = GOOGLE_ULONGLONG(0); stream_id_ = GOOGLE_ULONGLONG(0); assignment_ = NULL; @@ -5624,7 +5682,6 @@ StreamStateChangedNotification::~StreamStateChangedNotification() { void StreamStateChangedNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; delete assignment_; } } @@ -5661,14 +5718,11 @@ void StreamStateChangedNotification::Clear() { ::memset(&first, 0, n); \ } while (0) - if (_has_bits_[0 / 32] & 31) { + if (_has_bits_[0 / 32] & 15) { ZR_(club_id_, stream_id_); if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - } if (has_assignment()) { if (assignment_ != NULL) assignment_->::bgs::protocol::club::v1::StreamStateAssignment::Clear(); } @@ -5699,19 +5753,6 @@ bool StreamStateChangedNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(24)) goto parse_club_id; break; } @@ -5790,12 +5831,6 @@ void StreamStateChangedNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional uint64 club_id = 3; if (has_club_id()) { ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->club_id(), output); @@ -5829,13 +5864,6 @@ void StreamStateChangedNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional uint64 club_id = 3; if (has_club_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->club_id(), target); @@ -5872,13 +5900,6 @@ int StreamStateChangedNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional uint64 club_id = 3; if (has_club_id()) { total_size += 1 + @@ -5930,9 +5951,6 @@ void StreamStateChangedNotification::MergeFrom(const StreamStateChangedNotificat if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.subscriber_id()); - } if (from.has_club_id()) { set_club_id(from.club_id()); } @@ -5963,16 +5981,12 @@ bool StreamStateChangedNotification::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } return true; } void StreamStateChangedNotification::Swap(StreamStateChangedNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(club_id_, other->club_id_); std::swap(stream_id_, other->stream_id_); std::swap(assignment_, other->assignment_); @@ -5995,7 +6009,6 @@ void StreamStateChangedNotification::Swap(StreamStateChangedNotification* other) #ifndef _MSC_VER const int StreamMessageAddedNotification::kAgentIdFieldNumber; -const int StreamMessageAddedNotification::kSubscriberIdFieldNumber; const int StreamMessageAddedNotification::kClubIdFieldNumber; const int StreamMessageAddedNotification::kStreamIdFieldNumber; const int StreamMessageAddedNotification::kMessageFieldNumber; @@ -6009,7 +6022,6 @@ StreamMessageAddedNotification::StreamMessageAddedNotification() void StreamMessageAddedNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); message_ = const_cast< ::bgs::protocol::club::v1::StreamMessage*>(&::bgs::protocol::club::v1::StreamMessage::default_instance()); } @@ -6023,7 +6035,6 @@ StreamMessageAddedNotification::StreamMessageAddedNotification(const StreamMessa void StreamMessageAddedNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; club_id_ = GOOGLE_ULONGLONG(0); stream_id_ = GOOGLE_ULONGLONG(0); message_ = NULL; @@ -6038,7 +6049,6 @@ StreamMessageAddedNotification::~StreamMessageAddedNotification() { void StreamMessageAddedNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; delete message_; } } @@ -6075,14 +6085,11 @@ void StreamMessageAddedNotification::Clear() { ::memset(&first, 0, n); \ } while (0) - if (_has_bits_[0 / 32] & 31) { + if (_has_bits_[0 / 32] & 15) { ZR_(club_id_, stream_id_); if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - } if (has_message()) { if (message_ != NULL) message_->::bgs::protocol::club::v1::StreamMessage::Clear(); } @@ -6113,19 +6120,6 @@ bool StreamMessageAddedNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(24)) goto parse_club_id; break; } @@ -6204,12 +6198,6 @@ void StreamMessageAddedNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional uint64 club_id = 3; if (has_club_id()) { ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->club_id(), output); @@ -6243,13 +6231,6 @@ void StreamMessageAddedNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional uint64 club_id = 3; if (has_club_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->club_id(), target); @@ -6286,13 +6267,6 @@ int StreamMessageAddedNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional uint64 club_id = 3; if (has_club_id()) { total_size += 1 + @@ -6344,9 +6318,6 @@ void StreamMessageAddedNotification::MergeFrom(const StreamMessageAddedNotificat if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.subscriber_id()); - } if (from.has_club_id()) { set_club_id(from.club_id()); } @@ -6377,9 +6348,6 @@ bool StreamMessageAddedNotification::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } if (has_message()) { if (!this->message().IsInitialized()) return false; } @@ -6389,7 +6357,6 @@ bool StreamMessageAddedNotification::IsInitialized() const { void StreamMessageAddedNotification::Swap(StreamMessageAddedNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(club_id_, other->club_id_); std::swap(stream_id_, other->stream_id_); std::swap(message_, other->message_); @@ -6412,7 +6379,6 @@ void StreamMessageAddedNotification::Swap(StreamMessageAddedNotification* other) #ifndef _MSC_VER const int StreamMessageUpdatedNotification::kAgentIdFieldNumber; -const int StreamMessageUpdatedNotification::kSubscriberIdFieldNumber; const int StreamMessageUpdatedNotification::kClubIdFieldNumber; const int StreamMessageUpdatedNotification::kStreamIdFieldNumber; const int StreamMessageUpdatedNotification::kMessageFieldNumber; @@ -6426,7 +6392,6 @@ StreamMessageUpdatedNotification::StreamMessageUpdatedNotification() void StreamMessageUpdatedNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); message_ = const_cast< ::bgs::protocol::club::v1::StreamMessage*>(&::bgs::protocol::club::v1::StreamMessage::default_instance()); } @@ -6440,7 +6405,6 @@ StreamMessageUpdatedNotification::StreamMessageUpdatedNotification(const StreamM void StreamMessageUpdatedNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; club_id_ = GOOGLE_ULONGLONG(0); stream_id_ = GOOGLE_ULONGLONG(0); message_ = NULL; @@ -6455,7 +6419,6 @@ StreamMessageUpdatedNotification::~StreamMessageUpdatedNotification() { void StreamMessageUpdatedNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; delete message_; } } @@ -6492,14 +6455,11 @@ void StreamMessageUpdatedNotification::Clear() { ::memset(&first, 0, n); \ } while (0) - if (_has_bits_[0 / 32] & 31) { + if (_has_bits_[0 / 32] & 15) { ZR_(club_id_, stream_id_); if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - } if (has_message()) { if (message_ != NULL) message_->::bgs::protocol::club::v1::StreamMessage::Clear(); } @@ -6530,19 +6490,6 @@ bool StreamMessageUpdatedNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(24)) goto parse_club_id; break; } @@ -6621,12 +6568,6 @@ void StreamMessageUpdatedNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional uint64 club_id = 3; if (has_club_id()) { ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->club_id(), output); @@ -6660,13 +6601,6 @@ void StreamMessageUpdatedNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional uint64 club_id = 3; if (has_club_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->club_id(), target); @@ -6703,13 +6637,6 @@ int StreamMessageUpdatedNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional uint64 club_id = 3; if (has_club_id()) { total_size += 1 + @@ -6761,9 +6688,6 @@ void StreamMessageUpdatedNotification::MergeFrom(const StreamMessageUpdatedNotif if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.subscriber_id()); - } if (from.has_club_id()) { set_club_id(from.club_id()); } @@ -6794,9 +6718,6 @@ bool StreamMessageUpdatedNotification::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } if (has_message()) { if (!this->message().IsInitialized()) return false; } @@ -6806,7 +6727,6 @@ bool StreamMessageUpdatedNotification::IsInitialized() const { void StreamMessageUpdatedNotification::Swap(StreamMessageUpdatedNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(club_id_, other->club_id_); std::swap(stream_id_, other->stream_id_); std::swap(message_, other->message_); @@ -6829,7 +6749,6 @@ void StreamMessageUpdatedNotification::Swap(StreamMessageUpdatedNotification* ot #ifndef _MSC_VER const int StreamTypingIndicatorNotification::kAgentIdFieldNumber; -const int StreamTypingIndicatorNotification::kSubscriberIdFieldNumber; const int StreamTypingIndicatorNotification::kClubIdFieldNumber; const int StreamTypingIndicatorNotification::kStreamIdFieldNumber; const int StreamTypingIndicatorNotification::kIndicatorFieldNumber; @@ -6843,7 +6762,6 @@ StreamTypingIndicatorNotification::StreamTypingIndicatorNotification() void StreamTypingIndicatorNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); } StreamTypingIndicatorNotification::StreamTypingIndicatorNotification(const StreamTypingIndicatorNotification& from) @@ -6856,7 +6774,6 @@ StreamTypingIndicatorNotification::StreamTypingIndicatorNotification(const Strea void StreamTypingIndicatorNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; club_id_ = GOOGLE_ULONGLONG(0); stream_id_ = GOOGLE_ULONGLONG(0); ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -6870,7 +6787,6 @@ StreamTypingIndicatorNotification::~StreamTypingIndicatorNotification() { void StreamTypingIndicatorNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; } } @@ -6906,14 +6822,11 @@ void StreamTypingIndicatorNotification::Clear() { ::memset(&first, 0, n); \ } while (0) - if (_has_bits_[0 / 32] & 15) { + if (_has_bits_[0 / 32] & 7) { ZR_(club_id_, stream_id_); if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - } } #undef OFFSET_OF_FIELD_ @@ -6942,19 +6855,6 @@ bool StreamTypingIndicatorNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(24)) goto parse_club_id; break; } @@ -7034,12 +6934,6 @@ void StreamTypingIndicatorNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional uint64 club_id = 3; if (has_club_id()) { ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->club_id(), output); @@ -7073,13 +6967,6 @@ void StreamTypingIndicatorNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional uint64 club_id = 3; if (has_club_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->club_id(), target); @@ -7116,13 +7003,6 @@ int StreamTypingIndicatorNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional uint64 club_id = 3; if (has_club_id()) { total_size += 1 + @@ -7176,9 +7056,6 @@ void StreamTypingIndicatorNotification::MergeFrom(const StreamTypingIndicatorNot if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.subscriber_id()); - } if (from.has_club_id()) { set_club_id(from.club_id()); } @@ -7206,9 +7083,6 @@ bool StreamTypingIndicatorNotification::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } if (!::google::protobuf::internal::AllAreInitialized(this->indicator())) return false; return true; } @@ -7216,7 +7090,6 @@ bool StreamTypingIndicatorNotification::IsInitialized() const { void StreamTypingIndicatorNotification::Swap(StreamTypingIndicatorNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(club_id_, other->club_id_); std::swap(stream_id_, other->stream_id_); indicator_.Swap(&other->indicator_); @@ -7239,7 +7112,6 @@ void StreamTypingIndicatorNotification::Swap(StreamTypingIndicatorNotification* #ifndef _MSC_VER const int StreamUnreadIndicatorNotification::kAgentIdFieldNumber; -const int StreamUnreadIndicatorNotification::kSubscriberIdFieldNumber; const int StreamUnreadIndicatorNotification::kClubIdFieldNumber; const int StreamUnreadIndicatorNotification::kEventFieldNumber; #endif // !_MSC_VER @@ -7252,7 +7124,6 @@ StreamUnreadIndicatorNotification::StreamUnreadIndicatorNotification() void StreamUnreadIndicatorNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); event_ = const_cast< ::bgs::protocol::club::v1::StreamEventTime*>(&::bgs::protocol::club::v1::StreamEventTime::default_instance()); } @@ -7266,7 +7137,6 @@ StreamUnreadIndicatorNotification::StreamUnreadIndicatorNotification(const Strea void StreamUnreadIndicatorNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; club_id_ = GOOGLE_ULONGLONG(0); event_ = NULL; ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -7280,7 +7150,6 @@ StreamUnreadIndicatorNotification::~StreamUnreadIndicatorNotification() { void StreamUnreadIndicatorNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; delete event_; } } @@ -7307,13 +7176,10 @@ StreamUnreadIndicatorNotification* StreamUnreadIndicatorNotification::New() cons } void StreamUnreadIndicatorNotification::Clear() { - if (_has_bits_[0 / 32] & 15) { + if (_has_bits_[0 / 32] & 7) { if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - } club_id_ = GOOGLE_ULONGLONG(0); if (has_event()) { if (event_ != NULL) event_->::bgs::protocol::club::v1::StreamEventTime::Clear(); @@ -7341,19 +7207,6 @@ bool StreamUnreadIndicatorNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(24)) goto parse_club_id; break; } @@ -7417,12 +7270,6 @@ void StreamUnreadIndicatorNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional uint64 club_id = 3; if (has_club_id()) { ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->club_id(), output); @@ -7451,13 +7298,6 @@ void StreamUnreadIndicatorNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional uint64 club_id = 3; if (has_club_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->club_id(), target); @@ -7489,13 +7329,6 @@ int StreamUnreadIndicatorNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional uint64 club_id = 3; if (has_club_id()) { total_size += 1 + @@ -7540,9 +7373,6 @@ void StreamUnreadIndicatorNotification::MergeFrom(const StreamUnreadIndicatorNot if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.subscriber_id()); - } if (from.has_club_id()) { set_club_id(from.club_id()); } @@ -7570,16 +7400,12 @@ bool StreamUnreadIndicatorNotification::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } return true; } void StreamUnreadIndicatorNotification::Swap(StreamUnreadIndicatorNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(club_id_, other->club_id_); std::swap(event_, other->event_); std::swap(_has_bits_[0], other->_has_bits_[0]); @@ -7601,7 +7427,6 @@ void StreamUnreadIndicatorNotification::Swap(StreamUnreadIndicatorNotification* #ifndef _MSC_VER const int StreamAdvanceViewTimeNotification::kAgentIdFieldNumber; -const int StreamAdvanceViewTimeNotification::kSubscriberIdFieldNumber; const int StreamAdvanceViewTimeNotification::kClubIdFieldNumber; const int StreamAdvanceViewTimeNotification::kViewFieldNumber; #endif // !_MSC_VER @@ -7614,7 +7439,6 @@ StreamAdvanceViewTimeNotification::StreamAdvanceViewTimeNotification() void StreamAdvanceViewTimeNotification::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); } StreamAdvanceViewTimeNotification::StreamAdvanceViewTimeNotification(const StreamAdvanceViewTimeNotification& from) @@ -7627,7 +7451,6 @@ StreamAdvanceViewTimeNotification::StreamAdvanceViewTimeNotification(const Strea void StreamAdvanceViewTimeNotification::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; - subscriber_id_ = NULL; club_id_ = GOOGLE_ULONGLONG(0); ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -7640,7 +7463,6 @@ StreamAdvanceViewTimeNotification::~StreamAdvanceViewTimeNotification() { void StreamAdvanceViewTimeNotification::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete subscriber_id_; } } @@ -7666,13 +7488,10 @@ StreamAdvanceViewTimeNotification* StreamAdvanceViewTimeNotification::New() cons } void StreamAdvanceViewTimeNotification::Clear() { - if (_has_bits_[0 / 32] & 7) { + if (_has_bits_[0 / 32] & 3) { if (has_agent_id()) { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - } club_id_ = GOOGLE_ULONGLONG(0); } view_.Clear(); @@ -7698,19 +7517,6 @@ bool StreamAdvanceViewTimeNotification::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } if (input->ExpectTag(24)) goto parse_club_id; break; } @@ -7775,12 +7581,6 @@ void StreamAdvanceViewTimeNotification::SerializeWithCachedSizes( 1, this->agent_id(), output); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - // optional uint64 club_id = 3; if (has_club_id()) { ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->club_id(), output); @@ -7809,13 +7609,6 @@ void StreamAdvanceViewTimeNotification::SerializeWithCachedSizes( 1, this->agent_id(), target); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - // optional uint64 club_id = 3; if (has_club_id()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->club_id(), target); @@ -7847,13 +7640,6 @@ int StreamAdvanceViewTimeNotification::ByteSize() const { this->agent_id()); } - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - // optional uint64 club_id = 3; if (has_club_id()) { total_size += 1 + @@ -7900,9 +7686,6 @@ void StreamAdvanceViewTimeNotification::MergeFrom(const StreamAdvanceViewTimeNot if (from.has_agent_id()) { mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.subscriber_id()); - } if (from.has_club_id()) { set_club_id(from.club_id()); } @@ -7927,16 +7710,12 @@ bool StreamAdvanceViewTimeNotification::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } return true; } void StreamAdvanceViewTimeNotification::Swap(StreamAdvanceViewTimeNotification* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); std::swap(club_id_, other->club_id_); view_.Swap(&other->view_); std::swap(_has_bits_[0], other->_has_bits_[0]); @@ -7954,324 +7733,6 @@ void StreamAdvanceViewTimeNotification::Swap(StreamAdvanceViewTimeNotification* } -// =================================================================== - -#ifndef _MSC_VER -const int ClubActivityNotification::kAgentIdFieldNumber; -const int ClubActivityNotification::kSubscriberIdFieldNumber; -const int ClubActivityNotification::kClubIdFieldNumber; -#endif // !_MSC_VER - -ClubActivityNotification::ClubActivityNotification() - : ::google::protobuf::Message() { - SharedCtor(); - // @@protoc_insertion_point(constructor:bgs.protocol.club.v1.ClubActivityNotification) -} - -void ClubActivityNotification::InitAsDefaultInstance() { - agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - subscriber_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); -} - -ClubActivityNotification::ClubActivityNotification(const ClubActivityNotification& from) - : ::google::protobuf::Message() { - SharedCtor(); - MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:bgs.protocol.club.v1.ClubActivityNotification) -} - -void ClubActivityNotification::SharedCtor() { - _cached_size_ = 0; - agent_id_ = NULL; - subscriber_id_ = NULL; - club_id_ = GOOGLE_ULONGLONG(0); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); -} - -ClubActivityNotification::~ClubActivityNotification() { - // @@protoc_insertion_point(destructor:bgs.protocol.club.v1.ClubActivityNotification) - SharedDtor(); -} - -void ClubActivityNotification::SharedDtor() { - if (this != default_instance_) { - delete agent_id_; - delete subscriber_id_; - } -} - -void ClubActivityNotification::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const ::google::protobuf::Descriptor* ClubActivityNotification::descriptor() { - protobuf_AssignDescriptorsOnce(); - return ClubActivityNotification_descriptor_; -} - -const ClubActivityNotification& ClubActivityNotification::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_club_5fnotification_2eproto(); - return *default_instance_; -} - -ClubActivityNotification* ClubActivityNotification::default_instance_ = NULL; - -ClubActivityNotification* ClubActivityNotification::New() const { - return new ClubActivityNotification; -} - -void ClubActivityNotification::Clear() { - if (_has_bits_[0 / 32] & 7) { - if (has_agent_id()) { - if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); - } - if (has_subscriber_id()) { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - } - club_id_ = GOOGLE_ULONGLONG(0); - } - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - mutable_unknown_fields()->Clear(); -} - -bool ClubActivityNotification::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:bgs.protocol.club.v1.ClubActivityNotification) - for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // optional .bgs.protocol.club.v1.MemberId agent_id = 1; - case 1: { - if (tag == 10) { - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_agent_id())); - } else { - goto handle_unusual; - } - if (input->ExpectTag(18)) goto parse_subscriber_id; - break; - } - - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - case 2: { - if (tag == 18) { - parse_subscriber_id: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_subscriber_id())); - } else { - goto handle_unusual; - } - if (input->ExpectTag(24)) goto parse_club_id; - break; - } - - // optional uint64 club_id = 3; - case 3: { - if (tag == 24) { - parse_club_id: - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>( - input, &club_id_))); - set_has_club_id(); - } else { - goto handle_unusual; - } - if (input->ExpectAtEnd()) goto success; - break; - } - - default: { - handle_unusual: - if (tag == 0 || - ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { - goto success; - } - DO_(::google::protobuf::internal::WireFormat::SkipField( - input, tag, mutable_unknown_fields())); - break; - } - } - } -success: - // @@protoc_insertion_point(parse_success:bgs.protocol.club.v1.ClubActivityNotification) - return true; -failure: - // @@protoc_insertion_point(parse_failure:bgs.protocol.club.v1.ClubActivityNotification) - return false; -#undef DO_ -} - -void ClubActivityNotification::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:bgs.protocol.club.v1.ClubActivityNotification) - // optional .bgs.protocol.club.v1.MemberId agent_id = 1; - if (has_agent_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 1, this->agent_id(), output); - } - - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->subscriber_id(), output); - } - - // optional uint64 club_id = 3; - if (has_club_id()) { - ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->club_id(), output); - } - - if (!unknown_fields().empty()) { - ::google::protobuf::internal::WireFormat::SerializeUnknownFields( - unknown_fields(), output); - } - // @@protoc_insertion_point(serialize_end:bgs.protocol.club.v1.ClubActivityNotification) -} - -::google::protobuf::uint8* ClubActivityNotification::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.club.v1.ClubActivityNotification) - // optional .bgs.protocol.club.v1.MemberId agent_id = 1; - if (has_agent_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 1, this->agent_id(), target); - } - - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->subscriber_id(), target); - } - - // optional uint64 club_id = 3; - if (has_club_id()) { - target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->club_id(), target); - } - - if (!unknown_fields().empty()) { - target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - unknown_fields(), target); - } - // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.club.v1.ClubActivityNotification) - return target; -} - -int ClubActivityNotification::ByteSize() const { - int total_size = 0; - - if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // optional .bgs.protocol.club.v1.MemberId agent_id = 1; - if (has_agent_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->agent_id()); - } - - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - if (has_subscriber_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->subscriber_id()); - } - - // optional uint64 club_id = 3; - if (has_club_id()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::UInt64Size( - this->club_id()); - } - - } - if (!unknown_fields().empty()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); - } - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); - return total_size; -} - -void ClubActivityNotification::MergeFrom(const ::google::protobuf::Message& from) { - GOOGLE_CHECK_NE(&from, this); - const ClubActivityNotification* source = - ::google::protobuf::internal::dynamic_cast_if_available<const ClubActivityNotification*>( - &from); - if (source == NULL) { - ::google::protobuf::internal::ReflectionOps::Merge(from, this); - } else { - MergeFrom(*source); - } -} - -void ClubActivityNotification::MergeFrom(const ClubActivityNotification& from) { - GOOGLE_CHECK_NE(&from, this); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { - if (from.has_agent_id()) { - mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); - } - if (from.has_subscriber_id()) { - mutable_subscriber_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.subscriber_id()); - } - if (from.has_club_id()) { - set_club_id(from.club_id()); - } - } - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); -} - -void ClubActivityNotification::CopyFrom(const ::google::protobuf::Message& from) { - if (&from == this) return; - Clear(); - MergeFrom(from); -} - -void ClubActivityNotification::CopyFrom(const ClubActivityNotification& from) { - if (&from == this) return; - Clear(); - MergeFrom(from); -} - -bool ClubActivityNotification::IsInitialized() const { - - if (has_agent_id()) { - if (!this->agent_id().IsInitialized()) return false; - } - if (has_subscriber_id()) { - if (!this->subscriber_id().IsInitialized()) return false; - } - return true; -} - -void ClubActivityNotification::Swap(ClubActivityNotification* other) { - if (other != this) { - std::swap(agent_id_, other->agent_id_); - std::swap(subscriber_id_, other->subscriber_id_); - std::swap(club_id_, other->club_id_); - std::swap(_has_bits_[0], other->_has_bits_[0]); - _unknown_fields_.Swap(&other->_unknown_fields_); - std::swap(_cached_size_, other->_cached_size_); - } -} - -::google::protobuf::Metadata ClubActivityNotification::GetMetadata() const { - protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = ClubActivityNotification_descriptor_; - metadata.reflection = ClubActivityNotification_reflection_; - return metadata; -} - - // @@protoc_insertion_point(namespace_scope) } // namespace v1 diff --git a/src/server/proto/Client/club_notification.pb.h b/src/server/proto/Client/club_notification.pb.h index 43688c80ca0..f5634407320 100644 --- a/src/server/proto/Client/club_notification.pb.h +++ b/src/server/proto/Client/club_notification.pb.h @@ -48,6 +48,8 @@ class MemberRemovedNotification; class MemberStateChangedNotification; class SubscriberStateChangedNotification; class MemberRoleChangedNotification; +class InvitationAddedNotification; +class InvitationRemovedNotification; class SuggestionAddedNotification; class SuggestionRemovedNotification; class StreamAddedNotification; @@ -58,7 +60,6 @@ class StreamMessageUpdatedNotification; class StreamTypingIndicatorNotification; class StreamUnreadIndicatorNotification; class StreamAdvanceViewTimeNotification; -class ClubActivityNotification; // =================================================================== @@ -124,15 +125,6 @@ class TC_PROTO_API SubscribeNotification : public ::google::protobuf::Message { inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::club::v1::MemberId& subscriber_id() const; - inline ::bgs::protocol::club::v1::MemberId* mutable_subscriber_id(); - inline ::bgs::protocol::club::v1::MemberId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id); - // optional uint64 club_id = 3; inline bool has_club_id() const; inline void clear_club_id(); @@ -180,8 +172,6 @@ class TC_PROTO_API SubscribeNotification : public ::google::protobuf::Message { private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_club_id(); inline void clear_has_club_id(); inline void set_has_club(); @@ -198,7 +188,6 @@ class TC_PROTO_API SubscribeNotification : public ::google::protobuf::Message { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::club::v1::MemberId* agent_id_; - ::bgs::protocol::club::v1::MemberId* subscriber_id_; ::google::protobuf::uint64 club_id_; ::bgs::protocol::club::v1::Club* club_; ::bgs::protocol::club::v1::ClubView* view_; @@ -275,15 +264,6 @@ class TC_PROTO_API UnsubscribeNotification : public ::google::protobuf::Message inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::club::v1::MemberId& subscriber_id() const; - inline ::bgs::protocol::club::v1::MemberId* mutable_subscriber_id(); - inline ::bgs::protocol::club::v1::MemberId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id); - // optional uint64 club_id = 3; inline bool has_club_id() const; inline void clear_club_id(); @@ -295,8 +275,6 @@ class TC_PROTO_API UnsubscribeNotification : public ::google::protobuf::Message private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_club_id(); inline void clear_has_club_id(); @@ -305,7 +283,6 @@ class TC_PROTO_API UnsubscribeNotification : public ::google::protobuf::Message ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::club::v1::MemberId* agent_id_; - ::bgs::protocol::club::v1::MemberId* subscriber_id_; ::google::protobuf::uint64 club_id_; friend void TC_PROTO_API protobuf_AddDesc_club_5fnotification_2eproto(); friend void protobuf_AssignDesc_club_5fnotification_2eproto(); @@ -378,15 +355,6 @@ class TC_PROTO_API StateChangedNotification : public ::google::protobuf::Message inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::club::v1::MemberId& subscriber_id() const; - inline ::bgs::protocol::club::v1::MemberId* mutable_subscriber_id(); - inline ::bgs::protocol::club::v1::MemberId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id); - // optional uint64 club_id = 3; inline bool has_club_id() const; inline void clear_club_id(); @@ -407,8 +375,6 @@ class TC_PROTO_API StateChangedNotification : public ::google::protobuf::Message private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_club_id(); inline void clear_has_club_id(); inline void set_has_assignment(); @@ -419,7 +385,6 @@ class TC_PROTO_API StateChangedNotification : public ::google::protobuf::Message ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::club::v1::MemberId* agent_id_; - ::bgs::protocol::club::v1::MemberId* subscriber_id_; ::google::protobuf::uint64 club_id_; ::bgs::protocol::club::v1::ClubStateAssignment* assignment_; friend void TC_PROTO_API protobuf_AddDesc_club_5fnotification_2eproto(); @@ -493,15 +458,6 @@ class TC_PROTO_API SettingsChangedNotification : public ::google::protobuf::Mess inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::club::v1::MemberId& subscriber_id() const; - inline ::bgs::protocol::club::v1::MemberId* mutable_subscriber_id(); - inline ::bgs::protocol::club::v1::MemberId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id); - // optional uint64 club_id = 3; inline bool has_club_id() const; inline void clear_club_id(); @@ -522,8 +478,6 @@ class TC_PROTO_API SettingsChangedNotification : public ::google::protobuf::Mess private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_club_id(); inline void clear_has_club_id(); inline void set_has_assignment(); @@ -534,7 +488,6 @@ class TC_PROTO_API SettingsChangedNotification : public ::google::protobuf::Mess ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::club::v1::MemberId* agent_id_; - ::bgs::protocol::club::v1::MemberId* subscriber_id_; ::google::protobuf::uint64 club_id_; ::bgs::protocol::club::v1::ClubSettingsAssignment* assignment_; friend void TC_PROTO_API protobuf_AddDesc_club_5fnotification_2eproto(); @@ -608,15 +561,6 @@ class TC_PROTO_API MemberAddedNotification : public ::google::protobuf::Message inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::club::v1::MemberId& subscriber_id() const; - inline ::bgs::protocol::club::v1::MemberId* mutable_subscriber_id(); - inline ::bgs::protocol::club::v1::MemberId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id); - // optional uint64 club_id = 3; inline bool has_club_id() const; inline void clear_club_id(); @@ -640,8 +584,6 @@ class TC_PROTO_API MemberAddedNotification : public ::google::protobuf::Message private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_club_id(); inline void clear_has_club_id(); @@ -650,7 +592,6 @@ class TC_PROTO_API MemberAddedNotification : public ::google::protobuf::Message ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::club::v1::MemberId* agent_id_; - ::bgs::protocol::club::v1::MemberId* subscriber_id_; ::google::protobuf::uint64 club_id_; ::google::protobuf::RepeatedPtrField< ::bgs::protocol::club::v1::Member > member_; friend void TC_PROTO_API protobuf_AddDesc_club_5fnotification_2eproto(); @@ -724,15 +665,6 @@ class TC_PROTO_API MemberRemovedNotification : public ::google::protobuf::Messag inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::club::v1::MemberId& subscriber_id() const; - inline ::bgs::protocol::club::v1::MemberId* mutable_subscriber_id(); - inline ::bgs::protocol::club::v1::MemberId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id); - // optional uint64 club_id = 3; inline bool has_club_id() const; inline void clear_club_id(); @@ -756,8 +688,6 @@ class TC_PROTO_API MemberRemovedNotification : public ::google::protobuf::Messag private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_club_id(); inline void clear_has_club_id(); @@ -766,7 +696,6 @@ class TC_PROTO_API MemberRemovedNotification : public ::google::protobuf::Messag ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::club::v1::MemberId* agent_id_; - ::bgs::protocol::club::v1::MemberId* subscriber_id_; ::google::protobuf::uint64 club_id_; ::google::protobuf::RepeatedPtrField< ::bgs::protocol::club::v1::MemberRemovedAssignment > member_; friend void TC_PROTO_API protobuf_AddDesc_club_5fnotification_2eproto(); @@ -840,15 +769,6 @@ class TC_PROTO_API MemberStateChangedNotification : public ::google::protobuf::M inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::club::v1::MemberId& subscriber_id() const; - inline ::bgs::protocol::club::v1::MemberId* mutable_subscriber_id(); - inline ::bgs::protocol::club::v1::MemberId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id); - // optional uint64 club_id = 3; inline bool has_club_id() const; inline void clear_club_id(); @@ -872,8 +792,6 @@ class TC_PROTO_API MemberStateChangedNotification : public ::google::protobuf::M private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_club_id(); inline void clear_has_club_id(); @@ -882,7 +800,6 @@ class TC_PROTO_API MemberStateChangedNotification : public ::google::protobuf::M ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::club::v1::MemberId* agent_id_; - ::bgs::protocol::club::v1::MemberId* subscriber_id_; ::google::protobuf::uint64 club_id_; ::google::protobuf::RepeatedPtrField< ::bgs::protocol::club::v1::MemberStateAssignment > assignment_; friend void TC_PROTO_API protobuf_AddDesc_club_5fnotification_2eproto(); @@ -956,15 +873,6 @@ class TC_PROTO_API SubscriberStateChangedNotification : public ::google::protobu inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::club::v1::MemberId& subscriber_id() const; - inline ::bgs::protocol::club::v1::MemberId* mutable_subscriber_id(); - inline ::bgs::protocol::club::v1::MemberId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id); - // optional uint64 club_id = 3; inline bool has_club_id() const; inline void clear_club_id(); @@ -988,8 +896,6 @@ class TC_PROTO_API SubscriberStateChangedNotification : public ::google::protobu private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_club_id(); inline void clear_has_club_id(); @@ -998,7 +904,6 @@ class TC_PROTO_API SubscriberStateChangedNotification : public ::google::protobu ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::club::v1::MemberId* agent_id_; - ::bgs::protocol::club::v1::MemberId* subscriber_id_; ::google::protobuf::uint64 club_id_; ::google::protobuf::RepeatedPtrField< ::bgs::protocol::club::v1::SubscriberStateAssignment > assignment_; friend void TC_PROTO_API protobuf_AddDesc_club_5fnotification_2eproto(); @@ -1072,15 +977,6 @@ class TC_PROTO_API MemberRoleChangedNotification : public ::google::protobuf::Me inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::club::v1::MemberId& subscriber_id() const; - inline ::bgs::protocol::club::v1::MemberId* mutable_subscriber_id(); - inline ::bgs::protocol::club::v1::MemberId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id); - // optional uint64 club_id = 3; inline bool has_club_id() const; inline void clear_club_id(); @@ -1104,8 +1000,6 @@ class TC_PROTO_API MemberRoleChangedNotification : public ::google::protobuf::Me private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_club_id(); inline void clear_has_club_id(); @@ -1114,7 +1008,6 @@ class TC_PROTO_API MemberRoleChangedNotification : public ::google::protobuf::Me ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::club::v1::MemberId* agent_id_; - ::bgs::protocol::club::v1::MemberId* subscriber_id_; ::google::protobuf::uint64 club_id_; ::google::protobuf::RepeatedPtrField< ::bgs::protocol::club::v1::RoleAssignment > assignment_; friend void TC_PROTO_API protobuf_AddDesc_club_5fnotification_2eproto(); @@ -1126,6 +1019,220 @@ class TC_PROTO_API MemberRoleChangedNotification : public ::google::protobuf::Me }; // ------------------------------------------------------------------- +class TC_PROTO_API InvitationAddedNotification : public ::google::protobuf::Message { + public: + InvitationAddedNotification(); + virtual ~InvitationAddedNotification(); + + InvitationAddedNotification(const InvitationAddedNotification& from); + + inline InvitationAddedNotification& operator=(const InvitationAddedNotification& from) { + CopyFrom(from); + return *this; + } + + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); + static const InvitationAddedNotification& default_instance(); + + void Swap(InvitationAddedNotification* other); + + // implements Message ---------------------------------------------- + + InvitationAddedNotification* New() const; + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); + void CopyFrom(const InvitationAddedNotification& from); + void MergeFrom(const InvitationAddedNotification& from); + void Clear(); + bool IsInitialized() const; + + int ByteSize() const; + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input); + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; + int GetCachedSize() const { return _cached_size_; } + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const; + public: + ::google::protobuf::Metadata GetMetadata() const; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // optional .bgs.protocol.club.v1.MemberId agent_id = 1; + inline bool has_agent_id() const; + inline void clear_agent_id(); + static const int kAgentIdFieldNumber = 1; + inline const ::bgs::protocol::club::v1::MemberId& agent_id() const; + inline ::bgs::protocol::club::v1::MemberId* mutable_agent_id(); + inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); + inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); + + // optional uint64 club_id = 3; + inline bool has_club_id() const; + inline void clear_club_id(); + static const int kClubIdFieldNumber = 3; + inline ::google::protobuf::uint64 club_id() const; + inline void set_club_id(::google::protobuf::uint64 value); + + // optional .bgs.protocol.club.v1.ClubInvitation invitation = 4; + inline bool has_invitation() const; + inline void clear_invitation(); + static const int kInvitationFieldNumber = 4; + inline const ::bgs::protocol::club::v1::ClubInvitation& invitation() const; + inline ::bgs::protocol::club::v1::ClubInvitation* mutable_invitation(); + inline ::bgs::protocol::club::v1::ClubInvitation* release_invitation(); + inline void set_allocated_invitation(::bgs::protocol::club::v1::ClubInvitation* invitation); + + // @@protoc_insertion_point(class_scope:bgs.protocol.club.v1.InvitationAddedNotification) + private: + inline void set_has_agent_id(); + inline void clear_has_agent_id(); + inline void set_has_club_id(); + inline void clear_has_club_id(); + inline void set_has_invitation(); + inline void clear_has_invitation(); + + ::google::protobuf::UnknownFieldSet _unknown_fields_; + + ::google::protobuf::uint32 _has_bits_[1]; + mutable int _cached_size_; + ::bgs::protocol::club::v1::MemberId* agent_id_; + ::google::protobuf::uint64 club_id_; + ::bgs::protocol::club::v1::ClubInvitation* invitation_; + friend void TC_PROTO_API protobuf_AddDesc_club_5fnotification_2eproto(); + friend void protobuf_AssignDesc_club_5fnotification_2eproto(); + friend void protobuf_ShutdownFile_club_5fnotification_2eproto(); + + void InitAsDefaultInstance(); + static InvitationAddedNotification* default_instance_; +}; +// ------------------------------------------------------------------- + +class TC_PROTO_API InvitationRemovedNotification : public ::google::protobuf::Message { + public: + InvitationRemovedNotification(); + virtual ~InvitationRemovedNotification(); + + InvitationRemovedNotification(const InvitationRemovedNotification& from); + + inline InvitationRemovedNotification& operator=(const InvitationRemovedNotification& from) { + CopyFrom(from); + return *this; + } + + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); + static const InvitationRemovedNotification& default_instance(); + + void Swap(InvitationRemovedNotification* other); + + // implements Message ---------------------------------------------- + + InvitationRemovedNotification* New() const; + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); + void CopyFrom(const InvitationRemovedNotification& from); + void MergeFrom(const InvitationRemovedNotification& from); + void Clear(); + bool IsInitialized() const; + + int ByteSize() const; + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input); + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; + int GetCachedSize() const { return _cached_size_; } + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const; + public: + ::google::protobuf::Metadata GetMetadata() const; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // optional .bgs.protocol.club.v1.MemberId agent_id = 1; + inline bool has_agent_id() const; + inline void clear_agent_id(); + static const int kAgentIdFieldNumber = 1; + inline const ::bgs::protocol::club::v1::MemberId& agent_id() const; + inline ::bgs::protocol::club::v1::MemberId* mutable_agent_id(); + inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); + inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); + + // optional uint64 club_id = 3; + inline bool has_club_id() const; + inline void clear_club_id(); + static const int kClubIdFieldNumber = 3; + inline ::google::protobuf::uint64 club_id() const; + inline void set_club_id(::google::protobuf::uint64 value); + + // optional fixed64 invitation_id = 4; + inline bool has_invitation_id() const; + inline void clear_invitation_id(); + static const int kInvitationIdFieldNumber = 4; + inline ::google::protobuf::uint64 invitation_id() const; + inline void set_invitation_id(::google::protobuf::uint64 value); + + // optional .bgs.protocol.InvitationRemovedReason reason = 5; + inline bool has_reason() const; + inline void clear_reason(); + static const int kReasonFieldNumber = 5; + inline ::bgs::protocol::InvitationRemovedReason reason() const; + inline void set_reason(::bgs::protocol::InvitationRemovedReason value); + + // @@protoc_insertion_point(class_scope:bgs.protocol.club.v1.InvitationRemovedNotification) + private: + inline void set_has_agent_id(); + inline void clear_has_agent_id(); + inline void set_has_club_id(); + inline void clear_has_club_id(); + inline void set_has_invitation_id(); + inline void clear_has_invitation_id(); + inline void set_has_reason(); + inline void clear_has_reason(); + + ::google::protobuf::UnknownFieldSet _unknown_fields_; + + ::google::protobuf::uint32 _has_bits_[1]; + mutable int _cached_size_; + ::bgs::protocol::club::v1::MemberId* agent_id_; + ::google::protobuf::uint64 club_id_; + ::google::protobuf::uint64 invitation_id_; + int reason_; + friend void TC_PROTO_API protobuf_AddDesc_club_5fnotification_2eproto(); + friend void protobuf_AssignDesc_club_5fnotification_2eproto(); + friend void protobuf_ShutdownFile_club_5fnotification_2eproto(); + + void InitAsDefaultInstance(); + static InvitationRemovedNotification* default_instance_; +}; +// ------------------------------------------------------------------- + class TC_PROTO_API SuggestionAddedNotification : public ::google::protobuf::Message { public: SuggestionAddedNotification(); @@ -1188,15 +1295,6 @@ class TC_PROTO_API SuggestionAddedNotification : public ::google::protobuf::Mess inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::club::v1::MemberId& subscriber_id() const; - inline ::bgs::protocol::club::v1::MemberId* mutable_subscriber_id(); - inline ::bgs::protocol::club::v1::MemberId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id); - // optional uint64 club_id = 3; inline bool has_club_id() const; inline void clear_club_id(); @@ -1204,7 +1302,7 @@ class TC_PROTO_API SuggestionAddedNotification : public ::google::protobuf::Mess inline ::google::protobuf::uint64 club_id() const; inline void set_club_id(::google::protobuf::uint64 value); - // required .bgs.protocol.club.v1.ClubSuggestion suggestion = 4; + // optional .bgs.protocol.club.v1.ClubSuggestion suggestion = 4; inline bool has_suggestion() const; inline void clear_suggestion(); static const int kSuggestionFieldNumber = 4; @@ -1217,8 +1315,6 @@ class TC_PROTO_API SuggestionAddedNotification : public ::google::protobuf::Mess private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_club_id(); inline void clear_has_club_id(); inline void set_has_suggestion(); @@ -1229,7 +1325,6 @@ class TC_PROTO_API SuggestionAddedNotification : public ::google::protobuf::Mess ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::club::v1::MemberId* agent_id_; - ::bgs::protocol::club::v1::MemberId* subscriber_id_; ::google::protobuf::uint64 club_id_; ::bgs::protocol::club::v1::ClubSuggestion* suggestion_; friend void TC_PROTO_API protobuf_AddDesc_club_5fnotification_2eproto(); @@ -1303,15 +1398,6 @@ class TC_PROTO_API SuggestionRemovedNotification : public ::google::protobuf::Me inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::club::v1::MemberId& subscriber_id() const; - inline ::bgs::protocol::club::v1::MemberId* mutable_subscriber_id(); - inline ::bgs::protocol::club::v1::MemberId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id); - // optional uint64 club_id = 3; inline bool has_club_id() const; inline void clear_club_id(); @@ -1337,8 +1423,6 @@ class TC_PROTO_API SuggestionRemovedNotification : public ::google::protobuf::Me private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_club_id(); inline void clear_has_club_id(); inline void set_has_suggestion_id(); @@ -1351,7 +1435,6 @@ class TC_PROTO_API SuggestionRemovedNotification : public ::google::protobuf::Me ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::club::v1::MemberId* agent_id_; - ::bgs::protocol::club::v1::MemberId* subscriber_id_; ::google::protobuf::uint64 club_id_; ::google::protobuf::uint64 suggestion_id_; int reason_; @@ -1426,15 +1509,6 @@ class TC_PROTO_API StreamAddedNotification : public ::google::protobuf::Message inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::club::v1::MemberId& subscriber_id() const; - inline ::bgs::protocol::club::v1::MemberId* mutable_subscriber_id(); - inline ::bgs::protocol::club::v1::MemberId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id); - // optional uint64 club_id = 3; inline bool has_club_id() const; inline void clear_club_id(); @@ -1455,8 +1529,6 @@ class TC_PROTO_API StreamAddedNotification : public ::google::protobuf::Message private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_club_id(); inline void clear_has_club_id(); inline void set_has_stream(); @@ -1467,7 +1539,6 @@ class TC_PROTO_API StreamAddedNotification : public ::google::protobuf::Message ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::club::v1::MemberId* agent_id_; - ::bgs::protocol::club::v1::MemberId* subscriber_id_; ::google::protobuf::uint64 club_id_; ::bgs::protocol::club::v1::Stream* stream_; friend void TC_PROTO_API protobuf_AddDesc_club_5fnotification_2eproto(); @@ -1541,15 +1612,6 @@ class TC_PROTO_API StreamRemovedNotification : public ::google::protobuf::Messag inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::club::v1::MemberId& subscriber_id() const; - inline ::bgs::protocol::club::v1::MemberId* mutable_subscriber_id(); - inline ::bgs::protocol::club::v1::MemberId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id); - // optional uint64 club_id = 3; inline bool has_club_id() const; inline void clear_club_id(); @@ -1568,8 +1630,6 @@ class TC_PROTO_API StreamRemovedNotification : public ::google::protobuf::Messag private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_club_id(); inline void clear_has_club_id(); inline void set_has_stream_id(); @@ -1580,7 +1640,6 @@ class TC_PROTO_API StreamRemovedNotification : public ::google::protobuf::Messag ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::club::v1::MemberId* agent_id_; - ::bgs::protocol::club::v1::MemberId* subscriber_id_; ::google::protobuf::uint64 club_id_; ::google::protobuf::uint64 stream_id_; friend void TC_PROTO_API protobuf_AddDesc_club_5fnotification_2eproto(); @@ -1654,15 +1713,6 @@ class TC_PROTO_API StreamStateChangedNotification : public ::google::protobuf::M inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::club::v1::MemberId& subscriber_id() const; - inline ::bgs::protocol::club::v1::MemberId* mutable_subscriber_id(); - inline ::bgs::protocol::club::v1::MemberId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id); - // optional uint64 club_id = 3; inline bool has_club_id() const; inline void clear_club_id(); @@ -1690,8 +1740,6 @@ class TC_PROTO_API StreamStateChangedNotification : public ::google::protobuf::M private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_club_id(); inline void clear_has_club_id(); inline void set_has_stream_id(); @@ -1704,7 +1752,6 @@ class TC_PROTO_API StreamStateChangedNotification : public ::google::protobuf::M ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::club::v1::MemberId* agent_id_; - ::bgs::protocol::club::v1::MemberId* subscriber_id_; ::google::protobuf::uint64 club_id_; ::google::protobuf::uint64 stream_id_; ::bgs::protocol::club::v1::StreamStateAssignment* assignment_; @@ -1779,15 +1826,6 @@ class TC_PROTO_API StreamMessageAddedNotification : public ::google::protobuf::M inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::club::v1::MemberId& subscriber_id() const; - inline ::bgs::protocol::club::v1::MemberId* mutable_subscriber_id(); - inline ::bgs::protocol::club::v1::MemberId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id); - // optional uint64 club_id = 3; inline bool has_club_id() const; inline void clear_club_id(); @@ -1815,8 +1853,6 @@ class TC_PROTO_API StreamMessageAddedNotification : public ::google::protobuf::M private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_club_id(); inline void clear_has_club_id(); inline void set_has_stream_id(); @@ -1829,7 +1865,6 @@ class TC_PROTO_API StreamMessageAddedNotification : public ::google::protobuf::M ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::club::v1::MemberId* agent_id_; - ::bgs::protocol::club::v1::MemberId* subscriber_id_; ::google::protobuf::uint64 club_id_; ::google::protobuf::uint64 stream_id_; ::bgs::protocol::club::v1::StreamMessage* message_; @@ -1904,15 +1939,6 @@ class TC_PROTO_API StreamMessageUpdatedNotification : public ::google::protobuf: inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::club::v1::MemberId& subscriber_id() const; - inline ::bgs::protocol::club::v1::MemberId* mutable_subscriber_id(); - inline ::bgs::protocol::club::v1::MemberId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id); - // optional uint64 club_id = 3; inline bool has_club_id() const; inline void clear_club_id(); @@ -1940,8 +1966,6 @@ class TC_PROTO_API StreamMessageUpdatedNotification : public ::google::protobuf: private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_club_id(); inline void clear_has_club_id(); inline void set_has_stream_id(); @@ -1954,7 +1978,6 @@ class TC_PROTO_API StreamMessageUpdatedNotification : public ::google::protobuf: ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::club::v1::MemberId* agent_id_; - ::bgs::protocol::club::v1::MemberId* subscriber_id_; ::google::protobuf::uint64 club_id_; ::google::protobuf::uint64 stream_id_; ::bgs::protocol::club::v1::StreamMessage* message_; @@ -2029,15 +2052,6 @@ class TC_PROTO_API StreamTypingIndicatorNotification : public ::google::protobuf inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::club::v1::MemberId& subscriber_id() const; - inline ::bgs::protocol::club::v1::MemberId* mutable_subscriber_id(); - inline ::bgs::protocol::club::v1::MemberId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id); - // optional uint64 club_id = 3; inline bool has_club_id() const; inline void clear_club_id(); @@ -2068,8 +2082,6 @@ class TC_PROTO_API StreamTypingIndicatorNotification : public ::google::protobuf private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_club_id(); inline void clear_has_club_id(); inline void set_has_stream_id(); @@ -2080,7 +2092,6 @@ class TC_PROTO_API StreamTypingIndicatorNotification : public ::google::protobuf ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::club::v1::MemberId* agent_id_; - ::bgs::protocol::club::v1::MemberId* subscriber_id_; ::google::protobuf::uint64 club_id_; ::google::protobuf::uint64 stream_id_; ::google::protobuf::RepeatedPtrField< ::bgs::protocol::club::v1::StreamTypingIndicator > indicator_; @@ -2155,15 +2166,6 @@ class TC_PROTO_API StreamUnreadIndicatorNotification : public ::google::protobuf inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::club::v1::MemberId& subscriber_id() const; - inline ::bgs::protocol::club::v1::MemberId* mutable_subscriber_id(); - inline ::bgs::protocol::club::v1::MemberId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id); - // optional uint64 club_id = 3; inline bool has_club_id() const; inline void clear_club_id(); @@ -2184,8 +2186,6 @@ class TC_PROTO_API StreamUnreadIndicatorNotification : public ::google::protobuf private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_club_id(); inline void clear_has_club_id(); inline void set_has_event(); @@ -2196,7 +2196,6 @@ class TC_PROTO_API StreamUnreadIndicatorNotification : public ::google::protobuf ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::club::v1::MemberId* agent_id_; - ::bgs::protocol::club::v1::MemberId* subscriber_id_; ::google::protobuf::uint64 club_id_; ::bgs::protocol::club::v1::StreamEventTime* event_; friend void TC_PROTO_API protobuf_AddDesc_club_5fnotification_2eproto(); @@ -2270,15 +2269,6 @@ class TC_PROTO_API StreamAdvanceViewTimeNotification : public ::google::protobuf inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::club::v1::MemberId& subscriber_id() const; - inline ::bgs::protocol::club::v1::MemberId* mutable_subscriber_id(); - inline ::bgs::protocol::club::v1::MemberId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id); - // optional uint64 club_id = 3; inline bool has_club_id() const; inline void clear_club_id(); @@ -2302,8 +2292,6 @@ class TC_PROTO_API StreamAdvanceViewTimeNotification : public ::google::protobuf private: inline void set_has_agent_id(); inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); inline void set_has_club_id(); inline void clear_has_club_id(); @@ -2312,7 +2300,6 @@ class TC_PROTO_API StreamAdvanceViewTimeNotification : public ::google::protobuf ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::bgs::protocol::club::v1::MemberId* agent_id_; - ::bgs::protocol::club::v1::MemberId* subscriber_id_; ::google::protobuf::uint64 club_id_; ::google::protobuf::RepeatedPtrField< ::bgs::protocol::club::v1::StreamAdvanceViewTime > view_; friend void TC_PROTO_API protobuf_AddDesc_club_5fnotification_2eproto(); @@ -2322,109 +2309,6 @@ class TC_PROTO_API StreamAdvanceViewTimeNotification : public ::google::protobuf void InitAsDefaultInstance(); static StreamAdvanceViewTimeNotification* default_instance_; }; -// ------------------------------------------------------------------- - -class TC_PROTO_API ClubActivityNotification : public ::google::protobuf::Message { - public: - ClubActivityNotification(); - virtual ~ClubActivityNotification(); - - ClubActivityNotification(const ClubActivityNotification& from); - - inline ClubActivityNotification& operator=(const ClubActivityNotification& from) { - CopyFrom(from); - return *this; - } - - inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { - return _unknown_fields_; - } - - inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { - return &_unknown_fields_; - } - - static const ::google::protobuf::Descriptor* descriptor(); - static const ClubActivityNotification& default_instance(); - - void Swap(ClubActivityNotification* other); - - // implements Message ---------------------------------------------- - - ClubActivityNotification* New() const; - void CopyFrom(const ::google::protobuf::Message& from); - void MergeFrom(const ::google::protobuf::Message& from); - void CopyFrom(const ClubActivityNotification& from); - void MergeFrom(const ClubActivityNotification& from); - void Clear(); - bool IsInitialized() const; - - int ByteSize() const; - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input); - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const; - ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; - int GetCachedSize() const { return _cached_size_; } - private: - void SharedCtor(); - void SharedDtor(); - void SetCachedSize(int size) const; - public: - ::google::protobuf::Metadata GetMetadata() const; - - // nested types ---------------------------------------------------- - - // accessors ------------------------------------------------------- - - // optional .bgs.protocol.club.v1.MemberId agent_id = 1; - inline bool has_agent_id() const; - inline void clear_agent_id(); - static const int kAgentIdFieldNumber = 1; - inline const ::bgs::protocol::club::v1::MemberId& agent_id() const; - inline ::bgs::protocol::club::v1::MemberId* mutable_agent_id(); - inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); - inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); - - // optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; - inline bool has_subscriber_id() const; - inline void clear_subscriber_id(); - static const int kSubscriberIdFieldNumber = 2; - inline const ::bgs::protocol::club::v1::MemberId& subscriber_id() const; - inline ::bgs::protocol::club::v1::MemberId* mutable_subscriber_id(); - inline ::bgs::protocol::club::v1::MemberId* release_subscriber_id(); - inline void set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id); - - // optional uint64 club_id = 3; - inline bool has_club_id() const; - inline void clear_club_id(); - static const int kClubIdFieldNumber = 3; - inline ::google::protobuf::uint64 club_id() const; - inline void set_club_id(::google::protobuf::uint64 value); - - // @@protoc_insertion_point(class_scope:bgs.protocol.club.v1.ClubActivityNotification) - private: - inline void set_has_agent_id(); - inline void clear_has_agent_id(); - inline void set_has_subscriber_id(); - inline void clear_has_subscriber_id(); - inline void set_has_club_id(); - inline void clear_has_club_id(); - - ::google::protobuf::UnknownFieldSet _unknown_fields_; - - ::google::protobuf::uint32 _has_bits_[1]; - mutable int _cached_size_; - ::bgs::protocol::club::v1::MemberId* agent_id_; - ::bgs::protocol::club::v1::MemberId* subscriber_id_; - ::google::protobuf::uint64 club_id_; - friend void TC_PROTO_API protobuf_AddDesc_club_5fnotification_2eproto(); - friend void protobuf_AssignDesc_club_5fnotification_2eproto(); - friend void protobuf_ShutdownFile_club_5fnotification_2eproto(); - - void InitAsDefaultInstance(); - static ClubActivityNotification* default_instance_; -}; // =================================================================== @@ -2476,56 +2360,15 @@ inline void SubscribeNotification::set_allocated_agent_id(::bgs::protocol::club: // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.SubscribeNotification.agent_id) } -// optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; -inline bool SubscribeNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void SubscribeNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void SubscribeNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void SubscribeNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::club::v1::MemberId& SubscribeNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.SubscribeNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* SubscribeNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::club::v1::MemberId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.SubscribeNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* SubscribeNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::club::v1::MemberId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void SubscribeNotification::set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.SubscribeNotification.subscriber_id) -} - // optional uint64 club_id = 3; inline bool SubscribeNotification::has_club_id() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } inline void SubscribeNotification::set_has_club_id() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } inline void SubscribeNotification::clear_has_club_id() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } inline void SubscribeNotification::clear_club_id() { club_id_ = GOOGLE_ULONGLONG(0); @@ -2543,13 +2386,13 @@ inline void SubscribeNotification::set_club_id(::google::protobuf::uint64 value) // optional .bgs.protocol.club.v1.Club club = 4; inline bool SubscribeNotification::has_club() const { - return (_has_bits_[0] & 0x00000008u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } inline void SubscribeNotification::set_has_club() { - _has_bits_[0] |= 0x00000008u; + _has_bits_[0] |= 0x00000004u; } inline void SubscribeNotification::clear_has_club() { - _has_bits_[0] &= ~0x00000008u; + _has_bits_[0] &= ~0x00000004u; } inline void SubscribeNotification::clear_club() { if (club_ != NULL) club_->::bgs::protocol::club::v1::Club::Clear(); @@ -2584,13 +2427,13 @@ inline void SubscribeNotification::set_allocated_club(::bgs::protocol::club::v1: // optional .bgs.protocol.club.v1.ClubView view = 5; inline bool SubscribeNotification::has_view() const { - return (_has_bits_[0] & 0x00000010u) != 0; + return (_has_bits_[0] & 0x00000008u) != 0; } inline void SubscribeNotification::set_has_view() { - _has_bits_[0] |= 0x00000010u; + _has_bits_[0] |= 0x00000008u; } inline void SubscribeNotification::clear_has_view() { - _has_bits_[0] &= ~0x00000010u; + _has_bits_[0] &= ~0x00000008u; } inline void SubscribeNotification::clear_view() { if (view_ != NULL) view_->::bgs::protocol::club::v1::ClubView::Clear(); @@ -2625,13 +2468,13 @@ inline void SubscribeNotification::set_allocated_view(::bgs::protocol::club::v1: // optional .bgs.protocol.club.v1.ClubSettings settings = 10; inline bool SubscribeNotification::has_settings() const { - return (_has_bits_[0] & 0x00000020u) != 0; + return (_has_bits_[0] & 0x00000010u) != 0; } inline void SubscribeNotification::set_has_settings() { - _has_bits_[0] |= 0x00000020u; + _has_bits_[0] |= 0x00000010u; } inline void SubscribeNotification::clear_has_settings() { - _has_bits_[0] &= ~0x00000020u; + _has_bits_[0] &= ~0x00000010u; } inline void SubscribeNotification::clear_settings() { if (settings_ != NULL) settings_->::bgs::protocol::club::v1::ClubSettings::Clear(); @@ -2666,13 +2509,13 @@ inline void SubscribeNotification::set_allocated_settings(::bgs::protocol::club: // optional .bgs.protocol.club.v1.Member member = 11; inline bool SubscribeNotification::has_member() const { - return (_has_bits_[0] & 0x00000040u) != 0; + return (_has_bits_[0] & 0x00000020u) != 0; } inline void SubscribeNotification::set_has_member() { - _has_bits_[0] |= 0x00000040u; + _has_bits_[0] |= 0x00000020u; } inline void SubscribeNotification::clear_has_member() { - _has_bits_[0] &= ~0x00000040u; + _has_bits_[0] &= ~0x00000020u; } inline void SubscribeNotification::clear_member() { if (member_ != NULL) member_->::bgs::protocol::club::v1::Member::Clear(); @@ -2750,56 +2593,15 @@ inline void UnsubscribeNotification::set_allocated_agent_id(::bgs::protocol::clu // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.UnsubscribeNotification.agent_id) } -// optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; -inline bool UnsubscribeNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void UnsubscribeNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void UnsubscribeNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void UnsubscribeNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::club::v1::MemberId& UnsubscribeNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.UnsubscribeNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* UnsubscribeNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::club::v1::MemberId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.UnsubscribeNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* UnsubscribeNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::club::v1::MemberId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void UnsubscribeNotification::set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.UnsubscribeNotification.subscriber_id) -} - // optional uint64 club_id = 3; inline bool UnsubscribeNotification::has_club_id() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } inline void UnsubscribeNotification::set_has_club_id() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } inline void UnsubscribeNotification::clear_has_club_id() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } inline void UnsubscribeNotification::clear_club_id() { club_id_ = GOOGLE_ULONGLONG(0); @@ -2860,56 +2662,15 @@ inline void StateChangedNotification::set_allocated_agent_id(::bgs::protocol::cl // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.StateChangedNotification.agent_id) } -// optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; -inline bool StateChangedNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void StateChangedNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void StateChangedNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void StateChangedNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::club::v1::MemberId& StateChangedNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.StateChangedNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* StateChangedNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::club::v1::MemberId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.StateChangedNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* StateChangedNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::club::v1::MemberId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void StateChangedNotification::set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.StateChangedNotification.subscriber_id) -} - // optional uint64 club_id = 3; inline bool StateChangedNotification::has_club_id() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } inline void StateChangedNotification::set_has_club_id() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } inline void StateChangedNotification::clear_has_club_id() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } inline void StateChangedNotification::clear_club_id() { club_id_ = GOOGLE_ULONGLONG(0); @@ -2927,13 +2688,13 @@ inline void StateChangedNotification::set_club_id(::google::protobuf::uint64 val // optional .bgs.protocol.club.v1.ClubStateAssignment assignment = 5; inline bool StateChangedNotification::has_assignment() const { - return (_has_bits_[0] & 0x00000008u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } inline void StateChangedNotification::set_has_assignment() { - _has_bits_[0] |= 0x00000008u; + _has_bits_[0] |= 0x00000004u; } inline void StateChangedNotification::clear_has_assignment() { - _has_bits_[0] &= ~0x00000008u; + _has_bits_[0] &= ~0x00000004u; } inline void StateChangedNotification::clear_assignment() { if (assignment_ != NULL) assignment_->::bgs::protocol::club::v1::ClubStateAssignment::Clear(); @@ -3011,56 +2772,15 @@ inline void SettingsChangedNotification::set_allocated_agent_id(::bgs::protocol: // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.SettingsChangedNotification.agent_id) } -// optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; -inline bool SettingsChangedNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void SettingsChangedNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void SettingsChangedNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void SettingsChangedNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::club::v1::MemberId& SettingsChangedNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.SettingsChangedNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* SettingsChangedNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::club::v1::MemberId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.SettingsChangedNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* SettingsChangedNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::club::v1::MemberId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void SettingsChangedNotification::set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.SettingsChangedNotification.subscriber_id) -} - // optional uint64 club_id = 3; inline bool SettingsChangedNotification::has_club_id() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } inline void SettingsChangedNotification::set_has_club_id() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } inline void SettingsChangedNotification::clear_has_club_id() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } inline void SettingsChangedNotification::clear_club_id() { club_id_ = GOOGLE_ULONGLONG(0); @@ -3078,13 +2798,13 @@ inline void SettingsChangedNotification::set_club_id(::google::protobuf::uint64 // optional .bgs.protocol.club.v1.ClubSettingsAssignment assignment = 4; inline bool SettingsChangedNotification::has_assignment() const { - return (_has_bits_[0] & 0x00000008u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } inline void SettingsChangedNotification::set_has_assignment() { - _has_bits_[0] |= 0x00000008u; + _has_bits_[0] |= 0x00000004u; } inline void SettingsChangedNotification::clear_has_assignment() { - _has_bits_[0] &= ~0x00000008u; + _has_bits_[0] &= ~0x00000004u; } inline void SettingsChangedNotification::clear_assignment() { if (assignment_ != NULL) assignment_->::bgs::protocol::club::v1::ClubSettingsAssignment::Clear(); @@ -3162,56 +2882,15 @@ inline void MemberAddedNotification::set_allocated_agent_id(::bgs::protocol::clu // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.MemberAddedNotification.agent_id) } -// optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; -inline bool MemberAddedNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void MemberAddedNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void MemberAddedNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void MemberAddedNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::club::v1::MemberId& MemberAddedNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.MemberAddedNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* MemberAddedNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::club::v1::MemberId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.MemberAddedNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* MemberAddedNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::club::v1::MemberId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void MemberAddedNotification::set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.MemberAddedNotification.subscriber_id) -} - // optional uint64 club_id = 3; inline bool MemberAddedNotification::has_club_id() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } inline void MemberAddedNotification::set_has_club_id() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } inline void MemberAddedNotification::clear_has_club_id() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } inline void MemberAddedNotification::clear_club_id() { club_id_ = GOOGLE_ULONGLONG(0); @@ -3302,56 +2981,15 @@ inline void MemberRemovedNotification::set_allocated_agent_id(::bgs::protocol::c // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.MemberRemovedNotification.agent_id) } -// optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; -inline bool MemberRemovedNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void MemberRemovedNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void MemberRemovedNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void MemberRemovedNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::club::v1::MemberId& MemberRemovedNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.MemberRemovedNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* MemberRemovedNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::club::v1::MemberId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.MemberRemovedNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* MemberRemovedNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::club::v1::MemberId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void MemberRemovedNotification::set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.MemberRemovedNotification.subscriber_id) -} - // optional uint64 club_id = 3; inline bool MemberRemovedNotification::has_club_id() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } inline void MemberRemovedNotification::set_has_club_id() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } inline void MemberRemovedNotification::clear_has_club_id() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } inline void MemberRemovedNotification::clear_club_id() { club_id_ = GOOGLE_ULONGLONG(0); @@ -3442,56 +3080,15 @@ inline void MemberStateChangedNotification::set_allocated_agent_id(::bgs::protoc // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.MemberStateChangedNotification.agent_id) } -// optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; -inline bool MemberStateChangedNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void MemberStateChangedNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void MemberStateChangedNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void MemberStateChangedNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::club::v1::MemberId& MemberStateChangedNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.MemberStateChangedNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* MemberStateChangedNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::club::v1::MemberId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.MemberStateChangedNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* MemberStateChangedNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::club::v1::MemberId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void MemberStateChangedNotification::set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.MemberStateChangedNotification.subscriber_id) -} - // optional uint64 club_id = 3; inline bool MemberStateChangedNotification::has_club_id() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } inline void MemberStateChangedNotification::set_has_club_id() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } inline void MemberStateChangedNotification::clear_has_club_id() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } inline void MemberStateChangedNotification::clear_club_id() { club_id_ = GOOGLE_ULONGLONG(0); @@ -3582,56 +3179,15 @@ inline void SubscriberStateChangedNotification::set_allocated_agent_id(::bgs::pr // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.SubscriberStateChangedNotification.agent_id) } -// optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; -inline bool SubscriberStateChangedNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void SubscriberStateChangedNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void SubscriberStateChangedNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void SubscriberStateChangedNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::club::v1::MemberId& SubscriberStateChangedNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.SubscriberStateChangedNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* SubscriberStateChangedNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::club::v1::MemberId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.SubscriberStateChangedNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* SubscriberStateChangedNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::club::v1::MemberId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void SubscriberStateChangedNotification::set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.SubscriberStateChangedNotification.subscriber_id) -} - // optional uint64 club_id = 3; inline bool SubscriberStateChangedNotification::has_club_id() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } inline void SubscriberStateChangedNotification::set_has_club_id() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } inline void SubscriberStateChangedNotification::clear_has_club_id() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } inline void SubscriberStateChangedNotification::clear_club_id() { club_id_ = GOOGLE_ULONGLONG(0); @@ -3722,56 +3278,15 @@ inline void MemberRoleChangedNotification::set_allocated_agent_id(::bgs::protoco // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.MemberRoleChangedNotification.agent_id) } -// optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; -inline bool MemberRoleChangedNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void MemberRoleChangedNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void MemberRoleChangedNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void MemberRoleChangedNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::club::v1::MemberId& MemberRoleChangedNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.MemberRoleChangedNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* MemberRoleChangedNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::club::v1::MemberId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.MemberRoleChangedNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* MemberRoleChangedNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::club::v1::MemberId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void MemberRoleChangedNotification::set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.MemberRoleChangedNotification.subscriber_id) -} - // optional uint64 club_id = 3; inline bool MemberRoleChangedNotification::has_club_id() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } inline void MemberRoleChangedNotification::set_has_club_id() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } inline void MemberRoleChangedNotification::clear_has_club_id() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } inline void MemberRoleChangedNotification::clear_club_id() { club_id_ = GOOGLE_ULONGLONG(0); @@ -3819,39 +3334,39 @@ MemberRoleChangedNotification::mutable_assignment() { // ------------------------------------------------------------------- -// SuggestionAddedNotification +// InvitationAddedNotification // optional .bgs.protocol.club.v1.MemberId agent_id = 1; -inline bool SuggestionAddedNotification::has_agent_id() const { +inline bool InvitationAddedNotification::has_agent_id() const { return (_has_bits_[0] & 0x00000001u) != 0; } -inline void SuggestionAddedNotification::set_has_agent_id() { +inline void InvitationAddedNotification::set_has_agent_id() { _has_bits_[0] |= 0x00000001u; } -inline void SuggestionAddedNotification::clear_has_agent_id() { +inline void InvitationAddedNotification::clear_has_agent_id() { _has_bits_[0] &= ~0x00000001u; } -inline void SuggestionAddedNotification::clear_agent_id() { +inline void InvitationAddedNotification::clear_agent_id() { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); clear_has_agent_id(); } -inline const ::bgs::protocol::club::v1::MemberId& SuggestionAddedNotification::agent_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.SuggestionAddedNotification.agent_id) +inline const ::bgs::protocol::club::v1::MemberId& InvitationAddedNotification::agent_id() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.InvitationAddedNotification.agent_id) return agent_id_ != NULL ? *agent_id_ : *default_instance_->agent_id_; } -inline ::bgs::protocol::club::v1::MemberId* SuggestionAddedNotification::mutable_agent_id() { +inline ::bgs::protocol::club::v1::MemberId* InvitationAddedNotification::mutable_agent_id() { set_has_agent_id(); if (agent_id_ == NULL) agent_id_ = new ::bgs::protocol::club::v1::MemberId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.SuggestionAddedNotification.agent_id) + // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.InvitationAddedNotification.agent_id) return agent_id_; } -inline ::bgs::protocol::club::v1::MemberId* SuggestionAddedNotification::release_agent_id() { +inline ::bgs::protocol::club::v1::MemberId* InvitationAddedNotification::release_agent_id() { clear_has_agent_id(); ::bgs::protocol::club::v1::MemberId* temp = agent_id_; agent_id_ = NULL; return temp; } -inline void SuggestionAddedNotification::set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id) { +inline void InvitationAddedNotification::set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id) { delete agent_id_; agent_id_ = agent_id; if (agent_id) { @@ -3859,60 +3374,247 @@ inline void SuggestionAddedNotification::set_allocated_agent_id(::bgs::protocol: } else { clear_has_agent_id(); } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.SuggestionAddedNotification.agent_id) + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.InvitationAddedNotification.agent_id) } -// optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; -inline bool SuggestionAddedNotification::has_subscriber_id() const { +// optional uint64 club_id = 3; +inline bool InvitationAddedNotification::has_club_id() const { return (_has_bits_[0] & 0x00000002u) != 0; } -inline void SuggestionAddedNotification::set_has_subscriber_id() { +inline void InvitationAddedNotification::set_has_club_id() { _has_bits_[0] |= 0x00000002u; } -inline void SuggestionAddedNotification::clear_has_subscriber_id() { +inline void InvitationAddedNotification::clear_has_club_id() { _has_bits_[0] &= ~0x00000002u; } -inline void SuggestionAddedNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - clear_has_subscriber_id(); +inline void InvitationAddedNotification::clear_club_id() { + club_id_ = GOOGLE_ULONGLONG(0); + clear_has_club_id(); +} +inline ::google::protobuf::uint64 InvitationAddedNotification::club_id() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.InvitationAddedNotification.club_id) + return club_id_; } -inline const ::bgs::protocol::club::v1::MemberId& SuggestionAddedNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.SuggestionAddedNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; +inline void InvitationAddedNotification::set_club_id(::google::protobuf::uint64 value) { + set_has_club_id(); + club_id_ = value; + // @@protoc_insertion_point(field_set:bgs.protocol.club.v1.InvitationAddedNotification.club_id) } -inline ::bgs::protocol::club::v1::MemberId* SuggestionAddedNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::club::v1::MemberId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.SuggestionAddedNotification.subscriber_id) - return subscriber_id_; + +// optional .bgs.protocol.club.v1.ClubInvitation invitation = 4; +inline bool InvitationAddedNotification::has_invitation() const { + return (_has_bits_[0] & 0x00000004u) != 0; } -inline ::bgs::protocol::club::v1::MemberId* SuggestionAddedNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::club::v1::MemberId* temp = subscriber_id_; - subscriber_id_ = NULL; +inline void InvitationAddedNotification::set_has_invitation() { + _has_bits_[0] |= 0x00000004u; +} +inline void InvitationAddedNotification::clear_has_invitation() { + _has_bits_[0] &= ~0x00000004u; +} +inline void InvitationAddedNotification::clear_invitation() { + if (invitation_ != NULL) invitation_->::bgs::protocol::club::v1::ClubInvitation::Clear(); + clear_has_invitation(); +} +inline const ::bgs::protocol::club::v1::ClubInvitation& InvitationAddedNotification::invitation() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.InvitationAddedNotification.invitation) + return invitation_ != NULL ? *invitation_ : *default_instance_->invitation_; +} +inline ::bgs::protocol::club::v1::ClubInvitation* InvitationAddedNotification::mutable_invitation() { + set_has_invitation(); + if (invitation_ == NULL) invitation_ = new ::bgs::protocol::club::v1::ClubInvitation; + // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.InvitationAddedNotification.invitation) + return invitation_; +} +inline ::bgs::protocol::club::v1::ClubInvitation* InvitationAddedNotification::release_invitation() { + clear_has_invitation(); + ::bgs::protocol::club::v1::ClubInvitation* temp = invitation_; + invitation_ = NULL; return temp; } -inline void SuggestionAddedNotification::set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); +inline void InvitationAddedNotification::set_allocated_invitation(::bgs::protocol::club::v1::ClubInvitation* invitation) { + delete invitation_; + invitation_ = invitation; + if (invitation) { + set_has_invitation(); + } else { + clear_has_invitation(); + } + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.InvitationAddedNotification.invitation) +} + +// ------------------------------------------------------------------- + +// InvitationRemovedNotification + +// optional .bgs.protocol.club.v1.MemberId agent_id = 1; +inline bool InvitationRemovedNotification::has_agent_id() const { + return (_has_bits_[0] & 0x00000001u) != 0; +} +inline void InvitationRemovedNotification::set_has_agent_id() { + _has_bits_[0] |= 0x00000001u; +} +inline void InvitationRemovedNotification::clear_has_agent_id() { + _has_bits_[0] &= ~0x00000001u; +} +inline void InvitationRemovedNotification::clear_agent_id() { + if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); + clear_has_agent_id(); +} +inline const ::bgs::protocol::club::v1::MemberId& InvitationRemovedNotification::agent_id() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.InvitationRemovedNotification.agent_id) + return agent_id_ != NULL ? *agent_id_ : *default_instance_->agent_id_; +} +inline ::bgs::protocol::club::v1::MemberId* InvitationRemovedNotification::mutable_agent_id() { + set_has_agent_id(); + if (agent_id_ == NULL) agent_id_ = new ::bgs::protocol::club::v1::MemberId; + // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.InvitationRemovedNotification.agent_id) + return agent_id_; +} +inline ::bgs::protocol::club::v1::MemberId* InvitationRemovedNotification::release_agent_id() { + clear_has_agent_id(); + ::bgs::protocol::club::v1::MemberId* temp = agent_id_; + agent_id_ = NULL; + return temp; +} +inline void InvitationRemovedNotification::set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id) { + delete agent_id_; + agent_id_ = agent_id; + if (agent_id) { + set_has_agent_id(); } else { - clear_has_subscriber_id(); + clear_has_agent_id(); } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.SuggestionAddedNotification.subscriber_id) + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.InvitationRemovedNotification.agent_id) } // optional uint64 club_id = 3; -inline bool SuggestionAddedNotification::has_club_id() const { +inline bool InvitationRemovedNotification::has_club_id() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +inline void InvitationRemovedNotification::set_has_club_id() { + _has_bits_[0] |= 0x00000002u; +} +inline void InvitationRemovedNotification::clear_has_club_id() { + _has_bits_[0] &= ~0x00000002u; +} +inline void InvitationRemovedNotification::clear_club_id() { + club_id_ = GOOGLE_ULONGLONG(0); + clear_has_club_id(); +} +inline ::google::protobuf::uint64 InvitationRemovedNotification::club_id() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.InvitationRemovedNotification.club_id) + return club_id_; +} +inline void InvitationRemovedNotification::set_club_id(::google::protobuf::uint64 value) { + set_has_club_id(); + club_id_ = value; + // @@protoc_insertion_point(field_set:bgs.protocol.club.v1.InvitationRemovedNotification.club_id) +} + +// optional fixed64 invitation_id = 4; +inline bool InvitationRemovedNotification::has_invitation_id() const { return (_has_bits_[0] & 0x00000004u) != 0; } -inline void SuggestionAddedNotification::set_has_club_id() { +inline void InvitationRemovedNotification::set_has_invitation_id() { _has_bits_[0] |= 0x00000004u; } -inline void SuggestionAddedNotification::clear_has_club_id() { +inline void InvitationRemovedNotification::clear_has_invitation_id() { _has_bits_[0] &= ~0x00000004u; } +inline void InvitationRemovedNotification::clear_invitation_id() { + invitation_id_ = GOOGLE_ULONGLONG(0); + clear_has_invitation_id(); +} +inline ::google::protobuf::uint64 InvitationRemovedNotification::invitation_id() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.InvitationRemovedNotification.invitation_id) + return invitation_id_; +} +inline void InvitationRemovedNotification::set_invitation_id(::google::protobuf::uint64 value) { + set_has_invitation_id(); + invitation_id_ = value; + // @@protoc_insertion_point(field_set:bgs.protocol.club.v1.InvitationRemovedNotification.invitation_id) +} + +// optional .bgs.protocol.InvitationRemovedReason reason = 5; +inline bool InvitationRemovedNotification::has_reason() const { + return (_has_bits_[0] & 0x00000008u) != 0; +} +inline void InvitationRemovedNotification::set_has_reason() { + _has_bits_[0] |= 0x00000008u; +} +inline void InvitationRemovedNotification::clear_has_reason() { + _has_bits_[0] &= ~0x00000008u; +} +inline void InvitationRemovedNotification::clear_reason() { + reason_ = 0; + clear_has_reason(); +} +inline ::bgs::protocol::InvitationRemovedReason InvitationRemovedNotification::reason() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.InvitationRemovedNotification.reason) + return static_cast< ::bgs::protocol::InvitationRemovedReason >(reason_); +} +inline void InvitationRemovedNotification::set_reason(::bgs::protocol::InvitationRemovedReason value) { + assert(::bgs::protocol::InvitationRemovedReason_IsValid(value)); + set_has_reason(); + reason_ = value; + // @@protoc_insertion_point(field_set:bgs.protocol.club.v1.InvitationRemovedNotification.reason) +} + +// ------------------------------------------------------------------- + +// SuggestionAddedNotification + +// optional .bgs.protocol.club.v1.MemberId agent_id = 1; +inline bool SuggestionAddedNotification::has_agent_id() const { + return (_has_bits_[0] & 0x00000001u) != 0; +} +inline void SuggestionAddedNotification::set_has_agent_id() { + _has_bits_[0] |= 0x00000001u; +} +inline void SuggestionAddedNotification::clear_has_agent_id() { + _has_bits_[0] &= ~0x00000001u; +} +inline void SuggestionAddedNotification::clear_agent_id() { + if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); + clear_has_agent_id(); +} +inline const ::bgs::protocol::club::v1::MemberId& SuggestionAddedNotification::agent_id() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.SuggestionAddedNotification.agent_id) + return agent_id_ != NULL ? *agent_id_ : *default_instance_->agent_id_; +} +inline ::bgs::protocol::club::v1::MemberId* SuggestionAddedNotification::mutable_agent_id() { + set_has_agent_id(); + if (agent_id_ == NULL) agent_id_ = new ::bgs::protocol::club::v1::MemberId; + // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.SuggestionAddedNotification.agent_id) + return agent_id_; +} +inline ::bgs::protocol::club::v1::MemberId* SuggestionAddedNotification::release_agent_id() { + clear_has_agent_id(); + ::bgs::protocol::club::v1::MemberId* temp = agent_id_; + agent_id_ = NULL; + return temp; +} +inline void SuggestionAddedNotification::set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id) { + delete agent_id_; + agent_id_ = agent_id; + if (agent_id) { + set_has_agent_id(); + } else { + clear_has_agent_id(); + } + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.SuggestionAddedNotification.agent_id) +} + +// optional uint64 club_id = 3; +inline bool SuggestionAddedNotification::has_club_id() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +inline void SuggestionAddedNotification::set_has_club_id() { + _has_bits_[0] |= 0x00000002u; +} +inline void SuggestionAddedNotification::clear_has_club_id() { + _has_bits_[0] &= ~0x00000002u; +} inline void SuggestionAddedNotification::clear_club_id() { club_id_ = GOOGLE_ULONGLONG(0); clear_has_club_id(); @@ -3927,15 +3629,15 @@ inline void SuggestionAddedNotification::set_club_id(::google::protobuf::uint64 // @@protoc_insertion_point(field_set:bgs.protocol.club.v1.SuggestionAddedNotification.club_id) } -// required .bgs.protocol.club.v1.ClubSuggestion suggestion = 4; +// optional .bgs.protocol.club.v1.ClubSuggestion suggestion = 4; inline bool SuggestionAddedNotification::has_suggestion() const { - return (_has_bits_[0] & 0x00000008u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } inline void SuggestionAddedNotification::set_has_suggestion() { - _has_bits_[0] |= 0x00000008u; + _has_bits_[0] |= 0x00000004u; } inline void SuggestionAddedNotification::clear_has_suggestion() { - _has_bits_[0] &= ~0x00000008u; + _has_bits_[0] &= ~0x00000004u; } inline void SuggestionAddedNotification::clear_suggestion() { if (suggestion_ != NULL) suggestion_->::bgs::protocol::club::v1::ClubSuggestion::Clear(); @@ -4013,56 +3715,15 @@ inline void SuggestionRemovedNotification::set_allocated_agent_id(::bgs::protoco // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.SuggestionRemovedNotification.agent_id) } -// optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; -inline bool SuggestionRemovedNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void SuggestionRemovedNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void SuggestionRemovedNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void SuggestionRemovedNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::club::v1::MemberId& SuggestionRemovedNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.SuggestionRemovedNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* SuggestionRemovedNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::club::v1::MemberId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.SuggestionRemovedNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* SuggestionRemovedNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::club::v1::MemberId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void SuggestionRemovedNotification::set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.SuggestionRemovedNotification.subscriber_id) -} - // optional uint64 club_id = 3; inline bool SuggestionRemovedNotification::has_club_id() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } inline void SuggestionRemovedNotification::set_has_club_id() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } inline void SuggestionRemovedNotification::clear_has_club_id() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } inline void SuggestionRemovedNotification::clear_club_id() { club_id_ = GOOGLE_ULONGLONG(0); @@ -4080,13 +3741,13 @@ inline void SuggestionRemovedNotification::set_club_id(::google::protobuf::uint6 // optional fixed64 suggestion_id = 4; inline bool SuggestionRemovedNotification::has_suggestion_id() const { - return (_has_bits_[0] & 0x00000008u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } inline void SuggestionRemovedNotification::set_has_suggestion_id() { - _has_bits_[0] |= 0x00000008u; + _has_bits_[0] |= 0x00000004u; } inline void SuggestionRemovedNotification::clear_has_suggestion_id() { - _has_bits_[0] &= ~0x00000008u; + _has_bits_[0] &= ~0x00000004u; } inline void SuggestionRemovedNotification::clear_suggestion_id() { suggestion_id_ = GOOGLE_ULONGLONG(0); @@ -4104,13 +3765,13 @@ inline void SuggestionRemovedNotification::set_suggestion_id(::google::protobuf: // optional .bgs.protocol.SuggestionRemovedReason reason = 5; inline bool SuggestionRemovedNotification::has_reason() const { - return (_has_bits_[0] & 0x00000010u) != 0; + return (_has_bits_[0] & 0x00000008u) != 0; } inline void SuggestionRemovedNotification::set_has_reason() { - _has_bits_[0] |= 0x00000010u; + _has_bits_[0] |= 0x00000008u; } inline void SuggestionRemovedNotification::clear_has_reason() { - _has_bits_[0] &= ~0x00000010u; + _has_bits_[0] &= ~0x00000008u; } inline void SuggestionRemovedNotification::clear_reason() { reason_ = 0; @@ -4172,56 +3833,15 @@ inline void StreamAddedNotification::set_allocated_agent_id(::bgs::protocol::clu // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.StreamAddedNotification.agent_id) } -// optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; -inline bool StreamAddedNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void StreamAddedNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void StreamAddedNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void StreamAddedNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::club::v1::MemberId& StreamAddedNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.StreamAddedNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* StreamAddedNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::club::v1::MemberId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.StreamAddedNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* StreamAddedNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::club::v1::MemberId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void StreamAddedNotification::set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.StreamAddedNotification.subscriber_id) -} - // optional uint64 club_id = 3; inline bool StreamAddedNotification::has_club_id() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } inline void StreamAddedNotification::set_has_club_id() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } inline void StreamAddedNotification::clear_has_club_id() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } inline void StreamAddedNotification::clear_club_id() { club_id_ = GOOGLE_ULONGLONG(0); @@ -4239,13 +3859,13 @@ inline void StreamAddedNotification::set_club_id(::google::protobuf::uint64 valu // optional .bgs.protocol.club.v1.Stream stream = 4; inline bool StreamAddedNotification::has_stream() const { - return (_has_bits_[0] & 0x00000008u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } inline void StreamAddedNotification::set_has_stream() { - _has_bits_[0] |= 0x00000008u; + _has_bits_[0] |= 0x00000004u; } inline void StreamAddedNotification::clear_has_stream() { - _has_bits_[0] &= ~0x00000008u; + _has_bits_[0] &= ~0x00000004u; } inline void StreamAddedNotification::clear_stream() { if (stream_ != NULL) stream_->::bgs::protocol::club::v1::Stream::Clear(); @@ -4323,56 +3943,15 @@ inline void StreamRemovedNotification::set_allocated_agent_id(::bgs::protocol::c // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.StreamRemovedNotification.agent_id) } -// optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; -inline bool StreamRemovedNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void StreamRemovedNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void StreamRemovedNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void StreamRemovedNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::club::v1::MemberId& StreamRemovedNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.StreamRemovedNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* StreamRemovedNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::club::v1::MemberId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.StreamRemovedNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* StreamRemovedNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::club::v1::MemberId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void StreamRemovedNotification::set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.StreamRemovedNotification.subscriber_id) -} - // optional uint64 club_id = 3; inline bool StreamRemovedNotification::has_club_id() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } inline void StreamRemovedNotification::set_has_club_id() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } inline void StreamRemovedNotification::clear_has_club_id() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } inline void StreamRemovedNotification::clear_club_id() { club_id_ = GOOGLE_ULONGLONG(0); @@ -4390,13 +3969,13 @@ inline void StreamRemovedNotification::set_club_id(::google::protobuf::uint64 va // optional uint64 stream_id = 4; inline bool StreamRemovedNotification::has_stream_id() const { - return (_has_bits_[0] & 0x00000008u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } inline void StreamRemovedNotification::set_has_stream_id() { - _has_bits_[0] |= 0x00000008u; + _has_bits_[0] |= 0x00000004u; } inline void StreamRemovedNotification::clear_has_stream_id() { - _has_bits_[0] &= ~0x00000008u; + _has_bits_[0] &= ~0x00000004u; } inline void StreamRemovedNotification::clear_stream_id() { stream_id_ = GOOGLE_ULONGLONG(0); @@ -4457,56 +4036,15 @@ inline void StreamStateChangedNotification::set_allocated_agent_id(::bgs::protoc // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.StreamStateChangedNotification.agent_id) } -// optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; -inline bool StreamStateChangedNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void StreamStateChangedNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void StreamStateChangedNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void StreamStateChangedNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::club::v1::MemberId& StreamStateChangedNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.StreamStateChangedNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* StreamStateChangedNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::club::v1::MemberId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.StreamStateChangedNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* StreamStateChangedNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::club::v1::MemberId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void StreamStateChangedNotification::set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.StreamStateChangedNotification.subscriber_id) -} - // optional uint64 club_id = 3; inline bool StreamStateChangedNotification::has_club_id() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } inline void StreamStateChangedNotification::set_has_club_id() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } inline void StreamStateChangedNotification::clear_has_club_id() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } inline void StreamStateChangedNotification::clear_club_id() { club_id_ = GOOGLE_ULONGLONG(0); @@ -4524,13 +4062,13 @@ inline void StreamStateChangedNotification::set_club_id(::google::protobuf::uint // optional uint64 stream_id = 4; inline bool StreamStateChangedNotification::has_stream_id() const { - return (_has_bits_[0] & 0x00000008u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } inline void StreamStateChangedNotification::set_has_stream_id() { - _has_bits_[0] |= 0x00000008u; + _has_bits_[0] |= 0x00000004u; } inline void StreamStateChangedNotification::clear_has_stream_id() { - _has_bits_[0] &= ~0x00000008u; + _has_bits_[0] &= ~0x00000004u; } inline void StreamStateChangedNotification::clear_stream_id() { stream_id_ = GOOGLE_ULONGLONG(0); @@ -4548,13 +4086,13 @@ inline void StreamStateChangedNotification::set_stream_id(::google::protobuf::ui // optional .bgs.protocol.club.v1.StreamStateAssignment assignment = 5; inline bool StreamStateChangedNotification::has_assignment() const { - return (_has_bits_[0] & 0x00000010u) != 0; + return (_has_bits_[0] & 0x00000008u) != 0; } inline void StreamStateChangedNotification::set_has_assignment() { - _has_bits_[0] |= 0x00000010u; + _has_bits_[0] |= 0x00000008u; } inline void StreamStateChangedNotification::clear_has_assignment() { - _has_bits_[0] &= ~0x00000010u; + _has_bits_[0] &= ~0x00000008u; } inline void StreamStateChangedNotification::clear_assignment() { if (assignment_ != NULL) assignment_->::bgs::protocol::club::v1::StreamStateAssignment::Clear(); @@ -4632,56 +4170,15 @@ inline void StreamMessageAddedNotification::set_allocated_agent_id(::bgs::protoc // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.StreamMessageAddedNotification.agent_id) } -// optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; -inline bool StreamMessageAddedNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void StreamMessageAddedNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void StreamMessageAddedNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void StreamMessageAddedNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::club::v1::MemberId& StreamMessageAddedNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.StreamMessageAddedNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* StreamMessageAddedNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::club::v1::MemberId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.StreamMessageAddedNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* StreamMessageAddedNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::club::v1::MemberId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void StreamMessageAddedNotification::set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.StreamMessageAddedNotification.subscriber_id) -} - // optional uint64 club_id = 3; inline bool StreamMessageAddedNotification::has_club_id() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } inline void StreamMessageAddedNotification::set_has_club_id() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } inline void StreamMessageAddedNotification::clear_has_club_id() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } inline void StreamMessageAddedNotification::clear_club_id() { club_id_ = GOOGLE_ULONGLONG(0); @@ -4699,13 +4196,13 @@ inline void StreamMessageAddedNotification::set_club_id(::google::protobuf::uint // optional uint64 stream_id = 4; inline bool StreamMessageAddedNotification::has_stream_id() const { - return (_has_bits_[0] & 0x00000008u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } inline void StreamMessageAddedNotification::set_has_stream_id() { - _has_bits_[0] |= 0x00000008u; + _has_bits_[0] |= 0x00000004u; } inline void StreamMessageAddedNotification::clear_has_stream_id() { - _has_bits_[0] &= ~0x00000008u; + _has_bits_[0] &= ~0x00000004u; } inline void StreamMessageAddedNotification::clear_stream_id() { stream_id_ = GOOGLE_ULONGLONG(0); @@ -4723,13 +4220,13 @@ inline void StreamMessageAddedNotification::set_stream_id(::google::protobuf::ui // optional .bgs.protocol.club.v1.StreamMessage message = 5; inline bool StreamMessageAddedNotification::has_message() const { - return (_has_bits_[0] & 0x00000010u) != 0; + return (_has_bits_[0] & 0x00000008u) != 0; } inline void StreamMessageAddedNotification::set_has_message() { - _has_bits_[0] |= 0x00000010u; + _has_bits_[0] |= 0x00000008u; } inline void StreamMessageAddedNotification::clear_has_message() { - _has_bits_[0] &= ~0x00000010u; + _has_bits_[0] &= ~0x00000008u; } inline void StreamMessageAddedNotification::clear_message() { if (message_ != NULL) message_->::bgs::protocol::club::v1::StreamMessage::Clear(); @@ -4807,56 +4304,15 @@ inline void StreamMessageUpdatedNotification::set_allocated_agent_id(::bgs::prot // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.StreamMessageUpdatedNotification.agent_id) } -// optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; -inline bool StreamMessageUpdatedNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void StreamMessageUpdatedNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void StreamMessageUpdatedNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void StreamMessageUpdatedNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::club::v1::MemberId& StreamMessageUpdatedNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.StreamMessageUpdatedNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* StreamMessageUpdatedNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::club::v1::MemberId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.StreamMessageUpdatedNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* StreamMessageUpdatedNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::club::v1::MemberId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void StreamMessageUpdatedNotification::set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.StreamMessageUpdatedNotification.subscriber_id) -} - // optional uint64 club_id = 3; inline bool StreamMessageUpdatedNotification::has_club_id() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } inline void StreamMessageUpdatedNotification::set_has_club_id() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } inline void StreamMessageUpdatedNotification::clear_has_club_id() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } inline void StreamMessageUpdatedNotification::clear_club_id() { club_id_ = GOOGLE_ULONGLONG(0); @@ -4874,13 +4330,13 @@ inline void StreamMessageUpdatedNotification::set_club_id(::google::protobuf::ui // optional uint64 stream_id = 4; inline bool StreamMessageUpdatedNotification::has_stream_id() const { - return (_has_bits_[0] & 0x00000008u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } inline void StreamMessageUpdatedNotification::set_has_stream_id() { - _has_bits_[0] |= 0x00000008u; + _has_bits_[0] |= 0x00000004u; } inline void StreamMessageUpdatedNotification::clear_has_stream_id() { - _has_bits_[0] &= ~0x00000008u; + _has_bits_[0] &= ~0x00000004u; } inline void StreamMessageUpdatedNotification::clear_stream_id() { stream_id_ = GOOGLE_ULONGLONG(0); @@ -4898,13 +4354,13 @@ inline void StreamMessageUpdatedNotification::set_stream_id(::google::protobuf:: // optional .bgs.protocol.club.v1.StreamMessage message = 5; inline bool StreamMessageUpdatedNotification::has_message() const { - return (_has_bits_[0] & 0x00000010u) != 0; + return (_has_bits_[0] & 0x00000008u) != 0; } inline void StreamMessageUpdatedNotification::set_has_message() { - _has_bits_[0] |= 0x00000010u; + _has_bits_[0] |= 0x00000008u; } inline void StreamMessageUpdatedNotification::clear_has_message() { - _has_bits_[0] &= ~0x00000010u; + _has_bits_[0] &= ~0x00000008u; } inline void StreamMessageUpdatedNotification::clear_message() { if (message_ != NULL) message_->::bgs::protocol::club::v1::StreamMessage::Clear(); @@ -4982,56 +4438,15 @@ inline void StreamTypingIndicatorNotification::set_allocated_agent_id(::bgs::pro // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.StreamTypingIndicatorNotification.agent_id) } -// optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; -inline bool StreamTypingIndicatorNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void StreamTypingIndicatorNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void StreamTypingIndicatorNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void StreamTypingIndicatorNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::club::v1::MemberId& StreamTypingIndicatorNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.StreamTypingIndicatorNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* StreamTypingIndicatorNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::club::v1::MemberId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.StreamTypingIndicatorNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* StreamTypingIndicatorNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::club::v1::MemberId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void StreamTypingIndicatorNotification::set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.StreamTypingIndicatorNotification.subscriber_id) -} - // optional uint64 club_id = 3; inline bool StreamTypingIndicatorNotification::has_club_id() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } inline void StreamTypingIndicatorNotification::set_has_club_id() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } inline void StreamTypingIndicatorNotification::clear_has_club_id() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } inline void StreamTypingIndicatorNotification::clear_club_id() { club_id_ = GOOGLE_ULONGLONG(0); @@ -5049,13 +4464,13 @@ inline void StreamTypingIndicatorNotification::set_club_id(::google::protobuf::u // optional uint64 stream_id = 4; inline bool StreamTypingIndicatorNotification::has_stream_id() const { - return (_has_bits_[0] & 0x00000008u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } inline void StreamTypingIndicatorNotification::set_has_stream_id() { - _has_bits_[0] |= 0x00000008u; + _has_bits_[0] |= 0x00000004u; } inline void StreamTypingIndicatorNotification::clear_has_stream_id() { - _has_bits_[0] &= ~0x00000008u; + _has_bits_[0] &= ~0x00000004u; } inline void StreamTypingIndicatorNotification::clear_stream_id() { stream_id_ = GOOGLE_ULONGLONG(0); @@ -5146,56 +4561,15 @@ inline void StreamUnreadIndicatorNotification::set_allocated_agent_id(::bgs::pro // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.StreamUnreadIndicatorNotification.agent_id) } -// optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; -inline bool StreamUnreadIndicatorNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void StreamUnreadIndicatorNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void StreamUnreadIndicatorNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void StreamUnreadIndicatorNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::club::v1::MemberId& StreamUnreadIndicatorNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.StreamUnreadIndicatorNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* StreamUnreadIndicatorNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::club::v1::MemberId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.StreamUnreadIndicatorNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* StreamUnreadIndicatorNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::club::v1::MemberId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void StreamUnreadIndicatorNotification::set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.StreamUnreadIndicatorNotification.subscriber_id) -} - // optional uint64 club_id = 3; inline bool StreamUnreadIndicatorNotification::has_club_id() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } inline void StreamUnreadIndicatorNotification::set_has_club_id() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } inline void StreamUnreadIndicatorNotification::clear_has_club_id() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } inline void StreamUnreadIndicatorNotification::clear_club_id() { club_id_ = GOOGLE_ULONGLONG(0); @@ -5213,13 +4587,13 @@ inline void StreamUnreadIndicatorNotification::set_club_id(::google::protobuf::u // optional .bgs.protocol.club.v1.StreamEventTime event = 4; inline bool StreamUnreadIndicatorNotification::has_event() const { - return (_has_bits_[0] & 0x00000008u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } inline void StreamUnreadIndicatorNotification::set_has_event() { - _has_bits_[0] |= 0x00000008u; + _has_bits_[0] |= 0x00000004u; } inline void StreamUnreadIndicatorNotification::clear_has_event() { - _has_bits_[0] &= ~0x00000008u; + _has_bits_[0] &= ~0x00000004u; } inline void StreamUnreadIndicatorNotification::clear_event() { if (event_ != NULL) event_->::bgs::protocol::club::v1::StreamEventTime::Clear(); @@ -5297,56 +4671,15 @@ inline void StreamAdvanceViewTimeNotification::set_allocated_agent_id(::bgs::pro // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.StreamAdvanceViewTimeNotification.agent_id) } -// optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; -inline bool StreamAdvanceViewTimeNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void StreamAdvanceViewTimeNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void StreamAdvanceViewTimeNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void StreamAdvanceViewTimeNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::club::v1::MemberId& StreamAdvanceViewTimeNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.StreamAdvanceViewTimeNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* StreamAdvanceViewTimeNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::club::v1::MemberId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.StreamAdvanceViewTimeNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* StreamAdvanceViewTimeNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::club::v1::MemberId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void StreamAdvanceViewTimeNotification::set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.StreamAdvanceViewTimeNotification.subscriber_id) -} - // optional uint64 club_id = 3; inline bool StreamAdvanceViewTimeNotification::has_club_id() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } inline void StreamAdvanceViewTimeNotification::set_has_club_id() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } inline void StreamAdvanceViewTimeNotification::clear_has_club_id() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } inline void StreamAdvanceViewTimeNotification::clear_club_id() { club_id_ = GOOGLE_ULONGLONG(0); @@ -5392,116 +4725,6 @@ StreamAdvanceViewTimeNotification::mutable_view() { return &view_; } -// ------------------------------------------------------------------- - -// ClubActivityNotification - -// optional .bgs.protocol.club.v1.MemberId agent_id = 1; -inline bool ClubActivityNotification::has_agent_id() const { - return (_has_bits_[0] & 0x00000001u) != 0; -} -inline void ClubActivityNotification::set_has_agent_id() { - _has_bits_[0] |= 0x00000001u; -} -inline void ClubActivityNotification::clear_has_agent_id() { - _has_bits_[0] &= ~0x00000001u; -} -inline void ClubActivityNotification::clear_agent_id() { - if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); - clear_has_agent_id(); -} -inline const ::bgs::protocol::club::v1::MemberId& ClubActivityNotification::agent_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.ClubActivityNotification.agent_id) - return agent_id_ != NULL ? *agent_id_ : *default_instance_->agent_id_; -} -inline ::bgs::protocol::club::v1::MemberId* ClubActivityNotification::mutable_agent_id() { - set_has_agent_id(); - if (agent_id_ == NULL) agent_id_ = new ::bgs::protocol::club::v1::MemberId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.ClubActivityNotification.agent_id) - return agent_id_; -} -inline ::bgs::protocol::club::v1::MemberId* ClubActivityNotification::release_agent_id() { - clear_has_agent_id(); - ::bgs::protocol::club::v1::MemberId* temp = agent_id_; - agent_id_ = NULL; - return temp; -} -inline void ClubActivityNotification::set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id) { - delete agent_id_; - agent_id_ = agent_id; - if (agent_id) { - set_has_agent_id(); - } else { - clear_has_agent_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.ClubActivityNotification.agent_id) -} - -// optional .bgs.protocol.club.v1.MemberId subscriber_id = 2; -inline bool ClubActivityNotification::has_subscriber_id() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void ClubActivityNotification::set_has_subscriber_id() { - _has_bits_[0] |= 0x00000002u; -} -inline void ClubActivityNotification::clear_has_subscriber_id() { - _has_bits_[0] &= ~0x00000002u; -} -inline void ClubActivityNotification::clear_subscriber_id() { - if (subscriber_id_ != NULL) subscriber_id_->::bgs::protocol::club::v1::MemberId::Clear(); - clear_has_subscriber_id(); -} -inline const ::bgs::protocol::club::v1::MemberId& ClubActivityNotification::subscriber_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.ClubActivityNotification.subscriber_id) - return subscriber_id_ != NULL ? *subscriber_id_ : *default_instance_->subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* ClubActivityNotification::mutable_subscriber_id() { - set_has_subscriber_id(); - if (subscriber_id_ == NULL) subscriber_id_ = new ::bgs::protocol::club::v1::MemberId; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.ClubActivityNotification.subscriber_id) - return subscriber_id_; -} -inline ::bgs::protocol::club::v1::MemberId* ClubActivityNotification::release_subscriber_id() { - clear_has_subscriber_id(); - ::bgs::protocol::club::v1::MemberId* temp = subscriber_id_; - subscriber_id_ = NULL; - return temp; -} -inline void ClubActivityNotification::set_allocated_subscriber_id(::bgs::protocol::club::v1::MemberId* subscriber_id) { - delete subscriber_id_; - subscriber_id_ = subscriber_id; - if (subscriber_id) { - set_has_subscriber_id(); - } else { - clear_has_subscriber_id(); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.ClubActivityNotification.subscriber_id) -} - -// optional uint64 club_id = 3; -inline bool ClubActivityNotification::has_club_id() const { - return (_has_bits_[0] & 0x00000004u) != 0; -} -inline void ClubActivityNotification::set_has_club_id() { - _has_bits_[0] |= 0x00000004u; -} -inline void ClubActivityNotification::clear_has_club_id() { - _has_bits_[0] &= ~0x00000004u; -} -inline void ClubActivityNotification::clear_club_id() { - club_id_ = GOOGLE_ULONGLONG(0); - clear_has_club_id(); -} -inline ::google::protobuf::uint64 ClubActivityNotification::club_id() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.ClubActivityNotification.club_id) - return club_id_; -} -inline void ClubActivityNotification::set_club_id(::google::protobuf::uint64 value) { - set_has_club_id(); - club_id_ = value; - // @@protoc_insertion_point(field_set:bgs.protocol.club.v1.ClubActivityNotification.club_id) -} - // @@protoc_insertion_point(namespace_scope) diff --git a/src/server/proto/Client/club_range_set.pb.cc b/src/server/proto/Client/club_range_set.pb.cc index a6e9bb83feb..793c056e14c 100644 --- a/src/server/proto/Client/club_range_set.pb.cc +++ b/src/server/proto/Client/club_range_set.pb.cc @@ -85,7 +85,7 @@ void protobuf_AssignDesc_club_5frange_5fset_2eproto() { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubMemberRangeSet, count_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubMemberRangeSet, voice_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubMemberRangeSet, stream_subscriptions_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubMemberRangeSet, note_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubMemberRangeSet, note_range_), }; ClubMemberRangeSet_reflection_ = new ::google::protobuf::internal::GeneratedMessageReflection( @@ -249,26 +249,27 @@ void protobuf_AddDesc_club_5frange_5fset_2eproto() { "onRangeSet\0228\n\006ticket\030\035 \001(\0132(.bgs.protoco" "l.club.v1.ClubTicketRangeSet\0222\n\003ban\030\036 \001(" "\0132%.bgs.protocol.club.v1.ClubBanRangeSet" - "\"\336\001\n\022ClubMemberRangeSet\022-\n\005count\030\001 \001(\0132\036" + "\"\344\001\n\022ClubMemberRangeSet\022-\n\005count\030\001 \001(\0132\036" ".bgs.protocol.UnsignedIntRange\022-\n\005voice\030" "\003 \001(\0132\036.bgs.protocol.UnsignedIntRange\022<\n" "\024stream_subscriptions\030\005 \001(\0132\036.bgs.protoc" - "ol.UnsignedIntRange\022,\n\004note\030\007 \001(\0132\036.bgs." - "protocol.UnsignedIntRange\"\345\001\n\022ClubStream" - "RangeSet\022-\n\005count\030\001 \001(\0132\036.bgs.protocol.U" - "nsignedIntRange\0222\n\nname_range\030\003 \001(\0132\036.bg" - "s.protocol.UnsignedIntRange\0225\n\rsubject_r" - "ange\030\004 \001(\0132\036.bgs.protocol.UnsignedIntRan" - "ge\0225\n\rmessage_range\030\005 \001(\0132\036.bgs.protocol" - ".UnsignedIntRange\"G\n\026ClubInvitationRange" - "Set\022-\n\005count\030\001 \001(\0132\036.bgs.protocol.Unsign" - "edIntRange\"G\n\026ClubSuggestionRangeSet\022-\n\005" - "count\030\001 \001(\0132\036.bgs.protocol.UnsignedIntRa" - "nge\"C\n\022ClubTicketRangeSet\022-\n\005count\030\001 \001(\013" - "2\036.bgs.protocol.UnsignedIntRange\"v\n\017Club" - "BanRangeSet\022-\n\005count\030\001 \001(\0132\036.bgs.protoco" - "l.UnsignedIntRange\0224\n\014reason_range\030\003 \001(\013" - "2\036.bgs.protocol.UnsignedIntRangeB\002H\001", 1476); + "ol.UnsignedIntRange\0222\n\nnote_range\030\007 \001(\0132" + "\036.bgs.protocol.UnsignedIntRange\"\345\001\n\022Club" + "StreamRangeSet\022-\n\005count\030\001 \001(\0132\036.bgs.prot" + "ocol.UnsignedIntRange\0222\n\nname_range\030\003 \001(" + "\0132\036.bgs.protocol.UnsignedIntRange\0225\n\rsub" + "ject_range\030\004 \001(\0132\036.bgs.protocol.Unsigned" + "IntRange\0225\n\rmessage_range\030\005 \001(\0132\036.bgs.pr" + "otocol.UnsignedIntRange\"G\n\026ClubInvitatio" + "nRangeSet\022-\n\005count\030\001 \001(\0132\036.bgs.protocol." + "UnsignedIntRange\"G\n\026ClubSuggestionRangeS" + "et\022-\n\005count\030\001 \001(\0132\036.bgs.protocol.Unsigne" + "dIntRange\"C\n\022ClubTicketRangeSet\022-\n\005count" + "\030\001 \001(\0132\036.bgs.protocol.UnsignedIntRange\"v" + "\n\017ClubBanRangeSet\022-\n\005count\030\001 \001(\0132\036.bgs.p" + "rotocol.UnsignedIntRange\0224\n\014reason_range" + "\030\003 \001(\0132\036.bgs.protocol.UnsignedIntRangeB\002" + "H\001", 1482); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "club_range_set.proto", &protobuf_RegisterTypes); ClubTypeRangeSet::default_instance_ = new ClubTypeRangeSet(); @@ -932,7 +933,7 @@ void ClubTypeRangeSet::Swap(ClubTypeRangeSet* other) { const int ClubMemberRangeSet::kCountFieldNumber; const int ClubMemberRangeSet::kVoiceFieldNumber; const int ClubMemberRangeSet::kStreamSubscriptionsFieldNumber; -const int ClubMemberRangeSet::kNoteFieldNumber; +const int ClubMemberRangeSet::kNoteRangeFieldNumber; #endif // !_MSC_VER ClubMemberRangeSet::ClubMemberRangeSet() @@ -945,7 +946,7 @@ void ClubMemberRangeSet::InitAsDefaultInstance() { count_ = const_cast< ::bgs::protocol::UnsignedIntRange*>(&::bgs::protocol::UnsignedIntRange::default_instance()); voice_ = const_cast< ::bgs::protocol::UnsignedIntRange*>(&::bgs::protocol::UnsignedIntRange::default_instance()); stream_subscriptions_ = const_cast< ::bgs::protocol::UnsignedIntRange*>(&::bgs::protocol::UnsignedIntRange::default_instance()); - note_ = const_cast< ::bgs::protocol::UnsignedIntRange*>(&::bgs::protocol::UnsignedIntRange::default_instance()); + note_range_ = const_cast< ::bgs::protocol::UnsignedIntRange*>(&::bgs::protocol::UnsignedIntRange::default_instance()); } ClubMemberRangeSet::ClubMemberRangeSet(const ClubMemberRangeSet& from) @@ -960,7 +961,7 @@ void ClubMemberRangeSet::SharedCtor() { count_ = NULL; voice_ = NULL; stream_subscriptions_ = NULL; - note_ = NULL; + note_range_ = NULL; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -974,7 +975,7 @@ void ClubMemberRangeSet::SharedDtor() { delete count_; delete voice_; delete stream_subscriptions_; - delete note_; + delete note_range_; } } @@ -1010,8 +1011,8 @@ void ClubMemberRangeSet::Clear() { if (has_stream_subscriptions()) { if (stream_subscriptions_ != NULL) stream_subscriptions_->::bgs::protocol::UnsignedIntRange::Clear(); } - if (has_note()) { - if (note_ != NULL) note_->::bgs::protocol::UnsignedIntRange::Clear(); + if (has_note_range()) { + if (note_range_ != NULL) note_range_->::bgs::protocol::UnsignedIntRange::Clear(); } } ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -1062,16 +1063,16 @@ bool ClubMemberRangeSet::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(58)) goto parse_note; + if (input->ExpectTag(58)) goto parse_note_range; break; } - // optional .bgs.protocol.UnsignedIntRange note = 7; + // optional .bgs.protocol.UnsignedIntRange note_range = 7; case 7: { if (tag == 58) { - parse_note: + parse_note_range: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_note())); + input, mutable_note_range())); } else { goto handle_unusual; } @@ -1122,10 +1123,10 @@ void ClubMemberRangeSet::SerializeWithCachedSizes( 5, this->stream_subscriptions(), output); } - // optional .bgs.protocol.UnsignedIntRange note = 7; - if (has_note()) { + // optional .bgs.protocol.UnsignedIntRange note_range = 7; + if (has_note_range()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 7, this->note(), output); + 7, this->note_range(), output); } if (!unknown_fields().empty()) { @@ -1159,11 +1160,11 @@ void ClubMemberRangeSet::SerializeWithCachedSizes( 5, this->stream_subscriptions(), target); } - // optional .bgs.protocol.UnsignedIntRange note = 7; - if (has_note()) { + // optional .bgs.protocol.UnsignedIntRange note_range = 7; + if (has_note_range()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( - 7, this->note(), target); + 7, this->note_range(), target); } if (!unknown_fields().empty()) { @@ -1199,11 +1200,11 @@ int ClubMemberRangeSet::ByteSize() const { this->stream_subscriptions()); } - // optional .bgs.protocol.UnsignedIntRange note = 7; - if (has_note()) { + // optional .bgs.protocol.UnsignedIntRange note_range = 7; + if (has_note_range()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->note()); + this->note_range()); } } @@ -1242,8 +1243,8 @@ void ClubMemberRangeSet::MergeFrom(const ClubMemberRangeSet& from) { if (from.has_stream_subscriptions()) { mutable_stream_subscriptions()->::bgs::protocol::UnsignedIntRange::MergeFrom(from.stream_subscriptions()); } - if (from.has_note()) { - mutable_note()->::bgs::protocol::UnsignedIntRange::MergeFrom(from.note()); + if (from.has_note_range()) { + mutable_note_range()->::bgs::protocol::UnsignedIntRange::MergeFrom(from.note_range()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -1271,7 +1272,7 @@ void ClubMemberRangeSet::Swap(ClubMemberRangeSet* other) { std::swap(count_, other->count_); std::swap(voice_, other->voice_); std::swap(stream_subscriptions_, other->stream_subscriptions_); - std::swap(note_, other->note_); + std::swap(note_range_, other->note_range_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); diff --git a/src/server/proto/Client/club_range_set.pb.h b/src/server/proto/Client/club_range_set.pb.h index 5f54a9418b8..d74929db825 100644 --- a/src/server/proto/Client/club_range_set.pb.h +++ b/src/server/proto/Client/club_range_set.pb.h @@ -317,14 +317,14 @@ class TC_PROTO_API ClubMemberRangeSet : public ::google::protobuf::Message { inline ::bgs::protocol::UnsignedIntRange* release_stream_subscriptions(); inline void set_allocated_stream_subscriptions(::bgs::protocol::UnsignedIntRange* stream_subscriptions); - // optional .bgs.protocol.UnsignedIntRange note = 7; - inline bool has_note() const; - inline void clear_note(); - static const int kNoteFieldNumber = 7; - inline const ::bgs::protocol::UnsignedIntRange& note() const; - inline ::bgs::protocol::UnsignedIntRange* mutable_note(); - inline ::bgs::protocol::UnsignedIntRange* release_note(); - inline void set_allocated_note(::bgs::protocol::UnsignedIntRange* note); + // optional .bgs.protocol.UnsignedIntRange note_range = 7; + inline bool has_note_range() const; + inline void clear_note_range(); + static const int kNoteRangeFieldNumber = 7; + inline const ::bgs::protocol::UnsignedIntRange& note_range() const; + inline ::bgs::protocol::UnsignedIntRange* mutable_note_range(); + inline ::bgs::protocol::UnsignedIntRange* release_note_range(); + inline void set_allocated_note_range(::bgs::protocol::UnsignedIntRange* note_range); // @@protoc_insertion_point(class_scope:bgs.protocol.club.v1.ClubMemberRangeSet) private: @@ -334,8 +334,8 @@ class TC_PROTO_API ClubMemberRangeSet : public ::google::protobuf::Message { inline void clear_has_voice(); inline void set_has_stream_subscriptions(); inline void clear_has_stream_subscriptions(); - inline void set_has_note(); - inline void clear_has_note(); + inline void set_has_note_range(); + inline void clear_has_note_range(); ::google::protobuf::UnknownFieldSet _unknown_fields_; @@ -344,7 +344,7 @@ class TC_PROTO_API ClubMemberRangeSet : public ::google::protobuf::Message { ::bgs::protocol::UnsignedIntRange* count_; ::bgs::protocol::UnsignedIntRange* voice_; ::bgs::protocol::UnsignedIntRange* stream_subscriptions_; - ::bgs::protocol::UnsignedIntRange* note_; + ::bgs::protocol::UnsignedIntRange* note_range_; friend void TC_PROTO_API protobuf_AddDesc_club_5frange_5fset_2eproto(); friend void protobuf_AssignDesc_club_5frange_5fset_2eproto(); friend void protobuf_ShutdownFile_club_5frange_5fset_2eproto(); @@ -1352,45 +1352,45 @@ inline void ClubMemberRangeSet::set_allocated_stream_subscriptions(::bgs::protoc // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.ClubMemberRangeSet.stream_subscriptions) } -// optional .bgs.protocol.UnsignedIntRange note = 7; -inline bool ClubMemberRangeSet::has_note() const { +// optional .bgs.protocol.UnsignedIntRange note_range = 7; +inline bool ClubMemberRangeSet::has_note_range() const { return (_has_bits_[0] & 0x00000008u) != 0; } -inline void ClubMemberRangeSet::set_has_note() { +inline void ClubMemberRangeSet::set_has_note_range() { _has_bits_[0] |= 0x00000008u; } -inline void ClubMemberRangeSet::clear_has_note() { +inline void ClubMemberRangeSet::clear_has_note_range() { _has_bits_[0] &= ~0x00000008u; } -inline void ClubMemberRangeSet::clear_note() { - if (note_ != NULL) note_->::bgs::protocol::UnsignedIntRange::Clear(); - clear_has_note(); +inline void ClubMemberRangeSet::clear_note_range() { + if (note_range_ != NULL) note_range_->::bgs::protocol::UnsignedIntRange::Clear(); + clear_has_note_range(); } -inline const ::bgs::protocol::UnsignedIntRange& ClubMemberRangeSet::note() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.ClubMemberRangeSet.note) - return note_ != NULL ? *note_ : *default_instance_->note_; +inline const ::bgs::protocol::UnsignedIntRange& ClubMemberRangeSet::note_range() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.ClubMemberRangeSet.note_range) + return note_range_ != NULL ? *note_range_ : *default_instance_->note_range_; } -inline ::bgs::protocol::UnsignedIntRange* ClubMemberRangeSet::mutable_note() { - set_has_note(); - if (note_ == NULL) note_ = new ::bgs::protocol::UnsignedIntRange; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.ClubMemberRangeSet.note) - return note_; +inline ::bgs::protocol::UnsignedIntRange* ClubMemberRangeSet::mutable_note_range() { + set_has_note_range(); + if (note_range_ == NULL) note_range_ = new ::bgs::protocol::UnsignedIntRange; + // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.ClubMemberRangeSet.note_range) + return note_range_; } -inline ::bgs::protocol::UnsignedIntRange* ClubMemberRangeSet::release_note() { - clear_has_note(); - ::bgs::protocol::UnsignedIntRange* temp = note_; - note_ = NULL; +inline ::bgs::protocol::UnsignedIntRange* ClubMemberRangeSet::release_note_range() { + clear_has_note_range(); + ::bgs::protocol::UnsignedIntRange* temp = note_range_; + note_range_ = NULL; return temp; } -inline void ClubMemberRangeSet::set_allocated_note(::bgs::protocol::UnsignedIntRange* note) { - delete note_; - note_ = note; - if (note) { - set_has_note(); +inline void ClubMemberRangeSet::set_allocated_note_range(::bgs::protocol::UnsignedIntRange* note_range) { + delete note_range_; + note_range_ = note_range; + if (note_range) { + set_has_note_range(); } else { - clear_has_note(); + clear_has_note_range(); } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.ClubMemberRangeSet.note) + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.ClubMemberRangeSet.note_range) } // ------------------------------------------------------------------- diff --git a/src/server/proto/Client/club_request.pb.cc b/src/server/proto/Client/club_request.pb.cc index 6e4a77acf58..b6943e21d97 100644 --- a/src/server/proto/Client/club_request.pb.cc +++ b/src/server/proto/Client/club_request.pb.cc @@ -187,6 +187,9 @@ const ::google::protobuf::internal::GeneratedMessageReflection* const ::google::protobuf::Descriptor* CreateStreamRequest_descriptor_ = NULL; const ::google::protobuf::internal::GeneratedMessageReflection* CreateStreamRequest_reflection_ = NULL; +const ::google::protobuf::Descriptor* CreateStreamResponse_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + CreateStreamResponse_reflection_ = NULL; const ::google::protobuf::Descriptor* DestroyStreamRequest_descriptor_ = NULL; const ::google::protobuf::internal::GeneratedMessageReflection* DestroyStreamRequest_reflection_ = NULL; @@ -247,6 +250,12 @@ const ::google::protobuf::internal::GeneratedMessageReflection* const ::google::protobuf::Descriptor* GetStreamHistoryResponse_descriptor_ = NULL; const ::google::protobuf::internal::GeneratedMessageReflection* GetStreamHistoryResponse_reflection_ = NULL; +const ::google::protobuf::Descriptor* GetStreamMessageRequest_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + GetStreamMessageRequest_reflection_ = NULL; +const ::google::protobuf::Descriptor* GetStreamMessageResponse_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + GetStreamMessageResponse_reflection_ = NULL; const ::google::protobuf::Descriptor* GetClubActivityRequest_descriptor_ = NULL; const ::google::protobuf::internal::GeneratedMessageReflection* GetClubActivityRequest_reflection_ = NULL; @@ -603,7 +612,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { static const int AssignRoleRequest_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AssignRoleRequest, agent_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AssignRoleRequest, club_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AssignRoleRequest, assignment_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AssignRoleRequest, options_), }; AssignRoleRequest_reflection_ = new ::google::protobuf::internal::GeneratedMessageReflection( @@ -620,7 +629,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { static const int UnassignRoleRequest_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UnassignRoleRequest, agent_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UnassignRoleRequest, club_id_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UnassignRoleRequest, assignment_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UnassignRoleRequest, options_), }; UnassignRoleRequest_reflection_ = new ::google::protobuf::internal::GeneratedMessageReflection( @@ -1161,7 +1170,23 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(CreateStreamRequest)); - DestroyStreamRequest_descriptor_ = file->message_type(54); + CreateStreamResponse_descriptor_ = file->message_type(54); + static const int CreateStreamResponse_offsets_[2] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CreateStreamResponse, club_id_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CreateStreamResponse, stream_id_), + }; + CreateStreamResponse_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + CreateStreamResponse_descriptor_, + CreateStreamResponse::default_instance_, + CreateStreamResponse_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CreateStreamResponse, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CreateStreamResponse, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(CreateStreamResponse)); + DestroyStreamRequest_descriptor_ = file->message_type(55); static const int DestroyStreamRequest_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DestroyStreamRequest, agent_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DestroyStreamRequest, club_id_), @@ -1178,7 +1203,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(DestroyStreamRequest)); - GetStreamRequest_descriptor_ = file->message_type(55); + GetStreamRequest_descriptor_ = file->message_type(56); static const int GetStreamRequest_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamRequest, agent_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamRequest, club_id_), @@ -1195,7 +1220,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(GetStreamRequest)); - GetStreamResponse_descriptor_ = file->message_type(56); + GetStreamResponse_descriptor_ = file->message_type(57); static const int GetStreamResponse_offsets_[1] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamResponse, stream_), }; @@ -1210,7 +1235,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(GetStreamResponse)); - GetStreamsRequest_descriptor_ = file->message_type(57); + GetStreamsRequest_descriptor_ = file->message_type(58); static const int GetStreamsRequest_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamsRequest, agent_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamsRequest, club_id_), @@ -1227,7 +1252,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(GetStreamsRequest)); - GetStreamsResponse_descriptor_ = file->message_type(58); + GetStreamsResponse_descriptor_ = file->message_type(59); static const int GetStreamsResponse_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamsResponse, stream_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamsResponse, view_), @@ -1244,7 +1269,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(GetStreamsResponse)); - UpdateStreamStateRequest_descriptor_ = file->message_type(59); + UpdateStreamStateRequest_descriptor_ = file->message_type(60); static const int UpdateStreamStateRequest_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateStreamStateRequest, agent_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateStreamStateRequest, club_id_), @@ -1262,7 +1287,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(UpdateStreamStateRequest)); - SetStreamFocusRequest_descriptor_ = file->message_type(60); + SetStreamFocusRequest_descriptor_ = file->message_type(61); static const int SetStreamFocusRequest_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SetStreamFocusRequest, agent_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SetStreamFocusRequest, club_id_), @@ -1280,7 +1305,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SetStreamFocusRequest)); - CreateMessageRequest_descriptor_ = file->message_type(61); + CreateMessageRequest_descriptor_ = file->message_type(62); static const int CreateMessageRequest_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CreateMessageRequest, agent_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CreateMessageRequest, club_id_), @@ -1298,7 +1323,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(CreateMessageRequest)); - CreateMessageResponse_descriptor_ = file->message_type(62); + CreateMessageResponse_descriptor_ = file->message_type(63); static const int CreateMessageResponse_offsets_[1] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CreateMessageResponse, message_), }; @@ -1313,7 +1338,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(CreateMessageResponse)); - DestroyMessageRequest_descriptor_ = file->message_type(63); + DestroyMessageRequest_descriptor_ = file->message_type(64); static const int DestroyMessageRequest_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DestroyMessageRequest, agent_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DestroyMessageRequest, club_id_), @@ -1331,7 +1356,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(DestroyMessageRequest)); - DestroyMessageResponse_descriptor_ = file->message_type(64); + DestroyMessageResponse_descriptor_ = file->message_type(65); static const int DestroyMessageResponse_offsets_[1] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DestroyMessageResponse, message_), }; @@ -1346,7 +1371,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(DestroyMessageResponse)); - EditMessageRequest_descriptor_ = file->message_type(65); + EditMessageRequest_descriptor_ = file->message_type(66); static const int EditMessageRequest_offsets_[5] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EditMessageRequest, agent_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EditMessageRequest, club_id_), @@ -1365,7 +1390,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(EditMessageRequest)); - EditMessageResponse_descriptor_ = file->message_type(66); + EditMessageResponse_descriptor_ = file->message_type(67); static const int EditMessageResponse_offsets_[1] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EditMessageResponse, message_), }; @@ -1380,7 +1405,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(EditMessageResponse)); - SetMessagePinnedRequest_descriptor_ = file->message_type(67); + SetMessagePinnedRequest_descriptor_ = file->message_type(68); static const int SetMessagePinnedRequest_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SetMessagePinnedRequest, agent_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SetMessagePinnedRequest, club_id_), @@ -1397,7 +1422,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SetMessagePinnedRequest)); - SetTypingIndicatorRequest_descriptor_ = file->message_type(68); + SetTypingIndicatorRequest_descriptor_ = file->message_type(69); static const int SetTypingIndicatorRequest_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SetTypingIndicatorRequest, agent_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SetTypingIndicatorRequest, club_id_), @@ -1415,7 +1440,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(SetTypingIndicatorRequest)); - AdvanceStreamViewTimeRequest_descriptor_ = file->message_type(69); + AdvanceStreamViewTimeRequest_descriptor_ = file->message_type(70); static const int AdvanceStreamViewTimeRequest_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AdvanceStreamViewTimeRequest, agent_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AdvanceStreamViewTimeRequest, club_id_), @@ -1433,7 +1458,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(AdvanceStreamViewTimeRequest)); - AdvanceStreamMentionViewTimeRequest_descriptor_ = file->message_type(70); + AdvanceStreamMentionViewTimeRequest_descriptor_ = file->message_type(71); static const int AdvanceStreamMentionViewTimeRequest_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AdvanceStreamMentionViewTimeRequest, agent_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AdvanceStreamMentionViewTimeRequest, club_id_), @@ -1450,7 +1475,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(AdvanceStreamMentionViewTimeRequest)); - AdvanceActivityViewTimeRequest_descriptor_ = file->message_type(71); + AdvanceActivityViewTimeRequest_descriptor_ = file->message_type(72); static const int AdvanceActivityViewTimeRequest_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AdvanceActivityViewTimeRequest, agent_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AdvanceActivityViewTimeRequest, club_id_), @@ -1466,7 +1491,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(AdvanceActivityViewTimeRequest)); - GetStreamHistoryRequest_descriptor_ = file->message_type(72); + GetStreamHistoryRequest_descriptor_ = file->message_type(73); static const int GetStreamHistoryRequest_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamHistoryRequest, agent_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamHistoryRequest, club_id_), @@ -1484,7 +1509,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(GetStreamHistoryRequest)); - GetStreamHistoryResponse_descriptor_ = file->message_type(73); + GetStreamHistoryResponse_descriptor_ = file->message_type(74); static const int GetStreamHistoryResponse_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamHistoryResponse, message_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamHistoryResponse, continuation_), @@ -1500,7 +1525,40 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(GetStreamHistoryResponse)); - GetClubActivityRequest_descriptor_ = file->message_type(74); + GetStreamMessageRequest_descriptor_ = file->message_type(75); + static const int GetStreamMessageRequest_offsets_[4] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamMessageRequest, agent_id_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamMessageRequest, club_id_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamMessageRequest, stream_id_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamMessageRequest, message_id_), + }; + GetStreamMessageRequest_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + GetStreamMessageRequest_descriptor_, + GetStreamMessageRequest::default_instance_, + GetStreamMessageRequest_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamMessageRequest, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamMessageRequest, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(GetStreamMessageRequest)); + GetStreamMessageResponse_descriptor_ = file->message_type(76); + static const int GetStreamMessageResponse_offsets_[1] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamMessageResponse, message_), + }; + GetStreamMessageResponse_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + GetStreamMessageResponse_descriptor_, + GetStreamMessageResponse::default_instance_, + GetStreamMessageResponse_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamMessageResponse, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamMessageResponse, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(GetStreamMessageResponse)); + GetClubActivityRequest_descriptor_ = file->message_type(77); static const int GetClubActivityRequest_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetClubActivityRequest, agent_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetClubActivityRequest, club_id_), @@ -1517,7 +1575,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(GetClubActivityRequest)); - GetClubActivityResponse_descriptor_ = file->message_type(75); + GetClubActivityResponse_descriptor_ = file->message_type(78); static const int GetClubActivityResponse_offsets_[1] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetClubActivityResponse, continuation_), }; @@ -1532,7 +1590,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(GetClubActivityResponse)); - GetStreamVoiceTokenRequest_descriptor_ = file->message_type(76); + GetStreamVoiceTokenRequest_descriptor_ = file->message_type(79); static const int GetStreamVoiceTokenRequest_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamVoiceTokenRequest, agent_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamVoiceTokenRequest, club_id_), @@ -1549,7 +1607,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(GetStreamVoiceTokenRequest)); - GetStreamVoiceTokenResponse_descriptor_ = file->message_type(77); + GetStreamVoiceTokenResponse_descriptor_ = file->message_type(80); static const int GetStreamVoiceTokenResponse_offsets_[2] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamVoiceTokenResponse, channel_uri_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GetStreamVoiceTokenResponse, credentials_), @@ -1565,7 +1623,7 @@ void protobuf_AssignDesc_club_5frequest_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(GetStreamVoiceTokenResponse)); - KickFromStreamVoiceRequest_descriptor_ = file->message_type(78); + KickFromStreamVoiceRequest_descriptor_ = file->message_type(81); static const int KickFromStreamVoiceRequest_offsets_[4] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(KickFromStreamVoiceRequest, agent_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(KickFromStreamVoiceRequest, club_id_), @@ -1704,6 +1762,8 @@ void protobuf_RegisterTypes(const ::std::string&) { ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( CreateStreamRequest_descriptor_, &CreateStreamRequest::default_instance()); ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + CreateStreamResponse_descriptor_, &CreateStreamResponse::default_instance()); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( DestroyStreamRequest_descriptor_, &DestroyStreamRequest::default_instance()); ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( GetStreamRequest_descriptor_, &GetStreamRequest::default_instance()); @@ -1744,6 +1804,10 @@ void protobuf_RegisterTypes(const ::std::string&) { ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( GetStreamHistoryResponse_descriptor_, &GetStreamHistoryResponse::default_instance()); ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + GetStreamMessageRequest_descriptor_, &GetStreamMessageRequest::default_instance()); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + GetStreamMessageResponse_descriptor_, &GetStreamMessageResponse::default_instance()); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( GetClubActivityRequest_descriptor_, &GetClubActivityRequest::default_instance()); ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( GetClubActivityResponse_descriptor_, &GetClubActivityResponse::default_instance()); @@ -1866,6 +1930,8 @@ void protobuf_ShutdownFile_club_5frequest_2eproto() { delete UnsubscribeStreamRequest_reflection_; delete CreateStreamRequest::default_instance_; delete CreateStreamRequest_reflection_; + delete CreateStreamResponse::default_instance_; + delete CreateStreamResponse_reflection_; delete DestroyStreamRequest::default_instance_; delete DestroyStreamRequest_reflection_; delete GetStreamRequest::default_instance_; @@ -1906,6 +1972,10 @@ void protobuf_ShutdownFile_club_5frequest_2eproto() { delete GetStreamHistoryRequest_reflection_; delete GetStreamHistoryResponse::default_instance_; delete GetStreamHistoryResponse_reflection_; + delete GetStreamMessageRequest::default_instance_; + delete GetStreamMessageRequest_reflection_; + delete GetStreamMessageResponse::default_instance_; + delete GetStreamMessageResponse_reflection_; delete GetClubActivityRequest::default_instance_; delete GetClubActivityRequest_reflection_; delete GetClubActivityResponse::default_instance_; @@ -1986,181 +2056,189 @@ void protobuf_AddDesc_club_5frequest_2eproto() { "\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v1.M" "emberId\022\017\n\007club_id\030\002 \001(\004\022=\n\007options\030\003 \001(" "\0132,.bgs.protocol.club.v1.SubscriberState" - "Options\"\220\001\n\021AssignRoleRequest\0220\n\010agent_i" + "Options\"\212\001\n\021AssignRoleRequest\0220\n\010agent_i" "d\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022" - "\017\n\007club_id\030\002 \001(\004\0228\n\nassignment\030\003 \001(\0132$.b" - "gs.protocol.club.v1.RoleAssignment\"\222\001\n\023U" - "nassignRoleRequest\0220\n\010agent_id\030\001 \001(\0132\036.b" - "gs.protocol.club.v1.MemberId\022\017\n\007club_id\030" - "\002 \001(\004\0228\n\nassignment\030\003 \001(\0132$.bgs.protocol" - ".club.v1.RoleAssignment\"\230\001\n\025SendInvitati" - "onRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protoc" - "ol.club.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022<\n\007" - "options\030\003 \001(\0132+.bgs.protocol.club.v1.Sen" - "dInvitationOptions\"s\n\027AcceptInvitationRe" - "quest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.c" - "lub.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022\025\n\rinvi" - "tation_id\030\003 \001(\006\"t\n\030DeclineInvitationRequ" - "est\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.clu" - "b.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022\025\n\rinvita" - "tion_id\030\003 \001(\006\"s\n\027RevokeInvitationRequest" - "\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v" - "1.MemberId\022\017\n\007club_id\030\002 \001(\004\022\025\n\rinvitatio" - "n_id\030\003 \001(\006\"p\n\024GetInvitationRequest\0220\n\010ag" - "ent_id\030\001 \001(\0132\036.bgs.protocol.club.v1.Memb" - "erId\022\017\n\007club_id\030\002 \001(\004\022\025\n\rinvitation_id\030\003" - " \001(\006\"Q\n\025GetInvitationResponse\0228\n\ninvitat" - "ion\030\001 \001(\0132$.bgs.protocol.club.v1.ClubInv" - "itation\"p\n\025GetInvitationsRequest\0220\n\010agen" - "t_id\030\001 \001(\0132\036.bgs.protocol.club.v1.Member" - "Id\022\017\n\007club_id\030\002 \001(\004\022\024\n\014continuation\030\003 \001(" - "\004\"h\n\026GetInvitationsResponse\0228\n\ninvitatio" - "n\030\001 \003(\0132$.bgs.protocol.club.v1.ClubInvit" - "ation\022\024\n\014continuation\030\002 \001(\004\"\230\001\n\025SendSugg" - "estionRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.pr" - "otocol.club.v1.MemberId\022\017\n\007club_id\030\002 \001(\004" - "\022<\n\007options\030\003 \001(\0132+.bgs.protocol.club.v1" - ".SendSuggestionOptions\"s\n\027AcceptSuggesti" - "onRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protoc" - "ol.club.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022\025\n\r" - "suggestion_id\030\003 \001(\006\"t\n\030DeclineSuggestion" - "Request\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol" - ".club.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022\025\n\rsu" - "ggestion_id\030\003 \001(\006\"p\n\024GetSuggestionReques" - "t\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club." - "v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022\025\n\rsuggesti" - "on_id\030\003 \001(\006\"Q\n\025GetSuggestionResponse\0228\n\n" - "suggestion\030\001 \001(\0132$.bgs.protocol.club.v1." - "ClubSuggestion\"p\n\025GetSuggestionsRequest\022" - "0\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v1" - ".MemberId\022\017\n\007club_id\030\002 \001(\004\022\024\n\014continuati" - "on\030\003 \001(\004\"h\n\026GetSuggestionsResponse\0228\n\nsu" - "ggestion\030\001 \003(\0132$.bgs.protocol.club.v1.Cl" - "ubSuggestion\022\024\n\014continuation\030\002 \001(\004\"\224\001\n\023C" - "reateTicketRequest\0220\n\010agent_id\030\001 \001(\0132\036.b" - "gs.protocol.club.v1.MemberId\022\017\n\007club_id\030" - "\002 \001(\004\022:\n\007options\030\003 \001(\0132).bgs.protocol.cl" - "ub.v1.CreateTicketOptions\"H\n\024CreateTicke" - "tResponse\0220\n\006ticket\030\001 \001(\0132 .bgs.protocol" - ".club.v1.ClubTicket\"l\n\024DestroyTicketRequ" - "est\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.clu" - "b.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022\021\n\tticket" - "_id\030\003 \001(\t\"Z\n\023RedeemTicketRequest\0220\n\010agen" - "t_id\030\001 \001(\0132\036.bgs.protocol.club.v1.Member" - "Id\022\021\n\tticket_id\030\003 \001(\t\"W\n\020GetTicketReques" - "t\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club." - "v1.MemberId\022\021\n\tticket_id\030\003 \001(\t\"E\n\021GetTic" - "ketResponse\0220\n\006ticket\030\001 \001(\0132 .bgs.protoc" - "ol.club.v1.ClubTicket\"l\n\021GetTicketsReque" - "st\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club" - ".v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022\024\n\014continu" - "ation\030\003 \001(\004\"\\\n\022GetTicketsResponse\0220\n\006tic" - "ket\030\001 \003(\0132 .bgs.protocol.club.v1.ClubTic" - "ket\022\024\n\014continuation\030\002 \001(\004\"\210\001\n\rAddBanRequ" - "est\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.clu" - "b.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\0224\n\007option" - "s\030\003 \001(\0132#.bgs.protocol.club.v1.AddBanOpt" - "ions\"\210\001\n\020RemoveBanRequest\0220\n\010agent_id\030\001 " - "\001(\0132\036.bgs.protocol.club.v1.MemberId\022\017\n\007c" - "lub_id\030\002 \001(\004\0221\n\ttarget_id\030\003 \001(\0132\036.bgs.pr" - "otocol.club.v1.MemberId\"\205\001\n\rGetBanReques" - "t\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club." - "v1.MemberId\022\017\n\007club_id\030\002 \001(\004\0221\n\ttarget_i" - "d\030\003 \001(\0132\036.bgs.protocol.club.v1.MemberId\"" - "<\n\016GetBanResponse\022*\n\003ban\030\001 \001(\0132\035.bgs.pro" - "tocol.club.v1.ClubBan\"i\n\016GetBansRequest\022" - "0\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v1" - ".MemberId\022\017\n\007club_id\030\002 \001(\004\022\024\n\014continuati" - "on\030\003 \001(\004\"S\n\017GetBansResponse\022*\n\003ban\030\001 \003(\013" - "2\035.bgs.protocol.club.v1.ClubBan\022\024\n\014conti" - "nuation\030\002 \001(\004\"n\n\026SubscribeStreamRequest\022" - "0\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v1" - ".MemberId\022\017\n\007club_id\030\002 \001(\004\022\021\n\tstream_id\030" - "\003 \003(\004\"p\n\030UnsubscribeStreamRequest\0220\n\010age" + "\017\n\007club_id\030\002 \001(\004\0222\n\007options\030\003 \001(\0132!.bgs." + "protocol.club.v1.RoleOptions\"\214\001\n\023Unassig" + "nRoleRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.pro" + "tocol.club.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022" + "2\n\007options\030\003 \001(\0132!.bgs.protocol.club.v1." + "RoleOptions\"\230\001\n\025SendInvitationRequest\0220\n" + "\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v1.M" + "emberId\022\017\n\007club_id\030\002 \001(\004\022<\n\007options\030\003 \001(" + "\0132+.bgs.protocol.club.v1.SendInvitationO" + "ptions\"s\n\027AcceptInvitationRequest\0220\n\010age" "nt_id\030\001 \001(\0132\036.bgs.protocol.club.v1.Membe" - "rId\022\017\n\007club_id\030\002 \001(\004\022\021\n\tstream_id\030\003 \003(\004\"" - "\224\001\n\023CreateStreamRequest\0220\n\010agent_id\030\001 \001(" - "\0132\036.bgs.protocol.club.v1.MemberId\022\017\n\007clu" - "b_id\030\002 \001(\004\022:\n\007options\030\003 \001(\0132).bgs.protoc" - "ol.club.v1.CreateStreamOptions\"l\n\024Destro" - "yStreamRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.p" - "rotocol.club.v1.MemberId\022\017\n\007club_id\030\002 \001(" - "\004\022\021\n\tstream_id\030\003 \001(\004\"h\n\020GetStreamRequest" - "\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v" - "1.MemberId\022\017\n\007club_id\030\002 \001(\004\022\021\n\tstream_id" - "\030\003 \001(\004\"A\n\021GetStreamResponse\022,\n\006stream\030\001 " - "\001(\0132\034.bgs.protocol.club.v1.Stream\"l\n\021Get" - "StreamsRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.p" - "rotocol.club.v1.MemberId\022\017\n\007club_id\030\002 \001(" - "\004\022\024\n\014continuation\030\003 \001(\004\"\210\001\n\022GetStreamsRe" - "sponse\022,\n\006stream\030\001 \003(\0132\034.bgs.protocol.cl" - "ub.v1.Stream\022.\n\004view\030\002 \003(\0132 .bgs.protoco" - "l.club.v1.StreamView\022\024\n\014continuation\030\003 \001" - "(\004\"\253\001\n\030UpdateStreamStateRequest\0220\n\010agent" + "rId\022\017\n\007club_id\030\002 \001(\004\022\025\n\rinvitation_id\030\003 " + "\001(\006\"t\n\030DeclineInvitationRequest\0220\n\010agent" "_id\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberI" - "d\022\017\n\007club_id\030\002 \001(\004\022\021\n\tstream_id\030\003 \001(\004\0229\n" - "\007options\030\005 \001(\0132(.bgs.protocol.club.v1.St" - "reamStateOptions\"|\n\025SetStreamFocusReques" + "d\022\017\n\007club_id\030\002 \001(\004\022\025\n\rinvitation_id\030\003 \001(" + "\006\"s\n\027RevokeInvitationRequest\0220\n\010agent_id" + "\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022\017" + "\n\007club_id\030\002 \001(\004\022\025\n\rinvitation_id\030\003 \001(\006\"p" + "\n\024GetInvitationRequest\0220\n\010agent_id\030\001 \001(\013" + "2\036.bgs.protocol.club.v1.MemberId\022\017\n\007club" + "_id\030\002 \001(\004\022\025\n\rinvitation_id\030\003 \001(\006\"Q\n\025GetI" + "nvitationResponse\0228\n\ninvitation\030\001 \001(\0132$." + "bgs.protocol.club.v1.ClubInvitation\"p\n\025G" + "etInvitationsRequest\0220\n\010agent_id\030\001 \001(\0132\036" + ".bgs.protocol.club.v1.MemberId\022\017\n\007club_i" + "d\030\002 \001(\004\022\024\n\014continuation\030\003 \001(\004\"h\n\026GetInvi" + "tationsResponse\0228\n\ninvitation\030\001 \003(\0132$.bg" + "s.protocol.club.v1.ClubInvitation\022\024\n\014con" + "tinuation\030\002 \001(\004\"\230\001\n\025SendSuggestionReques" "t\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club." - "v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022\021\n\tstream_i" - "d\030\003 \001(\004\022\r\n\005focus\030\004 \001(\010\"\251\001\n\024CreateMessage" - "Request\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol" - ".club.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022\021\n\tst" - "ream_id\030\003 \001(\004\022;\n\007options\030\004 \001(\0132*.bgs.pro" - "tocol.club.v1.CreateMessageOptions\"M\n\025Cr" - "eateMessageResponse\0224\n\007message\030\001 \001(\0132#.b" - "gs.protocol.club.v1.StreamMessage\"\232\001\n\025De" - "stroyMessageRequest\0220\n\010agent_id\030\001 \001(\0132\036." - "bgs.protocol.club.v1.MemberId\022\017\n\007club_id" - "\030\002 \001(\004\022\021\n\tstream_id\030\003 \001(\004\022+\n\nmessage_id\030" - "\004 \001(\0132\027.bgs.protocol.MessageId\"N\n\026Destro" - "yMessageResponse\0224\n\007message\030\001 \001(\0132#.bgs." - "protocol.club.v1.StreamMessage\"\324\001\n\022EditM" - "essageRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.pr" + "v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022<\n\007options\030" + "\003 \001(\0132+.bgs.protocol.club.v1.SendSuggest" + "ionOptions\"s\n\027AcceptSuggestionRequest\0220\n" + "\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v1.M" + "emberId\022\017\n\007club_id\030\002 \001(\004\022\025\n\rsuggestion_i" + "d\030\003 \001(\006\"t\n\030DeclineSuggestionRequest\0220\n\010a" + "gent_id\030\001 \001(\0132\036.bgs.protocol.club.v1.Mem" + "berId\022\017\n\007club_id\030\002 \001(\004\022\025\n\rsuggestion_id\030" + "\003 \001(\006\"p\n\024GetSuggestionRequest\0220\n\010agent_i" + "d\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022" + "\017\n\007club_id\030\002 \001(\004\022\025\n\rsuggestion_id\030\003 \001(\006\"" + "Q\n\025GetSuggestionResponse\0228\n\nsuggestion\030\001" + " \001(\0132$.bgs.protocol.club.v1.ClubSuggesti" + "on\"p\n\025GetSuggestionsRequest\0220\n\010agent_id\030" + "\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022\017\n" + "\007club_id\030\002 \001(\004\022\024\n\014continuation\030\003 \001(\004\"h\n\026" + "GetSuggestionsResponse\0228\n\nsuggestion\030\001 \003" + "(\0132$.bgs.protocol.club.v1.ClubSuggestion" + "\022\024\n\014continuation\030\002 \001(\004\"\224\001\n\023CreateTicketR" + "equest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol." + "club.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022:\n\007opt" + "ions\030\003 \001(\0132).bgs.protocol.club.v1.Create" + "TicketOptions\"H\n\024CreateTicketResponse\0220\n" + "\006ticket\030\001 \001(\0132 .bgs.protocol.club.v1.Clu" + "bTicket\"l\n\024DestroyTicketRequest\0220\n\010agent" + "_id\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberI" + "d\022\017\n\007club_id\030\002 \001(\004\022\021\n\tticket_id\030\003 \001(\t\"Z\n" + "\023RedeemTicketRequest\0220\n\010agent_id\030\001 \001(\0132\036" + ".bgs.protocol.club.v1.MemberId\022\021\n\tticket" + "_id\030\003 \001(\t\"W\n\020GetTicketRequest\0220\n\010agent_i" + "d\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022" + "\021\n\tticket_id\030\003 \001(\t\"E\n\021GetTicketResponse\022" + "0\n\006ticket\030\001 \001(\0132 .bgs.protocol.club.v1.C" + "lubTicket\"l\n\021GetTicketsRequest\0220\n\010agent_" + "id\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId" + "\022\017\n\007club_id\030\002 \001(\004\022\024\n\014continuation\030\003 \001(\004\"" + "\\\n\022GetTicketsResponse\0220\n\006ticket\030\001 \003(\0132 ." + "bgs.protocol.club.v1.ClubTicket\022\024\n\014conti" + "nuation\030\002 \001(\004\"\210\001\n\rAddBanRequest\0220\n\010agent" + "_id\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberI" + "d\022\017\n\007club_id\030\002 \001(\004\0224\n\007options\030\003 \001(\0132#.bg" + "s.protocol.club.v1.AddBanOptions\"\210\001\n\020Rem" + "oveBanRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.pr" "otocol.club.v1.MemberId\022\017\n\007club_id\030\002 \001(\004" - "\022\021\n\tstream_id\030\003 \001(\004\022+\n\nmessage_id\030\004 \001(\0132" - "\027.bgs.protocol.MessageId\022;\n\007options\030\005 \001(" - "\0132*.bgs.protocol.club.v1.CreateMessageOp" - "tions\"K\n\023EditMessageResponse\0224\n\007message\030" - "\001 \001(\0132#.bgs.protocol.club.v1.StreamMessa" - "ge\"o\n\027SetMessagePinnedRequest\0220\n\010agent_i" + "\0221\n\ttarget_id\030\003 \001(\0132\036.bgs.protocol.club." + "v1.MemberId\"\205\001\n\rGetBanRequest\0220\n\010agent_i" "d\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022" - "\017\n\007club_id\030\002 \001(\004\022\021\n\tstream_id\030\003 \001(\004\"\243\001\n\031" - "SetTypingIndicatorRequest\0220\n\010agent_id\030\001 " - "\001(\0132\036.bgs.protocol.club.v1.MemberId\022\017\n\007c" - "lub_id\030\002 \001(\004\022\021\n\tstream_id\030\003 \001(\004\0220\n\tindic" - "ator\030\004 \001(\0162\035.bgs.protocol.TypingIndicato" - "r\"\232\001\n\034AdvanceStreamViewTimeRequest\0220\n\010ag" - "ent_id\030\001 \001(\0132\036.bgs.protocol.club.v1.Memb" - "erId\022\017\n\007club_id\030\002 \001(\004\022 \n\024stream_id_depre" - "cated\030\003 \001(\004B\002\030\001\022\025\n\tstream_id\030\004 \003(\004B\002\020\001\"{" - "\n#AdvanceStreamMentionViewTimeRequest\0220\n" + "\017\n\007club_id\030\002 \001(\004\0221\n\ttarget_id\030\003 \001(\0132\036.bg" + "s.protocol.club.v1.MemberId\"<\n\016GetBanRes" + "ponse\022*\n\003ban\030\001 \001(\0132\035.bgs.protocol.club.v" + "1.ClubBan\"i\n\016GetBansRequest\0220\n\010agent_id\030" + "\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022\017\n" + "\007club_id\030\002 \001(\004\022\024\n\014continuation\030\003 \001(\004\"S\n\017" + "GetBansResponse\022*\n\003ban\030\001 \003(\0132\035.bgs.proto" + "col.club.v1.ClubBan\022\024\n\014continuation\030\002 \001(" + "\004\"n\n\026SubscribeStreamRequest\0220\n\010agent_id\030" + "\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022\017\n" + "\007club_id\030\002 \001(\004\022\021\n\tstream_id\030\003 \003(\004\"p\n\030Uns" + "ubscribeStreamRequest\0220\n\010agent_id\030\001 \001(\0132" + "\036.bgs.protocol.club.v1.MemberId\022\017\n\007club_" + "id\030\002 \001(\004\022\021\n\tstream_id\030\003 \003(\004\"\224\001\n\023CreateSt" + "reamRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.prot" + "ocol.club.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022:" + "\n\007options\030\003 \001(\0132).bgs.protocol.club.v1.C" + "reateStreamOptions\":\n\024CreateStreamRespon" + "se\022\017\n\007club_id\030\001 \001(\004\022\021\n\tstream_id\030\002 \001(\004\"l" + "\n\024DestroyStreamRequest\0220\n\010agent_id\030\001 \001(\013" + "2\036.bgs.protocol.club.v1.MemberId\022\017\n\007club" + "_id\030\002 \001(\004\022\021\n\tstream_id\030\003 \001(\004\"h\n\020GetStrea" + "mRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protoco" + "l.club.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022\021\n\ts" + "tream_id\030\003 \001(\004\"A\n\021GetStreamResponse\022,\n\006s" + "tream\030\001 \001(\0132\034.bgs.protocol.club.v1.Strea" + "m\"l\n\021GetStreamsRequest\0220\n\010agent_id\030\001 \001(\013" + "2\036.bgs.protocol.club.v1.MemberId\022\017\n\007club" + "_id\030\002 \001(\004\022\024\n\014continuation\030\003 \001(\004\"\210\001\n\022GetS" + "treamsResponse\022,\n\006stream\030\001 \003(\0132\034.bgs.pro" + "tocol.club.v1.Stream\022.\n\004view\030\002 \003(\0132 .bgs" + ".protocol.club.v1.StreamView\022\024\n\014continua" + "tion\030\003 \001(\004\"\253\001\n\030UpdateStreamStateRequest\022" + "0\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v1" + ".MemberId\022\017\n\007club_id\030\002 \001(\004\022\021\n\tstream_id\030" + "\003 \001(\004\0229\n\007options\030\005 \001(\0132(.bgs.protocol.cl" + "ub.v1.StreamStateOptions\"|\n\025SetStreamFoc" + "usRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protoc" + "ol.club.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022\021\n\t" + "stream_id\030\003 \001(\004\022\r\n\005focus\030\004 \001(\010\"\251\001\n\024Creat" + "eMessageRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs." + "protocol.club.v1.MemberId\022\017\n\007club_id\030\002 \001" + "(\004\022\021\n\tstream_id\030\003 \001(\004\022;\n\007options\030\004 \001(\0132*" + ".bgs.protocol.club.v1.CreateMessageOptio" + "ns\"M\n\025CreateMessageResponse\0224\n\007message\030\001" + " \001(\0132#.bgs.protocol.club.v1.StreamMessag" + "e\"\232\001\n\025DestroyMessageRequest\0220\n\010agent_id\030" + "\001 \001(\0132\036.bgs.protocol.club.v1.MemberId\022\017\n" + "\007club_id\030\002 \001(\004\022\021\n\tstream_id\030\003 \001(\004\022+\n\nmes" + "sage_id\030\004 \001(\0132\027.bgs.protocol.MessageId\"N" + "\n\026DestroyMessageResponse\0224\n\007message\030\001 \001(" + "\0132#.bgs.protocol.club.v1.StreamMessage\"\324" + "\001\n\022EditMessageRequest\0220\n\010agent_id\030\001 \001(\0132" + "\036.bgs.protocol.club.v1.MemberId\022\017\n\007club_" + "id\030\002 \001(\004\022\021\n\tstream_id\030\003 \001(\004\022+\n\nmessage_i" + "d\030\004 \001(\0132\027.bgs.protocol.MessageId\022;\n\007opti" + "ons\030\005 \001(\0132*.bgs.protocol.club.v1.CreateM" + "essageOptions\"K\n\023EditMessageResponse\0224\n\007" + "message\030\001 \001(\0132#.bgs.protocol.club.v1.Str" + "eamMessage\"o\n\027SetMessagePinnedRequest\0220\n" "\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v1.M" "emberId\022\017\n\007club_id\030\002 \001(\004\022\021\n\tstream_id\030\003 " - "\001(\004\"c\n\036AdvanceActivityViewTimeRequest\0220\n" - "\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v1.M" - "emberId\022\017\n\007club_id\030\002 \001(\004\"\237\001\n\027GetStreamHi" - "storyRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.pro" - "tocol.club.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022" - "\021\n\tstream_id\030\003 \001(\004\022.\n\007options\030\004 \001(\0132\035.bg" - "s.protocol.GetEventOptions\"f\n\030GetStreamH" - "istoryResponse\0224\n\007message\030\001 \003(\0132#.bgs.pr" - "otocol.club.v1.StreamMessage\022\024\n\014continua" - "tion\030\002 \001(\004\"\213\001\n\026GetClubActivityRequest\0220\n" - "\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v1.M" - "emberId\022\017\n\007club_id\030\002 \001(\004\022.\n\007options\030\003 \001(" - "\0132\035.bgs.protocol.GetEventOptions\"/\n\027GetC" - "lubActivityResponse\022\024\n\014continuation\030\002 \001(" - "\004\"r\n\032GetStreamVoiceTokenRequest\0220\n\010agent" - "_id\030\001 \001(\0132\036.bgs.protocol.club.v1.MemberI" - "d\022\017\n\007club_id\030\002 \001(\004\022\021\n\tstream_id\030\003 \001(\004\"g\n" - "\033GetStreamVoiceTokenResponse\022\023\n\013channel_" - "uri\030\001 \001(\t\0223\n\013credentials\030\002 \001(\0132\036.bgs.pro" - "tocol.VoiceCredentials\"\245\001\n\032KickFromStrea" - "mVoiceRequest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.pr" - "otocol.club.v1.MemberId\022\017\n\007club_id\030\002 \001(\004" - "\022\021\n\tstream_id\030\003 \001(\004\0221\n\ttarget_id\030\004 \001(\0132\036" - ".bgs.protocol.club.v1.MemberIdB\002H\001P\000", 9396); + "\001(\004\"\243\001\n\031SetTypingIndicatorRequest\0220\n\010age" + "nt_id\030\001 \001(\0132\036.bgs.protocol.club.v1.Membe" + "rId\022\017\n\007club_id\030\002 \001(\004\022\021\n\tstream_id\030\003 \001(\004\022" + "0\n\tindicator\030\004 \001(\0162\035.bgs.protocol.Typing" + "Indicator\"\232\001\n\034AdvanceStreamViewTimeReque" + "st\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club" + ".v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022 \n\024stream_" + "id_deprecated\030\003 \001(\004B\002\030\001\022\025\n\tstream_id\030\004 \003" + "(\004B\002\020\001\"{\n#AdvanceStreamMentionViewTimeRe" + "quest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.c" + "lub.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022\021\n\tstre" + "am_id\030\003 \001(\004\"c\n\036AdvanceActivityViewTimeRe" + "quest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.c" + "lub.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\"\237\001\n\027Get" + "StreamHistoryRequest\0220\n\010agent_id\030\001 \001(\0132\036" + ".bgs.protocol.club.v1.MemberId\022\017\n\007club_i" + "d\030\002 \001(\004\022\021\n\tstream_id\030\003 \001(\004\022.\n\007options\030\004 " + "\001(\0132\035.bgs.protocol.GetEventOptions\"f\n\030Ge" + "tStreamHistoryResponse\0224\n\007message\030\001 \003(\0132" + "#.bgs.protocol.club.v1.StreamMessage\022\024\n\014" + "continuation\030\002 \001(\004\"\234\001\n\027GetStreamMessageR" + "equest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol." + "club.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022\021\n\tstr" + "eam_id\030\003 \001(\004\022+\n\nmessage_id\030\004 \001(\0132\027.bgs.p" + "rotocol.MessageId\"P\n\030GetStreamMessageRes" + "ponse\0224\n\007message\030\001 \001(\0132#.bgs.protocol.cl" + "ub.v1.StreamMessage\"\213\001\n\026GetClubActivityR" + "equest\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol." + "club.v1.MemberId\022\017\n\007club_id\030\002 \001(\004\022.\n\007opt" + "ions\030\003 \001(\0132\035.bgs.protocol.GetEventOption" + "s\"/\n\027GetClubActivityResponse\022\024\n\014continua" + "tion\030\002 \001(\004\"r\n\032GetStreamVoiceTokenRequest" + "\0220\n\010agent_id\030\001 \001(\0132\036.bgs.protocol.club.v" + "1.MemberId\022\017\n\007club_id\030\002 \001(\004\022\021\n\tstream_id" + "\030\003 \001(\004\"g\n\033GetStreamVoiceTokenResponse\022\023\n" + "\013channel_uri\030\001 \001(\t\0223\n\013credentials\030\002 \001(\0132" + "\036.bgs.protocol.VoiceCredentials\"\245\001\n\032Kick" + "FromStreamVoiceRequest\0220\n\010agent_id\030\001 \001(\013" + "2\036.bgs.protocol.club.v1.MemberId\022\017\n\007club" + "_id\030\002 \001(\004\022\021\n\tstream_id\030\003 \001(\004\0221\n\ttarget_i" + "d\030\004 \001(\0132\036.bgs.protocol.club.v1.MemberIdB" + "\002H\001P\000", 9685); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "club_request.proto", &protobuf_RegisterTypes); SubscribeRequest::default_instance_ = new SubscribeRequest(); @@ -2217,6 +2295,7 @@ void protobuf_AddDesc_club_5frequest_2eproto() { SubscribeStreamRequest::default_instance_ = new SubscribeStreamRequest(); UnsubscribeStreamRequest::default_instance_ = new UnsubscribeStreamRequest(); CreateStreamRequest::default_instance_ = new CreateStreamRequest(); + CreateStreamResponse::default_instance_ = new CreateStreamResponse(); DestroyStreamRequest::default_instance_ = new DestroyStreamRequest(); GetStreamRequest::default_instance_ = new GetStreamRequest(); GetStreamResponse::default_instance_ = new GetStreamResponse(); @@ -2237,6 +2316,8 @@ void protobuf_AddDesc_club_5frequest_2eproto() { AdvanceActivityViewTimeRequest::default_instance_ = new AdvanceActivityViewTimeRequest(); GetStreamHistoryRequest::default_instance_ = new GetStreamHistoryRequest(); GetStreamHistoryResponse::default_instance_ = new GetStreamHistoryResponse(); + GetStreamMessageRequest::default_instance_ = new GetStreamMessageRequest(); + GetStreamMessageResponse::default_instance_ = new GetStreamMessageResponse(); GetClubActivityRequest::default_instance_ = new GetClubActivityRequest(); GetClubActivityResponse::default_instance_ = new GetClubActivityResponse(); GetStreamVoiceTokenRequest::default_instance_ = new GetStreamVoiceTokenRequest(); @@ -2296,6 +2377,7 @@ void protobuf_AddDesc_club_5frequest_2eproto() { SubscribeStreamRequest::default_instance_->InitAsDefaultInstance(); UnsubscribeStreamRequest::default_instance_->InitAsDefaultInstance(); CreateStreamRequest::default_instance_->InitAsDefaultInstance(); + CreateStreamResponse::default_instance_->InitAsDefaultInstance(); DestroyStreamRequest::default_instance_->InitAsDefaultInstance(); GetStreamRequest::default_instance_->InitAsDefaultInstance(); GetStreamResponse::default_instance_->InitAsDefaultInstance(); @@ -2316,6 +2398,8 @@ void protobuf_AddDesc_club_5frequest_2eproto() { AdvanceActivityViewTimeRequest::default_instance_->InitAsDefaultInstance(); GetStreamHistoryRequest::default_instance_->InitAsDefaultInstance(); GetStreamHistoryResponse::default_instance_->InitAsDefaultInstance(); + GetStreamMessageRequest::default_instance_->InitAsDefaultInstance(); + GetStreamMessageResponse::default_instance_->InitAsDefaultInstance(); GetClubActivityRequest::default_instance_->InitAsDefaultInstance(); GetClubActivityResponse::default_instance_->InitAsDefaultInstance(); GetStreamVoiceTokenRequest::default_instance_->InitAsDefaultInstance(); @@ -8092,7 +8176,7 @@ void UpdateSubscriberStateRequest::Swap(UpdateSubscriberStateRequest* other) { #ifndef _MSC_VER const int AssignRoleRequest::kAgentIdFieldNumber; const int AssignRoleRequest::kClubIdFieldNumber; -const int AssignRoleRequest::kAssignmentFieldNumber; +const int AssignRoleRequest::kOptionsFieldNumber; #endif // !_MSC_VER AssignRoleRequest::AssignRoleRequest() @@ -8103,7 +8187,7 @@ AssignRoleRequest::AssignRoleRequest() void AssignRoleRequest::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - assignment_ = const_cast< ::bgs::protocol::club::v1::RoleAssignment*>(&::bgs::protocol::club::v1::RoleAssignment::default_instance()); + options_ = const_cast< ::bgs::protocol::club::v1::RoleOptions*>(&::bgs::protocol::club::v1::RoleOptions::default_instance()); } AssignRoleRequest::AssignRoleRequest(const AssignRoleRequest& from) @@ -8117,7 +8201,7 @@ void AssignRoleRequest::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; club_id_ = GOOGLE_ULONGLONG(0); - assignment_ = NULL; + options_ = NULL; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -8129,7 +8213,7 @@ AssignRoleRequest::~AssignRoleRequest() { void AssignRoleRequest::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete assignment_; + delete options_; } } @@ -8160,8 +8244,8 @@ void AssignRoleRequest::Clear() { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); } club_id_ = GOOGLE_ULONGLONG(0); - if (has_assignment()) { - if (assignment_ != NULL) assignment_->::bgs::protocol::club::v1::RoleAssignment::Clear(); + if (has_options()) { + if (options_ != NULL) options_->::bgs::protocol::club::v1::RoleOptions::Clear(); } } ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -8201,16 +8285,16 @@ bool AssignRoleRequest::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(26)) goto parse_assignment; + if (input->ExpectTag(26)) goto parse_options; break; } - // optional .bgs.protocol.club.v1.RoleAssignment assignment = 3; + // optional .bgs.protocol.club.v1.RoleOptions options = 3; case 3: { if (tag == 26) { - parse_assignment: + parse_options: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_assignment())); + input, mutable_options())); } else { goto handle_unusual; } @@ -8254,10 +8338,10 @@ void AssignRoleRequest::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteUInt64(2, this->club_id(), output); } - // optional .bgs.protocol.club.v1.RoleAssignment assignment = 3; - if (has_assignment()) { + // optional .bgs.protocol.club.v1.RoleOptions options = 3; + if (has_options()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 3, this->assignment(), output); + 3, this->options(), output); } if (!unknown_fields().empty()) { @@ -8282,11 +8366,11 @@ void AssignRoleRequest::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(2, this->club_id(), target); } - // optional .bgs.protocol.club.v1.RoleAssignment assignment = 3; - if (has_assignment()) { + // optional .bgs.protocol.club.v1.RoleOptions options = 3; + if (has_options()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( - 3, this->assignment(), target); + 3, this->options(), target); } if (!unknown_fields().empty()) { @@ -8315,11 +8399,11 @@ int AssignRoleRequest::ByteSize() const { this->club_id()); } - // optional .bgs.protocol.club.v1.RoleAssignment assignment = 3; - if (has_assignment()) { + // optional .bgs.protocol.club.v1.RoleOptions options = 3; + if (has_options()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->assignment()); + this->options()); } } @@ -8355,8 +8439,8 @@ void AssignRoleRequest::MergeFrom(const AssignRoleRequest& from) { if (from.has_club_id()) { set_club_id(from.club_id()); } - if (from.has_assignment()) { - mutable_assignment()->::bgs::protocol::club::v1::RoleAssignment::MergeFrom(from.assignment()); + if (from.has_options()) { + mutable_options()->::bgs::protocol::club::v1::RoleOptions::MergeFrom(from.options()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -8379,8 +8463,8 @@ bool AssignRoleRequest::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_assignment()) { - if (!this->assignment().IsInitialized()) return false; + if (has_options()) { + if (!this->options().IsInitialized()) return false; } return true; } @@ -8389,7 +8473,7 @@ void AssignRoleRequest::Swap(AssignRoleRequest* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); std::swap(club_id_, other->club_id_); - std::swap(assignment_, other->assignment_); + std::swap(options_, other->options_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); @@ -8410,7 +8494,7 @@ void AssignRoleRequest::Swap(AssignRoleRequest* other) { #ifndef _MSC_VER const int UnassignRoleRequest::kAgentIdFieldNumber; const int UnassignRoleRequest::kClubIdFieldNumber; -const int UnassignRoleRequest::kAssignmentFieldNumber; +const int UnassignRoleRequest::kOptionsFieldNumber; #endif // !_MSC_VER UnassignRoleRequest::UnassignRoleRequest() @@ -8421,7 +8505,7 @@ UnassignRoleRequest::UnassignRoleRequest() void UnassignRoleRequest::InitAsDefaultInstance() { agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); - assignment_ = const_cast< ::bgs::protocol::club::v1::RoleAssignment*>(&::bgs::protocol::club::v1::RoleAssignment::default_instance()); + options_ = const_cast< ::bgs::protocol::club::v1::RoleOptions*>(&::bgs::protocol::club::v1::RoleOptions::default_instance()); } UnassignRoleRequest::UnassignRoleRequest(const UnassignRoleRequest& from) @@ -8435,7 +8519,7 @@ void UnassignRoleRequest::SharedCtor() { _cached_size_ = 0; agent_id_ = NULL; club_id_ = GOOGLE_ULONGLONG(0); - assignment_ = NULL; + options_ = NULL; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -8447,7 +8531,7 @@ UnassignRoleRequest::~UnassignRoleRequest() { void UnassignRoleRequest::SharedDtor() { if (this != default_instance_) { delete agent_id_; - delete assignment_; + delete options_; } } @@ -8478,8 +8562,8 @@ void UnassignRoleRequest::Clear() { if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); } club_id_ = GOOGLE_ULONGLONG(0); - if (has_assignment()) { - if (assignment_ != NULL) assignment_->::bgs::protocol::club::v1::RoleAssignment::Clear(); + if (has_options()) { + if (options_ != NULL) options_->::bgs::protocol::club::v1::RoleOptions::Clear(); } } ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -8519,16 +8603,16 @@ bool UnassignRoleRequest::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(26)) goto parse_assignment; + if (input->ExpectTag(26)) goto parse_options; break; } - // optional .bgs.protocol.club.v1.RoleAssignment assignment = 3; + // optional .bgs.protocol.club.v1.RoleOptions options = 3; case 3: { if (tag == 26) { - parse_assignment: + parse_options: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_assignment())); + input, mutable_options())); } else { goto handle_unusual; } @@ -8572,10 +8656,10 @@ void UnassignRoleRequest::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteUInt64(2, this->club_id(), output); } - // optional .bgs.protocol.club.v1.RoleAssignment assignment = 3; - if (has_assignment()) { + // optional .bgs.protocol.club.v1.RoleOptions options = 3; + if (has_options()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 3, this->assignment(), output); + 3, this->options(), output); } if (!unknown_fields().empty()) { @@ -8600,11 +8684,11 @@ void UnassignRoleRequest::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(2, this->club_id(), target); } - // optional .bgs.protocol.club.v1.RoleAssignment assignment = 3; - if (has_assignment()) { + // optional .bgs.protocol.club.v1.RoleOptions options = 3; + if (has_options()) { target = ::google::protobuf::internal::WireFormatLite:: WriteMessageNoVirtualToArray( - 3, this->assignment(), target); + 3, this->options(), target); } if (!unknown_fields().empty()) { @@ -8633,11 +8717,11 @@ int UnassignRoleRequest::ByteSize() const { this->club_id()); } - // optional .bgs.protocol.club.v1.RoleAssignment assignment = 3; - if (has_assignment()) { + // optional .bgs.protocol.club.v1.RoleOptions options = 3; + if (has_options()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->assignment()); + this->options()); } } @@ -8673,8 +8757,8 @@ void UnassignRoleRequest::MergeFrom(const UnassignRoleRequest& from) { if (from.has_club_id()) { set_club_id(from.club_id()); } - if (from.has_assignment()) { - mutable_assignment()->::bgs::protocol::club::v1::RoleAssignment::MergeFrom(from.assignment()); + if (from.has_options()) { + mutable_options()->::bgs::protocol::club::v1::RoleOptions::MergeFrom(from.options()); } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); @@ -8697,8 +8781,8 @@ bool UnassignRoleRequest::IsInitialized() const { if (has_agent_id()) { if (!this->agent_id().IsInitialized()) return false; } - if (has_assignment()) { - if (!this->assignment().IsInitialized()) return false; + if (has_options()) { + if (!this->options().IsInitialized()) return false; } return true; } @@ -8707,7 +8791,7 @@ void UnassignRoleRequest::Swap(UnassignRoleRequest* other) { if (other != this) { std::swap(agent_id_, other->agent_id_); std::swap(club_id_, other->club_id_); - std::swap(assignment_, other->assignment_); + std::swap(options_, other->options_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); @@ -18234,6 +18318,280 @@ void CreateStreamRequest::Swap(CreateStreamRequest* other) { // =================================================================== #ifndef _MSC_VER +const int CreateStreamResponse::kClubIdFieldNumber; +const int CreateStreamResponse::kStreamIdFieldNumber; +#endif // !_MSC_VER + +CreateStreamResponse::CreateStreamResponse() + : ::google::protobuf::Message() { + SharedCtor(); + // @@protoc_insertion_point(constructor:bgs.protocol.club.v1.CreateStreamResponse) +} + +void CreateStreamResponse::InitAsDefaultInstance() { +} + +CreateStreamResponse::CreateStreamResponse(const CreateStreamResponse& from) + : ::google::protobuf::Message() { + SharedCtor(); + MergeFrom(from); + // @@protoc_insertion_point(copy_constructor:bgs.protocol.club.v1.CreateStreamResponse) +} + +void CreateStreamResponse::SharedCtor() { + _cached_size_ = 0; + club_id_ = GOOGLE_ULONGLONG(0); + stream_id_ = GOOGLE_ULONGLONG(0); + ::memset(_has_bits_, 0, sizeof(_has_bits_)); +} + +CreateStreamResponse::~CreateStreamResponse() { + // @@protoc_insertion_point(destructor:bgs.protocol.club.v1.CreateStreamResponse) + SharedDtor(); +} + +void CreateStreamResponse::SharedDtor() { + if (this != default_instance_) { + } +} + +void CreateStreamResponse::SetCachedSize(int size) const { + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); +} +const ::google::protobuf::Descriptor* CreateStreamResponse::descriptor() { + protobuf_AssignDescriptorsOnce(); + return CreateStreamResponse_descriptor_; +} + +const CreateStreamResponse& CreateStreamResponse::default_instance() { + if (default_instance_ == NULL) protobuf_AddDesc_club_5frequest_2eproto(); + return *default_instance_; +} + +CreateStreamResponse* CreateStreamResponse::default_instance_ = NULL; + +CreateStreamResponse* CreateStreamResponse::New() const { + return new CreateStreamResponse; +} + +void CreateStreamResponse::Clear() { +#define OFFSET_OF_FIELD_(f) (reinterpret_cast<char*>( \ + &reinterpret_cast<CreateStreamResponse*>(16)->f) - \ + reinterpret_cast<char*>(16)) + +#define ZR_(first, last) do { \ + size_t f = OFFSET_OF_FIELD_(first); \ + size_t n = OFFSET_OF_FIELD_(last) - f + sizeof(last); \ + ::memset(&first, 0, n); \ + } while (0) + + ZR_(club_id_, stream_id_); + +#undef OFFSET_OF_FIELD_ +#undef ZR_ + + ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); +} + +bool CreateStreamResponse::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:bgs.protocol.club.v1.CreateStreamResponse) + for (;;) { + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // optional uint64 club_id = 1; + case 1: { + if (tag == 8) { + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>( + input, &club_id_))); + set_has_club_id(); + } else { + goto handle_unusual; + } + if (input->ExpectTag(16)) goto parse_stream_id; + break; + } + + // optional uint64 stream_id = 2; + case 2: { + if (tag == 16) { + parse_stream_id: + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>( + input, &stream_id_))); + set_has_stream_id(); + } else { + goto handle_unusual; + } + if (input->ExpectAtEnd()) goto success; + break; + } + + default: { + handle_unusual: + if (tag == 0 || + ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:bgs.protocol.club.v1.CreateStreamResponse) + return true; +failure: + // @@protoc_insertion_point(parse_failure:bgs.protocol.club.v1.CreateStreamResponse) + return false; +#undef DO_ +} + +void CreateStreamResponse::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:bgs.protocol.club.v1.CreateStreamResponse) + // optional uint64 club_id = 1; + if (has_club_id()) { + ::google::protobuf::internal::WireFormatLite::WriteUInt64(1, this->club_id(), output); + } + + // optional uint64 stream_id = 2; + if (has_stream_id()) { + ::google::protobuf::internal::WireFormatLite::WriteUInt64(2, this->stream_id(), output); + } + + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:bgs.protocol.club.v1.CreateStreamResponse) +} + +::google::protobuf::uint8* CreateStreamResponse::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.club.v1.CreateStreamResponse) + // optional uint64 club_id = 1; + if (has_club_id()) { + target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(1, this->club_id(), target); + } + + // optional uint64 stream_id = 2; + if (has_stream_id()) { + target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(2, this->stream_id(), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.club.v1.CreateStreamResponse) + return target; +} + +int CreateStreamResponse::ByteSize() const { + int total_size = 0; + + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { + // optional uint64 club_id = 1; + if (has_club_id()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::UInt64Size( + this->club_id()); + } + + // optional uint64 stream_id = 2; + if (has_stream_id()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::UInt64Size( + this->stream_id()); + } + + } + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = total_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} + +void CreateStreamResponse::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const CreateStreamResponse* source = + ::google::protobuf::internal::dynamic_cast_if_available<const CreateStreamResponse*>( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } +} + +void CreateStreamResponse::MergeFrom(const CreateStreamResponse& from) { + GOOGLE_CHECK_NE(&from, this); + if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from.has_club_id()) { + set_club_id(from.club_id()); + } + if (from.has_stream_id()) { + set_stream_id(from.stream_id()); + } + } + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void CreateStreamResponse::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void CreateStreamResponse::CopyFrom(const CreateStreamResponse& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool CreateStreamResponse::IsInitialized() const { + + return true; +} + +void CreateStreamResponse::Swap(CreateStreamResponse* other) { + if (other != this) { + std::swap(club_id_, other->club_id_); + std::swap(stream_id_, other->stream_id_); + std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); + std::swap(_cached_size_, other->_cached_size_); + } +} + +::google::protobuf::Metadata CreateStreamResponse::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = CreateStreamResponse_descriptor_; + metadata.reflection = CreateStreamResponse_reflection_; + return metadata; +} + + +// =================================================================== + +#ifndef _MSC_VER const int DestroyStreamRequest::kAgentIdFieldNumber; const int DestroyStreamRequest::kClubIdFieldNumber; const int DestroyStreamRequest::kStreamIdFieldNumber; @@ -24599,6 +24957,603 @@ void GetStreamHistoryResponse::Swap(GetStreamHistoryResponse* other) { // =================================================================== #ifndef _MSC_VER +const int GetStreamMessageRequest::kAgentIdFieldNumber; +const int GetStreamMessageRequest::kClubIdFieldNumber; +const int GetStreamMessageRequest::kStreamIdFieldNumber; +const int GetStreamMessageRequest::kMessageIdFieldNumber; +#endif // !_MSC_VER + +GetStreamMessageRequest::GetStreamMessageRequest() + : ::google::protobuf::Message() { + SharedCtor(); + // @@protoc_insertion_point(constructor:bgs.protocol.club.v1.GetStreamMessageRequest) +} + +void GetStreamMessageRequest::InitAsDefaultInstance() { + agent_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); + message_id_ = const_cast< ::bgs::protocol::MessageId*>(&::bgs::protocol::MessageId::default_instance()); +} + +GetStreamMessageRequest::GetStreamMessageRequest(const GetStreamMessageRequest& from) + : ::google::protobuf::Message() { + SharedCtor(); + MergeFrom(from); + // @@protoc_insertion_point(copy_constructor:bgs.protocol.club.v1.GetStreamMessageRequest) +} + +void GetStreamMessageRequest::SharedCtor() { + _cached_size_ = 0; + agent_id_ = NULL; + club_id_ = GOOGLE_ULONGLONG(0); + stream_id_ = GOOGLE_ULONGLONG(0); + message_id_ = NULL; + ::memset(_has_bits_, 0, sizeof(_has_bits_)); +} + +GetStreamMessageRequest::~GetStreamMessageRequest() { + // @@protoc_insertion_point(destructor:bgs.protocol.club.v1.GetStreamMessageRequest) + SharedDtor(); +} + +void GetStreamMessageRequest::SharedDtor() { + if (this != default_instance_) { + delete agent_id_; + delete message_id_; + } +} + +void GetStreamMessageRequest::SetCachedSize(int size) const { + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); +} +const ::google::protobuf::Descriptor* GetStreamMessageRequest::descriptor() { + protobuf_AssignDescriptorsOnce(); + return GetStreamMessageRequest_descriptor_; +} + +const GetStreamMessageRequest& GetStreamMessageRequest::default_instance() { + if (default_instance_ == NULL) protobuf_AddDesc_club_5frequest_2eproto(); + return *default_instance_; +} + +GetStreamMessageRequest* GetStreamMessageRequest::default_instance_ = NULL; + +GetStreamMessageRequest* GetStreamMessageRequest::New() const { + return new GetStreamMessageRequest; +} + +void GetStreamMessageRequest::Clear() { +#define OFFSET_OF_FIELD_(f) (reinterpret_cast<char*>( \ + &reinterpret_cast<GetStreamMessageRequest*>(16)->f) - \ + reinterpret_cast<char*>(16)) + +#define ZR_(first, last) do { \ + size_t f = OFFSET_OF_FIELD_(first); \ + size_t n = OFFSET_OF_FIELD_(last) - f + sizeof(last); \ + ::memset(&first, 0, n); \ + } while (0) + + if (_has_bits_[0 / 32] & 15) { + ZR_(club_id_, stream_id_); + if (has_agent_id()) { + if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); + } + if (has_message_id()) { + if (message_id_ != NULL) message_id_->::bgs::protocol::MessageId::Clear(); + } + } + +#undef OFFSET_OF_FIELD_ +#undef ZR_ + + ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); +} + +bool GetStreamMessageRequest::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:bgs.protocol.club.v1.GetStreamMessageRequest) + for (;;) { + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // optional .bgs.protocol.club.v1.MemberId agent_id = 1; + case 1: { + if (tag == 10) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_agent_id())); + } else { + goto handle_unusual; + } + if (input->ExpectTag(16)) goto parse_club_id; + break; + } + + // optional uint64 club_id = 2; + case 2: { + if (tag == 16) { + parse_club_id: + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>( + input, &club_id_))); + set_has_club_id(); + } else { + goto handle_unusual; + } + if (input->ExpectTag(24)) goto parse_stream_id; + break; + } + + // optional uint64 stream_id = 3; + case 3: { + if (tag == 24) { + parse_stream_id: + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>( + input, &stream_id_))); + set_has_stream_id(); + } else { + goto handle_unusual; + } + if (input->ExpectTag(34)) goto parse_message_id; + break; + } + + // optional .bgs.protocol.MessageId message_id = 4; + case 4: { + if (tag == 34) { + parse_message_id: + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_message_id())); + } else { + goto handle_unusual; + } + if (input->ExpectAtEnd()) goto success; + break; + } + + default: { + handle_unusual: + if (tag == 0 || + ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:bgs.protocol.club.v1.GetStreamMessageRequest) + return true; +failure: + // @@protoc_insertion_point(parse_failure:bgs.protocol.club.v1.GetStreamMessageRequest) + return false; +#undef DO_ +} + +void GetStreamMessageRequest::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:bgs.protocol.club.v1.GetStreamMessageRequest) + // optional .bgs.protocol.club.v1.MemberId agent_id = 1; + if (has_agent_id()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, this->agent_id(), output); + } + + // optional uint64 club_id = 2; + if (has_club_id()) { + ::google::protobuf::internal::WireFormatLite::WriteUInt64(2, this->club_id(), output); + } + + // optional uint64 stream_id = 3; + if (has_stream_id()) { + ::google::protobuf::internal::WireFormatLite::WriteUInt64(3, this->stream_id(), output); + } + + // optional .bgs.protocol.MessageId message_id = 4; + if (has_message_id()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 4, this->message_id(), output); + } + + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:bgs.protocol.club.v1.GetStreamMessageRequest) +} + +::google::protobuf::uint8* GetStreamMessageRequest::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.club.v1.GetStreamMessageRequest) + // optional .bgs.protocol.club.v1.MemberId agent_id = 1; + if (has_agent_id()) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 1, this->agent_id(), target); + } + + // optional uint64 club_id = 2; + if (has_club_id()) { + target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(2, this->club_id(), target); + } + + // optional uint64 stream_id = 3; + if (has_stream_id()) { + target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(3, this->stream_id(), target); + } + + // optional .bgs.protocol.MessageId message_id = 4; + if (has_message_id()) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 4, this->message_id(), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.club.v1.GetStreamMessageRequest) + return target; +} + +int GetStreamMessageRequest::ByteSize() const { + int total_size = 0; + + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { + // optional .bgs.protocol.club.v1.MemberId agent_id = 1; + if (has_agent_id()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->agent_id()); + } + + // optional uint64 club_id = 2; + if (has_club_id()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::UInt64Size( + this->club_id()); + } + + // optional uint64 stream_id = 3; + if (has_stream_id()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::UInt64Size( + this->stream_id()); + } + + // optional .bgs.protocol.MessageId message_id = 4; + if (has_message_id()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->message_id()); + } + + } + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = total_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} + +void GetStreamMessageRequest::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const GetStreamMessageRequest* source = + ::google::protobuf::internal::dynamic_cast_if_available<const GetStreamMessageRequest*>( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } +} + +void GetStreamMessageRequest::MergeFrom(const GetStreamMessageRequest& from) { + GOOGLE_CHECK_NE(&from, this); + if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from.has_agent_id()) { + mutable_agent_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.agent_id()); + } + if (from.has_club_id()) { + set_club_id(from.club_id()); + } + if (from.has_stream_id()) { + set_stream_id(from.stream_id()); + } + if (from.has_message_id()) { + mutable_message_id()->::bgs::protocol::MessageId::MergeFrom(from.message_id()); + } + } + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void GetStreamMessageRequest::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void GetStreamMessageRequest::CopyFrom(const GetStreamMessageRequest& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool GetStreamMessageRequest::IsInitialized() const { + + if (has_agent_id()) { + if (!this->agent_id().IsInitialized()) return false; + } + return true; +} + +void GetStreamMessageRequest::Swap(GetStreamMessageRequest* other) { + if (other != this) { + std::swap(agent_id_, other->agent_id_); + std::swap(club_id_, other->club_id_); + std::swap(stream_id_, other->stream_id_); + std::swap(message_id_, other->message_id_); + std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); + std::swap(_cached_size_, other->_cached_size_); + } +} + +::google::protobuf::Metadata GetStreamMessageRequest::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = GetStreamMessageRequest_descriptor_; + metadata.reflection = GetStreamMessageRequest_reflection_; + return metadata; +} + + +// =================================================================== + +#ifndef _MSC_VER +const int GetStreamMessageResponse::kMessageFieldNumber; +#endif // !_MSC_VER + +GetStreamMessageResponse::GetStreamMessageResponse() + : ::google::protobuf::Message() { + SharedCtor(); + // @@protoc_insertion_point(constructor:bgs.protocol.club.v1.GetStreamMessageResponse) +} + +void GetStreamMessageResponse::InitAsDefaultInstance() { + message_ = const_cast< ::bgs::protocol::club::v1::StreamMessage*>(&::bgs::protocol::club::v1::StreamMessage::default_instance()); +} + +GetStreamMessageResponse::GetStreamMessageResponse(const GetStreamMessageResponse& from) + : ::google::protobuf::Message() { + SharedCtor(); + MergeFrom(from); + // @@protoc_insertion_point(copy_constructor:bgs.protocol.club.v1.GetStreamMessageResponse) +} + +void GetStreamMessageResponse::SharedCtor() { + _cached_size_ = 0; + message_ = NULL; + ::memset(_has_bits_, 0, sizeof(_has_bits_)); +} + +GetStreamMessageResponse::~GetStreamMessageResponse() { + // @@protoc_insertion_point(destructor:bgs.protocol.club.v1.GetStreamMessageResponse) + SharedDtor(); +} + +void GetStreamMessageResponse::SharedDtor() { + if (this != default_instance_) { + delete message_; + } +} + +void GetStreamMessageResponse::SetCachedSize(int size) const { + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); +} +const ::google::protobuf::Descriptor* GetStreamMessageResponse::descriptor() { + protobuf_AssignDescriptorsOnce(); + return GetStreamMessageResponse_descriptor_; +} + +const GetStreamMessageResponse& GetStreamMessageResponse::default_instance() { + if (default_instance_ == NULL) protobuf_AddDesc_club_5frequest_2eproto(); + return *default_instance_; +} + +GetStreamMessageResponse* GetStreamMessageResponse::default_instance_ = NULL; + +GetStreamMessageResponse* GetStreamMessageResponse::New() const { + return new GetStreamMessageResponse; +} + +void GetStreamMessageResponse::Clear() { + if (has_message()) { + if (message_ != NULL) message_->::bgs::protocol::club::v1::StreamMessage::Clear(); + } + ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); +} + +bool GetStreamMessageResponse::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:bgs.protocol.club.v1.GetStreamMessageResponse) + for (;;) { + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // optional .bgs.protocol.club.v1.StreamMessage message = 1; + case 1: { + if (tag == 10) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_message())); + } else { + goto handle_unusual; + } + if (input->ExpectAtEnd()) goto success; + break; + } + + default: { + handle_unusual: + if (tag == 0 || + ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:bgs.protocol.club.v1.GetStreamMessageResponse) + return true; +failure: + // @@protoc_insertion_point(parse_failure:bgs.protocol.club.v1.GetStreamMessageResponse) + return false; +#undef DO_ +} + +void GetStreamMessageResponse::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:bgs.protocol.club.v1.GetStreamMessageResponse) + // optional .bgs.protocol.club.v1.StreamMessage message = 1; + if (has_message()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, this->message(), output); + } + + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:bgs.protocol.club.v1.GetStreamMessageResponse) +} + +::google::protobuf::uint8* GetStreamMessageResponse::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.club.v1.GetStreamMessageResponse) + // optional .bgs.protocol.club.v1.StreamMessage message = 1; + if (has_message()) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 1, this->message(), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.club.v1.GetStreamMessageResponse) + return target; +} + +int GetStreamMessageResponse::ByteSize() const { + int total_size = 0; + + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { + // optional .bgs.protocol.club.v1.StreamMessage message = 1; + if (has_message()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->message()); + } + + } + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = total_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} + +void GetStreamMessageResponse::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const GetStreamMessageResponse* source = + ::google::protobuf::internal::dynamic_cast_if_available<const GetStreamMessageResponse*>( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } +} + +void GetStreamMessageResponse::MergeFrom(const GetStreamMessageResponse& from) { + GOOGLE_CHECK_NE(&from, this); + if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from.has_message()) { + mutable_message()->::bgs::protocol::club::v1::StreamMessage::MergeFrom(from.message()); + } + } + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void GetStreamMessageResponse::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void GetStreamMessageResponse::CopyFrom(const GetStreamMessageResponse& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool GetStreamMessageResponse::IsInitialized() const { + + if (has_message()) { + if (!this->message().IsInitialized()) return false; + } + return true; +} + +void GetStreamMessageResponse::Swap(GetStreamMessageResponse* other) { + if (other != this) { + std::swap(message_, other->message_); + std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); + std::swap(_cached_size_, other->_cached_size_); + } +} + +::google::protobuf::Metadata GetStreamMessageResponse::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = GetStreamMessageResponse_descriptor_; + metadata.reflection = GetStreamMessageResponse_reflection_; + return metadata; +} + + +// =================================================================== + +#ifndef _MSC_VER const int GetClubActivityRequest::kAgentIdFieldNumber; const int GetClubActivityRequest::kClubIdFieldNumber; const int GetClubActivityRequest::kOptionsFieldNumber; diff --git a/src/server/proto/Client/club_request.pb.h b/src/server/proto/Client/club_request.pb.h index bcb622e409e..67aa467c42d 100644 --- a/src/server/proto/Client/club_request.pb.h +++ b/src/server/proto/Client/club_request.pb.h @@ -92,6 +92,7 @@ class GetBansResponse; class SubscribeStreamRequest; class UnsubscribeStreamRequest; class CreateStreamRequest; +class CreateStreamResponse; class DestroyStreamRequest; class GetStreamRequest; class GetStreamResponse; @@ -112,6 +113,8 @@ class AdvanceStreamMentionViewTimeRequest; class AdvanceActivityViewTimeRequest; class GetStreamHistoryRequest; class GetStreamHistoryResponse; +class GetStreamMessageRequest; +class GetStreamMessageResponse; class GetClubActivityRequest; class GetClubActivityResponse; class GetStreamVoiceTokenRequest; @@ -2102,14 +2105,14 @@ class TC_PROTO_API AssignRoleRequest : public ::google::protobuf::Message { inline ::google::protobuf::uint64 club_id() const; inline void set_club_id(::google::protobuf::uint64 value); - // optional .bgs.protocol.club.v1.RoleAssignment assignment = 3; - inline bool has_assignment() const; - inline void clear_assignment(); - static const int kAssignmentFieldNumber = 3; - inline const ::bgs::protocol::club::v1::RoleAssignment& assignment() const; - inline ::bgs::protocol::club::v1::RoleAssignment* mutable_assignment(); - inline ::bgs::protocol::club::v1::RoleAssignment* release_assignment(); - inline void set_allocated_assignment(::bgs::protocol::club::v1::RoleAssignment* assignment); + // optional .bgs.protocol.club.v1.RoleOptions options = 3; + inline bool has_options() const; + inline void clear_options(); + static const int kOptionsFieldNumber = 3; + inline const ::bgs::protocol::club::v1::RoleOptions& options() const; + inline ::bgs::protocol::club::v1::RoleOptions* mutable_options(); + inline ::bgs::protocol::club::v1::RoleOptions* release_options(); + inline void set_allocated_options(::bgs::protocol::club::v1::RoleOptions* options); // @@protoc_insertion_point(class_scope:bgs.protocol.club.v1.AssignRoleRequest) private: @@ -2117,8 +2120,8 @@ class TC_PROTO_API AssignRoleRequest : public ::google::protobuf::Message { inline void clear_has_agent_id(); inline void set_has_club_id(); inline void clear_has_club_id(); - inline void set_has_assignment(); - inline void clear_has_assignment(); + inline void set_has_options(); + inline void clear_has_options(); ::google::protobuf::UnknownFieldSet _unknown_fields_; @@ -2126,7 +2129,7 @@ class TC_PROTO_API AssignRoleRequest : public ::google::protobuf::Message { mutable int _cached_size_; ::bgs::protocol::club::v1::MemberId* agent_id_; ::google::protobuf::uint64 club_id_; - ::bgs::protocol::club::v1::RoleAssignment* assignment_; + ::bgs::protocol::club::v1::RoleOptions* options_; friend void TC_PROTO_API protobuf_AddDesc_club_5frequest_2eproto(); friend void protobuf_AssignDesc_club_5frequest_2eproto(); friend void protobuf_ShutdownFile_club_5frequest_2eproto(); @@ -2205,14 +2208,14 @@ class TC_PROTO_API UnassignRoleRequest : public ::google::protobuf::Message { inline ::google::protobuf::uint64 club_id() const; inline void set_club_id(::google::protobuf::uint64 value); - // optional .bgs.protocol.club.v1.RoleAssignment assignment = 3; - inline bool has_assignment() const; - inline void clear_assignment(); - static const int kAssignmentFieldNumber = 3; - inline const ::bgs::protocol::club::v1::RoleAssignment& assignment() const; - inline ::bgs::protocol::club::v1::RoleAssignment* mutable_assignment(); - inline ::bgs::protocol::club::v1::RoleAssignment* release_assignment(); - inline void set_allocated_assignment(::bgs::protocol::club::v1::RoleAssignment* assignment); + // optional .bgs.protocol.club.v1.RoleOptions options = 3; + inline bool has_options() const; + inline void clear_options(); + static const int kOptionsFieldNumber = 3; + inline const ::bgs::protocol::club::v1::RoleOptions& options() const; + inline ::bgs::protocol::club::v1::RoleOptions* mutable_options(); + inline ::bgs::protocol::club::v1::RoleOptions* release_options(); + inline void set_allocated_options(::bgs::protocol::club::v1::RoleOptions* options); // @@protoc_insertion_point(class_scope:bgs.protocol.club.v1.UnassignRoleRequest) private: @@ -2220,8 +2223,8 @@ class TC_PROTO_API UnassignRoleRequest : public ::google::protobuf::Message { inline void clear_has_agent_id(); inline void set_has_club_id(); inline void clear_has_club_id(); - inline void set_has_assignment(); - inline void clear_has_assignment(); + inline void set_has_options(); + inline void clear_has_options(); ::google::protobuf::UnknownFieldSet _unknown_fields_; @@ -2229,7 +2232,7 @@ class TC_PROTO_API UnassignRoleRequest : public ::google::protobuf::Message { mutable int _cached_size_; ::bgs::protocol::club::v1::MemberId* agent_id_; ::google::protobuf::uint64 club_id_; - ::bgs::protocol::club::v1::RoleAssignment* assignment_; + ::bgs::protocol::club::v1::RoleOptions* options_; friend void TC_PROTO_API protobuf_AddDesc_club_5frequest_2eproto(); friend void protobuf_AssignDesc_club_5frequest_2eproto(); friend void protobuf_ShutdownFile_club_5frequest_2eproto(); @@ -5350,6 +5353,95 @@ class TC_PROTO_API CreateStreamRequest : public ::google::protobuf::Message { }; // ------------------------------------------------------------------- +class TC_PROTO_API CreateStreamResponse : public ::google::protobuf::Message { + public: + CreateStreamResponse(); + virtual ~CreateStreamResponse(); + + CreateStreamResponse(const CreateStreamResponse& from); + + inline CreateStreamResponse& operator=(const CreateStreamResponse& from) { + CopyFrom(from); + return *this; + } + + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); + static const CreateStreamResponse& default_instance(); + + void Swap(CreateStreamResponse* other); + + // implements Message ---------------------------------------------- + + CreateStreamResponse* New() const; + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); + void CopyFrom(const CreateStreamResponse& from); + void MergeFrom(const CreateStreamResponse& from); + void Clear(); + bool IsInitialized() const; + + int ByteSize() const; + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input); + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; + int GetCachedSize() const { return _cached_size_; } + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const; + public: + ::google::protobuf::Metadata GetMetadata() const; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // optional uint64 club_id = 1; + inline bool has_club_id() const; + inline void clear_club_id(); + static const int kClubIdFieldNumber = 1; + inline ::google::protobuf::uint64 club_id() const; + inline void set_club_id(::google::protobuf::uint64 value); + + // optional uint64 stream_id = 2; + inline bool has_stream_id() const; + inline void clear_stream_id(); + static const int kStreamIdFieldNumber = 2; + inline ::google::protobuf::uint64 stream_id() const; + inline void set_stream_id(::google::protobuf::uint64 value); + + // @@protoc_insertion_point(class_scope:bgs.protocol.club.v1.CreateStreamResponse) + private: + inline void set_has_club_id(); + inline void clear_has_club_id(); + inline void set_has_stream_id(); + inline void clear_has_stream_id(); + + ::google::protobuf::UnknownFieldSet _unknown_fields_; + + ::google::protobuf::uint32 _has_bits_[1]; + mutable int _cached_size_; + ::google::protobuf::uint64 club_id_; + ::google::protobuf::uint64 stream_id_; + friend void TC_PROTO_API protobuf_AddDesc_club_5frequest_2eproto(); + friend void protobuf_AssignDesc_club_5frequest_2eproto(); + friend void protobuf_ShutdownFile_club_5frequest_2eproto(); + + void InitAsDefaultInstance(); + static CreateStreamResponse* default_instance_; +}; +// ------------------------------------------------------------------- + class TC_PROTO_API DestroyStreamRequest : public ::google::protobuf::Message { public: DestroyStreamRequest(); @@ -7381,6 +7473,200 @@ class TC_PROTO_API GetStreamHistoryResponse : public ::google::protobuf::Message }; // ------------------------------------------------------------------- +class TC_PROTO_API GetStreamMessageRequest : public ::google::protobuf::Message { + public: + GetStreamMessageRequest(); + virtual ~GetStreamMessageRequest(); + + GetStreamMessageRequest(const GetStreamMessageRequest& from); + + inline GetStreamMessageRequest& operator=(const GetStreamMessageRequest& from) { + CopyFrom(from); + return *this; + } + + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); + static const GetStreamMessageRequest& default_instance(); + + void Swap(GetStreamMessageRequest* other); + + // implements Message ---------------------------------------------- + + GetStreamMessageRequest* New() const; + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); + void CopyFrom(const GetStreamMessageRequest& from); + void MergeFrom(const GetStreamMessageRequest& from); + void Clear(); + bool IsInitialized() const; + + int ByteSize() const; + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input); + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; + int GetCachedSize() const { return _cached_size_; } + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const; + public: + ::google::protobuf::Metadata GetMetadata() const; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // optional .bgs.protocol.club.v1.MemberId agent_id = 1; + inline bool has_agent_id() const; + inline void clear_agent_id(); + static const int kAgentIdFieldNumber = 1; + inline const ::bgs::protocol::club::v1::MemberId& agent_id() const; + inline ::bgs::protocol::club::v1::MemberId* mutable_agent_id(); + inline ::bgs::protocol::club::v1::MemberId* release_agent_id(); + inline void set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id); + + // optional uint64 club_id = 2; + inline bool has_club_id() const; + inline void clear_club_id(); + static const int kClubIdFieldNumber = 2; + inline ::google::protobuf::uint64 club_id() const; + inline void set_club_id(::google::protobuf::uint64 value); + + // optional uint64 stream_id = 3; + inline bool has_stream_id() const; + inline void clear_stream_id(); + static const int kStreamIdFieldNumber = 3; + inline ::google::protobuf::uint64 stream_id() const; + inline void set_stream_id(::google::protobuf::uint64 value); + + // optional .bgs.protocol.MessageId message_id = 4; + inline bool has_message_id() const; + inline void clear_message_id(); + static const int kMessageIdFieldNumber = 4; + inline const ::bgs::protocol::MessageId& message_id() const; + inline ::bgs::protocol::MessageId* mutable_message_id(); + inline ::bgs::protocol::MessageId* release_message_id(); + inline void set_allocated_message_id(::bgs::protocol::MessageId* message_id); + + // @@protoc_insertion_point(class_scope:bgs.protocol.club.v1.GetStreamMessageRequest) + private: + inline void set_has_agent_id(); + inline void clear_has_agent_id(); + inline void set_has_club_id(); + inline void clear_has_club_id(); + inline void set_has_stream_id(); + inline void clear_has_stream_id(); + inline void set_has_message_id(); + inline void clear_has_message_id(); + + ::google::protobuf::UnknownFieldSet _unknown_fields_; + + ::google::protobuf::uint32 _has_bits_[1]; + mutable int _cached_size_; + ::bgs::protocol::club::v1::MemberId* agent_id_; + ::google::protobuf::uint64 club_id_; + ::google::protobuf::uint64 stream_id_; + ::bgs::protocol::MessageId* message_id_; + friend void TC_PROTO_API protobuf_AddDesc_club_5frequest_2eproto(); + friend void protobuf_AssignDesc_club_5frequest_2eproto(); + friend void protobuf_ShutdownFile_club_5frequest_2eproto(); + + void InitAsDefaultInstance(); + static GetStreamMessageRequest* default_instance_; +}; +// ------------------------------------------------------------------- + +class TC_PROTO_API GetStreamMessageResponse : public ::google::protobuf::Message { + public: + GetStreamMessageResponse(); + virtual ~GetStreamMessageResponse(); + + GetStreamMessageResponse(const GetStreamMessageResponse& from); + + inline GetStreamMessageResponse& operator=(const GetStreamMessageResponse& from) { + CopyFrom(from); + return *this; + } + + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); + static const GetStreamMessageResponse& default_instance(); + + void Swap(GetStreamMessageResponse* other); + + // implements Message ---------------------------------------------- + + GetStreamMessageResponse* New() const; + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); + void CopyFrom(const GetStreamMessageResponse& from); + void MergeFrom(const GetStreamMessageResponse& from); + void Clear(); + bool IsInitialized() const; + + int ByteSize() const; + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input); + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; + int GetCachedSize() const { return _cached_size_; } + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const; + public: + ::google::protobuf::Metadata GetMetadata() const; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // optional .bgs.protocol.club.v1.StreamMessage message = 1; + inline bool has_message() const; + inline void clear_message(); + static const int kMessageFieldNumber = 1; + inline const ::bgs::protocol::club::v1::StreamMessage& message() const; + inline ::bgs::protocol::club::v1::StreamMessage* mutable_message(); + inline ::bgs::protocol::club::v1::StreamMessage* release_message(); + inline void set_allocated_message(::bgs::protocol::club::v1::StreamMessage* message); + + // @@protoc_insertion_point(class_scope:bgs.protocol.club.v1.GetStreamMessageResponse) + private: + inline void set_has_message(); + inline void clear_has_message(); + + ::google::protobuf::UnknownFieldSet _unknown_fields_; + + ::google::protobuf::uint32 _has_bits_[1]; + mutable int _cached_size_; + ::bgs::protocol::club::v1::StreamMessage* message_; + friend void TC_PROTO_API protobuf_AddDesc_club_5frequest_2eproto(); + friend void protobuf_AssignDesc_club_5frequest_2eproto(); + friend void protobuf_ShutdownFile_club_5frequest_2eproto(); + + void InitAsDefaultInstance(); + static GetStreamMessageResponse* default_instance_; +}; +// ------------------------------------------------------------------- + class TC_PROTO_API GetClubActivityRequest : public ::google::protobuf::Message { public: GetClubActivityRequest(); @@ -9670,45 +9956,45 @@ inline void AssignRoleRequest::set_club_id(::google::protobuf::uint64 value) { // @@protoc_insertion_point(field_set:bgs.protocol.club.v1.AssignRoleRequest.club_id) } -// optional .bgs.protocol.club.v1.RoleAssignment assignment = 3; -inline bool AssignRoleRequest::has_assignment() const { +// optional .bgs.protocol.club.v1.RoleOptions options = 3; +inline bool AssignRoleRequest::has_options() const { return (_has_bits_[0] & 0x00000004u) != 0; } -inline void AssignRoleRequest::set_has_assignment() { +inline void AssignRoleRequest::set_has_options() { _has_bits_[0] |= 0x00000004u; } -inline void AssignRoleRequest::clear_has_assignment() { +inline void AssignRoleRequest::clear_has_options() { _has_bits_[0] &= ~0x00000004u; } -inline void AssignRoleRequest::clear_assignment() { - if (assignment_ != NULL) assignment_->::bgs::protocol::club::v1::RoleAssignment::Clear(); - clear_has_assignment(); +inline void AssignRoleRequest::clear_options() { + if (options_ != NULL) options_->::bgs::protocol::club::v1::RoleOptions::Clear(); + clear_has_options(); } -inline const ::bgs::protocol::club::v1::RoleAssignment& AssignRoleRequest::assignment() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.AssignRoleRequest.assignment) - return assignment_ != NULL ? *assignment_ : *default_instance_->assignment_; +inline const ::bgs::protocol::club::v1::RoleOptions& AssignRoleRequest::options() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.AssignRoleRequest.options) + return options_ != NULL ? *options_ : *default_instance_->options_; } -inline ::bgs::protocol::club::v1::RoleAssignment* AssignRoleRequest::mutable_assignment() { - set_has_assignment(); - if (assignment_ == NULL) assignment_ = new ::bgs::protocol::club::v1::RoleAssignment; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.AssignRoleRequest.assignment) - return assignment_; +inline ::bgs::protocol::club::v1::RoleOptions* AssignRoleRequest::mutable_options() { + set_has_options(); + if (options_ == NULL) options_ = new ::bgs::protocol::club::v1::RoleOptions; + // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.AssignRoleRequest.options) + return options_; } -inline ::bgs::protocol::club::v1::RoleAssignment* AssignRoleRequest::release_assignment() { - clear_has_assignment(); - ::bgs::protocol::club::v1::RoleAssignment* temp = assignment_; - assignment_ = NULL; +inline ::bgs::protocol::club::v1::RoleOptions* AssignRoleRequest::release_options() { + clear_has_options(); + ::bgs::protocol::club::v1::RoleOptions* temp = options_; + options_ = NULL; return temp; } -inline void AssignRoleRequest::set_allocated_assignment(::bgs::protocol::club::v1::RoleAssignment* assignment) { - delete assignment_; - assignment_ = assignment; - if (assignment) { - set_has_assignment(); +inline void AssignRoleRequest::set_allocated_options(::bgs::protocol::club::v1::RoleOptions* options) { + delete options_; + options_ = options; + if (options) { + set_has_options(); } else { - clear_has_assignment(); + clear_has_options(); } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.AssignRoleRequest.assignment) + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.AssignRoleRequest.options) } // ------------------------------------------------------------------- @@ -9780,45 +10066,45 @@ inline void UnassignRoleRequest::set_club_id(::google::protobuf::uint64 value) { // @@protoc_insertion_point(field_set:bgs.protocol.club.v1.UnassignRoleRequest.club_id) } -// optional .bgs.protocol.club.v1.RoleAssignment assignment = 3; -inline bool UnassignRoleRequest::has_assignment() const { +// optional .bgs.protocol.club.v1.RoleOptions options = 3; +inline bool UnassignRoleRequest::has_options() const { return (_has_bits_[0] & 0x00000004u) != 0; } -inline void UnassignRoleRequest::set_has_assignment() { +inline void UnassignRoleRequest::set_has_options() { _has_bits_[0] |= 0x00000004u; } -inline void UnassignRoleRequest::clear_has_assignment() { +inline void UnassignRoleRequest::clear_has_options() { _has_bits_[0] &= ~0x00000004u; } -inline void UnassignRoleRequest::clear_assignment() { - if (assignment_ != NULL) assignment_->::bgs::protocol::club::v1::RoleAssignment::Clear(); - clear_has_assignment(); +inline void UnassignRoleRequest::clear_options() { + if (options_ != NULL) options_->::bgs::protocol::club::v1::RoleOptions::Clear(); + clear_has_options(); } -inline const ::bgs::protocol::club::v1::RoleAssignment& UnassignRoleRequest::assignment() const { - // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.UnassignRoleRequest.assignment) - return assignment_ != NULL ? *assignment_ : *default_instance_->assignment_; +inline const ::bgs::protocol::club::v1::RoleOptions& UnassignRoleRequest::options() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.UnassignRoleRequest.options) + return options_ != NULL ? *options_ : *default_instance_->options_; } -inline ::bgs::protocol::club::v1::RoleAssignment* UnassignRoleRequest::mutable_assignment() { - set_has_assignment(); - if (assignment_ == NULL) assignment_ = new ::bgs::protocol::club::v1::RoleAssignment; - // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.UnassignRoleRequest.assignment) - return assignment_; +inline ::bgs::protocol::club::v1::RoleOptions* UnassignRoleRequest::mutable_options() { + set_has_options(); + if (options_ == NULL) options_ = new ::bgs::protocol::club::v1::RoleOptions; + // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.UnassignRoleRequest.options) + return options_; } -inline ::bgs::protocol::club::v1::RoleAssignment* UnassignRoleRequest::release_assignment() { - clear_has_assignment(); - ::bgs::protocol::club::v1::RoleAssignment* temp = assignment_; - assignment_ = NULL; +inline ::bgs::protocol::club::v1::RoleOptions* UnassignRoleRequest::release_options() { + clear_has_options(); + ::bgs::protocol::club::v1::RoleOptions* temp = options_; + options_ = NULL; return temp; } -inline void UnassignRoleRequest::set_allocated_assignment(::bgs::protocol::club::v1::RoleAssignment* assignment) { - delete assignment_; - assignment_ = assignment; - if (assignment) { - set_has_assignment(); +inline void UnassignRoleRequest::set_allocated_options(::bgs::protocol::club::v1::RoleOptions* options) { + delete options_; + options_ = options; + if (options) { + set_has_options(); } else { - clear_has_assignment(); + clear_has_options(); } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.UnassignRoleRequest.assignment) + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.UnassignRoleRequest.options) } // ------------------------------------------------------------------- @@ -12658,6 +12944,58 @@ inline void CreateStreamRequest::set_allocated_options(::bgs::protocol::club::v1 // ------------------------------------------------------------------- +// CreateStreamResponse + +// optional uint64 club_id = 1; +inline bool CreateStreamResponse::has_club_id() const { + return (_has_bits_[0] & 0x00000001u) != 0; +} +inline void CreateStreamResponse::set_has_club_id() { + _has_bits_[0] |= 0x00000001u; +} +inline void CreateStreamResponse::clear_has_club_id() { + _has_bits_[0] &= ~0x00000001u; +} +inline void CreateStreamResponse::clear_club_id() { + club_id_ = GOOGLE_ULONGLONG(0); + clear_has_club_id(); +} +inline ::google::protobuf::uint64 CreateStreamResponse::club_id() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.CreateStreamResponse.club_id) + return club_id_; +} +inline void CreateStreamResponse::set_club_id(::google::protobuf::uint64 value) { + set_has_club_id(); + club_id_ = value; + // @@protoc_insertion_point(field_set:bgs.protocol.club.v1.CreateStreamResponse.club_id) +} + +// optional uint64 stream_id = 2; +inline bool CreateStreamResponse::has_stream_id() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +inline void CreateStreamResponse::set_has_stream_id() { + _has_bits_[0] |= 0x00000002u; +} +inline void CreateStreamResponse::clear_has_stream_id() { + _has_bits_[0] &= ~0x00000002u; +} +inline void CreateStreamResponse::clear_stream_id() { + stream_id_ = GOOGLE_ULONGLONG(0); + clear_has_stream_id(); +} +inline ::google::protobuf::uint64 CreateStreamResponse::stream_id() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.CreateStreamResponse.stream_id) + return stream_id_; +} +inline void CreateStreamResponse::set_stream_id(::google::protobuf::uint64 value) { + set_has_stream_id(); + stream_id_ = value; + // @@protoc_insertion_point(field_set:bgs.protocol.club.v1.CreateStreamResponse.stream_id) +} + +// ------------------------------------------------------------------- + // DestroyStreamRequest // optional .bgs.protocol.club.v1.MemberId agent_id = 1; @@ -14587,6 +14925,185 @@ inline void GetStreamHistoryResponse::set_continuation(::google::protobuf::uint6 // ------------------------------------------------------------------- +// GetStreamMessageRequest + +// optional .bgs.protocol.club.v1.MemberId agent_id = 1; +inline bool GetStreamMessageRequest::has_agent_id() const { + return (_has_bits_[0] & 0x00000001u) != 0; +} +inline void GetStreamMessageRequest::set_has_agent_id() { + _has_bits_[0] |= 0x00000001u; +} +inline void GetStreamMessageRequest::clear_has_agent_id() { + _has_bits_[0] &= ~0x00000001u; +} +inline void GetStreamMessageRequest::clear_agent_id() { + if (agent_id_ != NULL) agent_id_->::bgs::protocol::club::v1::MemberId::Clear(); + clear_has_agent_id(); +} +inline const ::bgs::protocol::club::v1::MemberId& GetStreamMessageRequest::agent_id() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.GetStreamMessageRequest.agent_id) + return agent_id_ != NULL ? *agent_id_ : *default_instance_->agent_id_; +} +inline ::bgs::protocol::club::v1::MemberId* GetStreamMessageRequest::mutable_agent_id() { + set_has_agent_id(); + if (agent_id_ == NULL) agent_id_ = new ::bgs::protocol::club::v1::MemberId; + // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.GetStreamMessageRequest.agent_id) + return agent_id_; +} +inline ::bgs::protocol::club::v1::MemberId* GetStreamMessageRequest::release_agent_id() { + clear_has_agent_id(); + ::bgs::protocol::club::v1::MemberId* temp = agent_id_; + agent_id_ = NULL; + return temp; +} +inline void GetStreamMessageRequest::set_allocated_agent_id(::bgs::protocol::club::v1::MemberId* agent_id) { + delete agent_id_; + agent_id_ = agent_id; + if (agent_id) { + set_has_agent_id(); + } else { + clear_has_agent_id(); + } + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.GetStreamMessageRequest.agent_id) +} + +// optional uint64 club_id = 2; +inline bool GetStreamMessageRequest::has_club_id() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +inline void GetStreamMessageRequest::set_has_club_id() { + _has_bits_[0] |= 0x00000002u; +} +inline void GetStreamMessageRequest::clear_has_club_id() { + _has_bits_[0] &= ~0x00000002u; +} +inline void GetStreamMessageRequest::clear_club_id() { + club_id_ = GOOGLE_ULONGLONG(0); + clear_has_club_id(); +} +inline ::google::protobuf::uint64 GetStreamMessageRequest::club_id() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.GetStreamMessageRequest.club_id) + return club_id_; +} +inline void GetStreamMessageRequest::set_club_id(::google::protobuf::uint64 value) { + set_has_club_id(); + club_id_ = value; + // @@protoc_insertion_point(field_set:bgs.protocol.club.v1.GetStreamMessageRequest.club_id) +} + +// optional uint64 stream_id = 3; +inline bool GetStreamMessageRequest::has_stream_id() const { + return (_has_bits_[0] & 0x00000004u) != 0; +} +inline void GetStreamMessageRequest::set_has_stream_id() { + _has_bits_[0] |= 0x00000004u; +} +inline void GetStreamMessageRequest::clear_has_stream_id() { + _has_bits_[0] &= ~0x00000004u; +} +inline void GetStreamMessageRequest::clear_stream_id() { + stream_id_ = GOOGLE_ULONGLONG(0); + clear_has_stream_id(); +} +inline ::google::protobuf::uint64 GetStreamMessageRequest::stream_id() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.GetStreamMessageRequest.stream_id) + return stream_id_; +} +inline void GetStreamMessageRequest::set_stream_id(::google::protobuf::uint64 value) { + set_has_stream_id(); + stream_id_ = value; + // @@protoc_insertion_point(field_set:bgs.protocol.club.v1.GetStreamMessageRequest.stream_id) +} + +// optional .bgs.protocol.MessageId message_id = 4; +inline bool GetStreamMessageRequest::has_message_id() const { + return (_has_bits_[0] & 0x00000008u) != 0; +} +inline void GetStreamMessageRequest::set_has_message_id() { + _has_bits_[0] |= 0x00000008u; +} +inline void GetStreamMessageRequest::clear_has_message_id() { + _has_bits_[0] &= ~0x00000008u; +} +inline void GetStreamMessageRequest::clear_message_id() { + if (message_id_ != NULL) message_id_->::bgs::protocol::MessageId::Clear(); + clear_has_message_id(); +} +inline const ::bgs::protocol::MessageId& GetStreamMessageRequest::message_id() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.GetStreamMessageRequest.message_id) + return message_id_ != NULL ? *message_id_ : *default_instance_->message_id_; +} +inline ::bgs::protocol::MessageId* GetStreamMessageRequest::mutable_message_id() { + set_has_message_id(); + if (message_id_ == NULL) message_id_ = new ::bgs::protocol::MessageId; + // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.GetStreamMessageRequest.message_id) + return message_id_; +} +inline ::bgs::protocol::MessageId* GetStreamMessageRequest::release_message_id() { + clear_has_message_id(); + ::bgs::protocol::MessageId* temp = message_id_; + message_id_ = NULL; + return temp; +} +inline void GetStreamMessageRequest::set_allocated_message_id(::bgs::protocol::MessageId* message_id) { + delete message_id_; + message_id_ = message_id; + if (message_id) { + set_has_message_id(); + } else { + clear_has_message_id(); + } + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.GetStreamMessageRequest.message_id) +} + +// ------------------------------------------------------------------- + +// GetStreamMessageResponse + +// optional .bgs.protocol.club.v1.StreamMessage message = 1; +inline bool GetStreamMessageResponse::has_message() const { + return (_has_bits_[0] & 0x00000001u) != 0; +} +inline void GetStreamMessageResponse::set_has_message() { + _has_bits_[0] |= 0x00000001u; +} +inline void GetStreamMessageResponse::clear_has_message() { + _has_bits_[0] &= ~0x00000001u; +} +inline void GetStreamMessageResponse::clear_message() { + if (message_ != NULL) message_->::bgs::protocol::club::v1::StreamMessage::Clear(); + clear_has_message(); +} +inline const ::bgs::protocol::club::v1::StreamMessage& GetStreamMessageResponse::message() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.GetStreamMessageResponse.message) + return message_ != NULL ? *message_ : *default_instance_->message_; +} +inline ::bgs::protocol::club::v1::StreamMessage* GetStreamMessageResponse::mutable_message() { + set_has_message(); + if (message_ == NULL) message_ = new ::bgs::protocol::club::v1::StreamMessage; + // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.GetStreamMessageResponse.message) + return message_; +} +inline ::bgs::protocol::club::v1::StreamMessage* GetStreamMessageResponse::release_message() { + clear_has_message(); + ::bgs::protocol::club::v1::StreamMessage* temp = message_; + message_ = NULL; + return temp; +} +inline void GetStreamMessageResponse::set_allocated_message(::bgs::protocol::club::v1::StreamMessage* message) { + delete message_; + message_ = message; + if (message) { + set_has_message(); + } else { + clear_has_message(); + } + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.GetStreamMessageResponse.message) +} + +// ------------------------------------------------------------------- + // GetClubActivityRequest // optional .bgs.protocol.club.v1.MemberId agent_id = 1; diff --git a/src/server/proto/Client/club_role.pb.cc b/src/server/proto/Client/club_role.pb.cc index 538765634c8..6b1dadf90e6 100644 --- a/src/server/proto/Client/club_role.pb.cc +++ b/src/server/proto/Client/club_role.pb.cc @@ -45,7 +45,7 @@ void protobuf_AssignDesc_club_5frole_2eproto() { "club_role.proto"); GOOGLE_CHECK(file != NULL); ClubPrivilegeSet_descriptor_ = file->message_type(0); - static const int ClubPrivilegeSet_offsets_[47] = { + static const int ClubPrivilegeSet_offsets_[48] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubPrivilegeSet, can_destroy_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubPrivilegeSet, can_set_attribute_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubPrivilegeSet, can_set_name_), @@ -93,6 +93,7 @@ void protobuf_AssignDesc_club_5frole_2eproto() { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubPrivilegeSet, can_mention_all_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubPrivilegeSet, can_mention_here_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubPrivilegeSet, can_mention_member_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClubPrivilegeSet, can_mention_role_), }; ClubPrivilegeSet_reflection_ = new ::google::protobuf::internal::GeneratedMessageReflection( @@ -182,7 +183,7 @@ void protobuf_AddDesc_club_5frole_2eproto() { ::bgs::protocol::protobuf_AddDesc_role_5ftypes_2eproto(); ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( "\n\017club_role.proto\022\024bgs.protocol.club.v1\032" - "\020role_types.proto\"\224\013\n\020ClubPrivilegeSet\022\023" + "\020role_types.proto\"\257\013\n\020ClubPrivilegeSet\022\023" "\n\013can_destroy\030\001 \001(\010\022\031\n\021can_set_attribute" "\030\n \001(\010\022\024\n\014can_set_name\030\013 \001(\010\022\033\n\023can_set_" "description\030\014 \001(\010\022\026\n\016can_set_avatar\030\r \001(" @@ -218,15 +219,16 @@ void protobuf_AddDesc_club_5frole_2eproto() { "t_own_message\030\267\001 \001(\010\022\030\n\017can_pin_message\030" "\270\001 \001(\010\022\030\n\017can_mention_all\030\271\001 \001(\010\022\031\n\020can_" "mention_here\030\272\001 \001(\010\022\033\n\022can_mention_membe" - "r\030\273\001 \001(\010\"\271\001\n\010ClubRole\022\n\n\002id\030\001 \001(\r\022&\n\005sta" - "te\030\002 \001(\0132\027.bgs.protocol.RoleState\0229\n\tpri" - "vilege\030\003 \001(\0132&.bgs.protocol.club.v1.Club" - "PrivilegeSet\022\"\n\032always_grant_stream_acce" - "ss\030\004 \001(\010\022\032\n\022allow_in_club_slot\030\005 \001(\010\"\224\001\n" - "\013ClubRoleSet\022,\n\004role\030\001 \003(\0132\036.bgs.protoco" - "l.club.v1.ClubRole\022\030\n\014default_role\030\005 \003(\r" - "B\002\020\001\022,\n$assignment_respects_relegation_c" - "hain\030\006 \001(\010\022\017\n\007subtype\030\007 \001(\tB\002H\001", 1831); + "r\030\273\001 \001(\010\022\031\n\020can_mention_role\030\274\001 \001(\010\"\271\001\n\010" + "ClubRole\022\n\n\002id\030\001 \001(\r\022&\n\005state\030\002 \001(\0132\027.bg" + "s.protocol.RoleState\0229\n\tprivilege\030\003 \001(\0132" + "&.bgs.protocol.club.v1.ClubPrivilegeSet\022" + "\"\n\032always_grant_stream_access\030\004 \001(\010\022\032\n\022a" + "llow_in_club_slot\030\005 \001(\010\"\224\001\n\013ClubRoleSet\022" + ",\n\004role\030\001 \003(\0132\036.bgs.protocol.club.v1.Clu" + "bRole\022\030\n\014default_role\030\005 \003(\rB\002\020\001\022,\n$assig" + "nment_respects_relegation_chain\030\006 \001(\010\022\017\n" + "\007subtype\030\007 \001(\tB\002H\001", 1858); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "club_role.proto", &protobuf_RegisterTypes); ClubPrivilegeSet::default_instance_ = new ClubPrivilegeSet(); @@ -295,6 +297,7 @@ const int ClubPrivilegeSet::kCanPinMessageFieldNumber; const int ClubPrivilegeSet::kCanMentionAllFieldNumber; const int ClubPrivilegeSet::kCanMentionHereFieldNumber; const int ClubPrivilegeSet::kCanMentionMemberFieldNumber; +const int ClubPrivilegeSet::kCanMentionRoleFieldNumber; #endif // !_MSC_VER ClubPrivilegeSet::ClubPrivilegeSet() @@ -362,6 +365,7 @@ void ClubPrivilegeSet::SharedCtor() { can_mention_all_ = false; can_mention_here_ = false; can_mention_member_ = false; + can_mention_role_ = false; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -422,8 +426,8 @@ void ClubPrivilegeSet::Clear() { if (_has_bits_[32 / 32] & 255) { ZR_(can_destroy_stream_, can_create_message_); } - if (_has_bits_[40 / 32] & 32512) { - ZR_(can_destroy_own_message_, can_mention_member_); + if (_has_bits_[40 / 32] & 65280) { + ZR_(can_destroy_own_message_, can_mention_role_); } #undef OFFSET_OF_FIELD_ @@ -1143,6 +1147,21 @@ bool ClubPrivilegeSet::MergePartialFromCodedStream( } else { goto handle_unusual; } + if (input->ExpectTag(1504)) goto parse_can_mention_role; + break; + } + + // optional bool can_mention_role = 188; + case 188: { + if (tag == 1504) { + parse_can_mention_role: + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( + input, &can_mention_role_))); + set_has_can_mention_role(); + } else { + goto handle_unusual; + } if (input->ExpectAtEnd()) goto success; break; } @@ -1407,6 +1426,11 @@ void ClubPrivilegeSet::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteBool(187, this->can_mention_member(), output); } + // optional bool can_mention_role = 188; + if (has_can_mention_role()) { + ::google::protobuf::internal::WireFormatLite::WriteBool(188, this->can_mention_role(), output); + } + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -1652,6 +1676,11 @@ void ClubPrivilegeSet::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(187, this->can_mention_member(), target); } + // optional bool can_mention_role = 188; + if (has_can_mention_role()) { + target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(188, this->can_mention_role(), target); + } + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -1909,6 +1938,11 @@ int ClubPrivilegeSet::ByteSize() const { total_size += 2 + 1; } + // optional bool can_mention_role = 188; + if (has_can_mention_role()) { + total_size += 2 + 1; + } + } if (!unknown_fields().empty()) { total_size += @@ -2087,6 +2121,9 @@ void ClubPrivilegeSet::MergeFrom(const ClubPrivilegeSet& from) { if (from.has_can_mention_member()) { set_can_mention_member(from.can_mention_member()); } + if (from.has_can_mention_role()) { + set_can_mention_role(from.can_mention_role()); + } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); } @@ -2157,6 +2194,7 @@ void ClubPrivilegeSet::Swap(ClubPrivilegeSet* other) { std::swap(can_mention_all_, other->can_mention_all_); std::swap(can_mention_here_, other->can_mention_here_); std::swap(can_mention_member_, other->can_mention_member_); + std::swap(can_mention_role_, other->can_mention_role_); std::swap(_has_bits_[0], other->_has_bits_[0]); std::swap(_has_bits_[1], other->_has_bits_[1]); _unknown_fields_.Swap(&other->_unknown_fields_); diff --git a/src/server/proto/Client/club_role.pb.h b/src/server/proto/Client/club_role.pb.h index e40c1660108..8808af111de 100644 --- a/src/server/proto/Client/club_role.pb.h +++ b/src/server/proto/Client/club_role.pb.h @@ -426,6 +426,13 @@ class TC_PROTO_API ClubPrivilegeSet : public ::google::protobuf::Message { inline bool can_mention_member() const; inline void set_can_mention_member(bool value); + // optional bool can_mention_role = 188; + inline bool has_can_mention_role() const; + inline void clear_can_mention_role(); + static const int kCanMentionRoleFieldNumber = 188; + inline bool can_mention_role() const; + inline void set_can_mention_role(bool value); + // @@protoc_insertion_point(class_scope:bgs.protocol.club.v1.ClubPrivilegeSet) private: inline void set_has_can_destroy(); @@ -522,6 +529,8 @@ class TC_PROTO_API ClubPrivilegeSet : public ::google::protobuf::Message { inline void clear_has_can_mention_here(); inline void set_has_can_mention_member(); inline void clear_has_can_mention_member(); + inline void set_has_can_mention_role(); + inline void clear_has_can_mention_role(); ::google::protobuf::UnknownFieldSet _unknown_fields_; @@ -573,6 +582,7 @@ class TC_PROTO_API ClubPrivilegeSet : public ::google::protobuf::Message { bool can_mention_all_; bool can_mention_here_; bool can_mention_member_; + bool can_mention_role_; mutable int _cached_size_; friend void TC_PROTO_API protobuf_AddDesc_club_5frole_2eproto(); friend void protobuf_AssignDesc_club_5frole_2eproto(); @@ -1963,6 +1973,30 @@ inline void ClubPrivilegeSet::set_can_mention_member(bool value) { // @@protoc_insertion_point(field_set:bgs.protocol.club.v1.ClubPrivilegeSet.can_mention_member) } +// optional bool can_mention_role = 188; +inline bool ClubPrivilegeSet::has_can_mention_role() const { + return (_has_bits_[1] & 0x00008000u) != 0; +} +inline void ClubPrivilegeSet::set_has_can_mention_role() { + _has_bits_[1] |= 0x00008000u; +} +inline void ClubPrivilegeSet::clear_has_can_mention_role() { + _has_bits_[1] &= ~0x00008000u; +} +inline void ClubPrivilegeSet::clear_can_mention_role() { + can_mention_role_ = false; + clear_has_can_mention_role(); +} +inline bool ClubPrivilegeSet::can_mention_role() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.ClubPrivilegeSet.can_mention_role) + return can_mention_role_; +} +inline void ClubPrivilegeSet::set_can_mention_role(bool value) { + set_has_can_mention_role(); + can_mention_role_ = value; + // @@protoc_insertion_point(field_set:bgs.protocol.club.v1.ClubPrivilegeSet.can_mention_role) +} + // ------------------------------------------------------------------- // ClubRole diff --git a/src/server/proto/Client/club_stream.pb.cc b/src/server/proto/Client/club_stream.pb.cc index 6a270d05ad3..18a16b0eeb6 100644 --- a/src/server/proto/Client/club_stream.pb.cc +++ b/src/server/proto/Client/club_stream.pb.cc @@ -245,7 +245,7 @@ void protobuf_AssignDesc_club_5fstream_2eproto() { ::google::protobuf::MessageFactory::generated_factory(), sizeof(StreamMessage)); StreamMention_descriptor_ = file->message_type(9); - static const int StreamMention_offsets_[7] = { + static const int StreamMention_offsets_[8] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMention, club_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMention, stream_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMention, message_id_), @@ -253,6 +253,7 @@ void protobuf_AssignDesc_club_5fstream_2eproto() { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMention, destroyed_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMention, mention_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMention, member_id_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamMention, message_), }; StreamMention_reflection_ = new ::google::protobuf::internal::GeneratedMessageReflection( @@ -525,37 +526,39 @@ void protobuf_AddDesc_club_5fstream_2eproto() { "gs.protocol.club.v1.ContentChain\022:\n\tdest" "royer\030\017 \001(\0132\'.bgs.protocol.club.v1.Membe" "rDescription\022\021\n\tdestroyed\030\020 \001(\010\022\024\n\014destr" - "oy_time\030\021 \001(\004\"\217\002\n\rStreamMention\022\017\n\007club_" + "oy_time\030\021 \001(\004\"\305\002\n\rStreamMention\022\017\n\007club_" "id\030\001 \001(\004\022\021\n\tstream_id\030\002 \001(\004\022+\n\nmessage_i" "d\030\003 \001(\0132\027.bgs.protocol.MessageId\0227\n\006auth" "or\030\004 \001(\0132\'.bgs.protocol.club.v1.MemberDe" "scription\022\021\n\tdestroyed\030\005 \001(\010\022.\n\nmention_" "id\030\006 \001(\0132\032.bgs.protocol.TimeSeriesId\0221\n\t" "member_id\030\007 \001(\0132\036.bgs.protocol.club.v1.M" - "emberId\"Z\n\nStreamView\022\017\n\007club_id\030\001 \001(\004\022\021" - "\n\tstream_id\030\002 \001(\004\022(\n\006marker\030\003 \001(\0132\030.bgs." - "protocol.ViewMarker\"=\n\025StreamAdvanceView" - "Time\022\021\n\tstream_id\030\001 \001(\004\022\021\n\tview_time\030\002 \001" - "(\004\"8\n\017StreamEventTime\022\021\n\tstream_id\030\001 \001(\004" - "\022\022\n\nevent_time\030\002 \001(\004\"a\n\021StreamMentionVie" - "w\022\017\n\007club_id\030\001 \001(\004\022\021\n\tstream_id\030\002 \001(\004\022(\n" - "\006marker\030\003 \001(\0132\030.bgs.protocol.ViewMarker\"" - "\323\001\n\022StreamStateOptions\022-\n\tattribute\030\001 \003(" - "\0132\032.bgs.protocol.v2.Attribute\022\014\n\004name\030\002 " - "\001(\t\022\017\n\007subject\030\003 \001(\t\0222\n\006access\030\004 \001(\0132\".b" - "gs.protocol.club.v1.StreamAccess\022;\n\013voic" - "e_level\030\005 \001(\0162&.bgs.protocol.club.v1.Str" - "eamVoiceLevel\"\216\002\n\025StreamStateAssignment\022" - "\021\n\tstream_id\030\001 \001(\004\022-\n\tattribute\030\002 \003(\0132\032." - "bgs.protocol.v2.Attribute\022\014\n\004name\030\003 \001(\t\022" - "\017\n\007subject\030\004 \001(\t\0222\n\006access\030\005 \001(\0132\".bgs.p" - "rotocol.club.v1.StreamAccess\022#\n\033stream_s" - "ubscription_removed\030\006 \001(\010\022;\n\013voice_level" - "\030\007 \001(\0162&.bgs.protocol.club.v1.StreamVoic" - "eLevel\"\213\001\n\025StreamTypingIndicator\0221\n\tauth" - "or_id\030\001 \001(\0132\036.bgs.protocol.club.v1.Membe" - "rId\0220\n\tindicator\030\002 \001(\0162\035.bgs.protocol.Ty" - "pingIndicator\022\r\n\005epoch\030\003 \001(\004B\002H\001", 2672); + "emberId\0224\n\007message\030\010 \001(\0132#.bgs.protocol." + "club.v1.StreamMessage\"Z\n\nStreamView\022\017\n\007c" + "lub_id\030\001 \001(\004\022\021\n\tstream_id\030\002 \001(\004\022(\n\006marke" + "r\030\003 \001(\0132\030.bgs.protocol.ViewMarker\"=\n\025Str" + "eamAdvanceViewTime\022\021\n\tstream_id\030\001 \001(\004\022\021\n" + "\tview_time\030\002 \001(\004\"8\n\017StreamEventTime\022\021\n\ts" + "tream_id\030\001 \001(\004\022\022\n\nevent_time\030\002 \001(\004\"a\n\021St" + "reamMentionView\022\017\n\007club_id\030\001 \001(\004\022\021\n\tstre" + "am_id\030\002 \001(\004\022(\n\006marker\030\003 \001(\0132\030.bgs.protoc" + "ol.ViewMarker\"\323\001\n\022StreamStateOptions\022-\n\t" + "attribute\030\001 \003(\0132\032.bgs.protocol.v2.Attrib" + "ute\022\014\n\004name\030\002 \001(\t\022\017\n\007subject\030\003 \001(\t\0222\n\006ac" + "cess\030\004 \001(\0132\".bgs.protocol.club.v1.Stream" + "Access\022;\n\013voice_level\030\005 \001(\0162&.bgs.protoc" + "ol.club.v1.StreamVoiceLevel\"\216\002\n\025StreamSt" + "ateAssignment\022\021\n\tstream_id\030\001 \001(\004\022-\n\tattr" + "ibute\030\002 \003(\0132\032.bgs.protocol.v2.Attribute\022" + "\014\n\004name\030\003 \001(\t\022\017\n\007subject\030\004 \001(\t\0222\n\006access" + "\030\005 \001(\0132\".bgs.protocol.club.v1.StreamAcce" + "ss\022#\n\033stream_subscription_removed\030\006 \001(\010\022" + ";\n\013voice_level\030\007 \001(\0162&.bgs.protocol.club" + ".v1.StreamVoiceLevel\"\213\001\n\025StreamTypingInd" + "icator\0221\n\tauthor_id\030\001 \001(\0132\036.bgs.protocol" + ".club.v1.MemberId\0220\n\tindicator\030\002 \001(\0162\035.b" + "gs.protocol.TypingIndicator\022\r\n\005epoch\030\003 \001" + "(\004B\002H\001", 2726); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "club_stream.proto", &protobuf_RegisterTypes); StreamPosition::default_instance_ = new StreamPosition(); @@ -3800,6 +3803,7 @@ const int StreamMention::kAuthorFieldNumber; const int StreamMention::kDestroyedFieldNumber; const int StreamMention::kMentionIdFieldNumber; const int StreamMention::kMemberIdFieldNumber; +const int StreamMention::kMessageFieldNumber; #endif // !_MSC_VER StreamMention::StreamMention() @@ -3813,6 +3817,7 @@ void StreamMention::InitAsDefaultInstance() { author_ = const_cast< ::bgs::protocol::club::v1::MemberDescription*>(&::bgs::protocol::club::v1::MemberDescription::default_instance()); mention_id_ = const_cast< ::bgs::protocol::TimeSeriesId*>(&::bgs::protocol::TimeSeriesId::default_instance()); member_id_ = const_cast< ::bgs::protocol::club::v1::MemberId*>(&::bgs::protocol::club::v1::MemberId::default_instance()); + message_ = const_cast< ::bgs::protocol::club::v1::StreamMessage*>(&::bgs::protocol::club::v1::StreamMessage::default_instance()); } StreamMention::StreamMention(const StreamMention& from) @@ -3831,6 +3836,7 @@ void StreamMention::SharedCtor() { destroyed_ = false; mention_id_ = NULL; member_id_ = NULL; + message_ = NULL; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -3845,6 +3851,7 @@ void StreamMention::SharedDtor() { delete author_; delete mention_id_; delete member_id_; + delete message_; } } @@ -3880,7 +3887,7 @@ void StreamMention::Clear() { ::memset(&first, 0, n); \ } while (0) - if (_has_bits_[0 / 32] & 127) { + if (_has_bits_[0 / 32] & 255) { ZR_(club_id_, stream_id_); if (has_message_id()) { if (message_id_ != NULL) message_id_->::bgs::protocol::MessageId::Clear(); @@ -3895,6 +3902,9 @@ void StreamMention::Clear() { if (has_member_id()) { if (member_id_ != NULL) member_id_->::bgs::protocol::club::v1::MemberId::Clear(); } + if (has_message()) { + if (message_ != NULL) message_->::bgs::protocol::club::v1::StreamMessage::Clear(); + } } #undef OFFSET_OF_FIELD_ @@ -4006,6 +4016,19 @@ bool StreamMention::MergePartialFromCodedStream( } else { goto handle_unusual; } + if (input->ExpectTag(66)) goto parse_message; + break; + } + + // optional .bgs.protocol.club.v1.StreamMessage message = 8; + case 8: { + if (tag == 66) { + parse_message: + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_message())); + } else { + goto handle_unusual; + } if (input->ExpectAtEnd()) goto success; break; } @@ -4074,6 +4097,12 @@ void StreamMention::SerializeWithCachedSizes( 7, this->member_id(), output); } + // optional .bgs.protocol.club.v1.StreamMessage message = 8; + if (has_message()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 8, this->message(), output); + } + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -4127,6 +4156,13 @@ void StreamMention::SerializeWithCachedSizes( 7, this->member_id(), target); } + // optional .bgs.protocol.club.v1.StreamMessage message = 8; + if (has_message()) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 8, this->message(), target); + } + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -4186,6 +4222,13 @@ int StreamMention::ByteSize() const { this->member_id()); } + // optional .bgs.protocol.club.v1.StreamMessage message = 8; + if (has_message()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->message()); + } + } if (!unknown_fields().empty()) { total_size += @@ -4234,6 +4277,9 @@ void StreamMention::MergeFrom(const StreamMention& from) { if (from.has_member_id()) { mutable_member_id()->::bgs::protocol::club::v1::MemberId::MergeFrom(from.member_id()); } + if (from.has_message()) { + mutable_message()->::bgs::protocol::club::v1::StreamMessage::MergeFrom(from.message()); + } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); } @@ -4258,6 +4304,9 @@ bool StreamMention::IsInitialized() const { if (has_member_id()) { if (!this->member_id().IsInitialized()) return false; } + if (has_message()) { + if (!this->message().IsInitialized()) return false; + } return true; } @@ -4270,6 +4319,7 @@ void StreamMention::Swap(StreamMention* other) { std::swap(destroyed_, other->destroyed_); std::swap(mention_id_, other->mention_id_); std::swap(member_id_, other->member_id_); + std::swap(message_, other->message_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); diff --git a/src/server/proto/Client/club_stream.pb.h b/src/server/proto/Client/club_stream.pb.h index bfc00df71f9..8ab586cf55f 100644 --- a/src/server/proto/Client/club_stream.pb.h +++ b/src/server/proto/Client/club_stream.pb.h @@ -1189,6 +1189,15 @@ class TC_PROTO_API StreamMention : public ::google::protobuf::Message { inline ::bgs::protocol::club::v1::MemberId* release_member_id(); inline void set_allocated_member_id(::bgs::protocol::club::v1::MemberId* member_id); + // optional .bgs.protocol.club.v1.StreamMessage message = 8; + inline bool has_message() const; + inline void clear_message(); + static const int kMessageFieldNumber = 8; + inline const ::bgs::protocol::club::v1::StreamMessage& message() const; + inline ::bgs::protocol::club::v1::StreamMessage* mutable_message(); + inline ::bgs::protocol::club::v1::StreamMessage* release_message(); + inline void set_allocated_message(::bgs::protocol::club::v1::StreamMessage* message); + // @@protoc_insertion_point(class_scope:bgs.protocol.club.v1.StreamMention) private: inline void set_has_club_id(); @@ -1205,6 +1214,8 @@ class TC_PROTO_API StreamMention : public ::google::protobuf::Message { inline void clear_has_mention_id(); inline void set_has_member_id(); inline void clear_has_member_id(); + inline void set_has_message(); + inline void clear_has_message(); ::google::protobuf::UnknownFieldSet _unknown_fields_; @@ -1216,6 +1227,7 @@ class TC_PROTO_API StreamMention : public ::google::protobuf::Message { ::bgs::protocol::club::v1::MemberDescription* author_; ::bgs::protocol::TimeSeriesId* mention_id_; ::bgs::protocol::club::v1::MemberId* member_id_; + ::bgs::protocol::club::v1::StreamMessage* message_; bool destroyed_; friend void TC_PROTO_API protobuf_AddDesc_club_5fstream_2eproto(); friend void protobuf_AssignDesc_club_5fstream_2eproto(); @@ -3530,6 +3542,47 @@ inline void StreamMention::set_allocated_member_id(::bgs::protocol::club::v1::Me // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.StreamMention.member_id) } +// optional .bgs.protocol.club.v1.StreamMessage message = 8; +inline bool StreamMention::has_message() const { + return (_has_bits_[0] & 0x00000080u) != 0; +} +inline void StreamMention::set_has_message() { + _has_bits_[0] |= 0x00000080u; +} +inline void StreamMention::clear_has_message() { + _has_bits_[0] &= ~0x00000080u; +} +inline void StreamMention::clear_message() { + if (message_ != NULL) message_->::bgs::protocol::club::v1::StreamMessage::Clear(); + clear_has_message(); +} +inline const ::bgs::protocol::club::v1::StreamMessage& StreamMention::message() const { + // @@protoc_insertion_point(field_get:bgs.protocol.club.v1.StreamMention.message) + return message_ != NULL ? *message_ : *default_instance_->message_; +} +inline ::bgs::protocol::club::v1::StreamMessage* StreamMention::mutable_message() { + set_has_message(); + if (message_ == NULL) message_ = new ::bgs::protocol::club::v1::StreamMessage; + // @@protoc_insertion_point(field_mutable:bgs.protocol.club.v1.StreamMention.message) + return message_; +} +inline ::bgs::protocol::club::v1::StreamMessage* StreamMention::release_message() { + clear_has_message(); + ::bgs::protocol::club::v1::StreamMessage* temp = message_; + message_ = NULL; + return temp; +} +inline void StreamMention::set_allocated_message(::bgs::protocol::club::v1::StreamMessage* message) { + delete message_; + message_ = message; + if (message) { + set_has_message(); + } else { + clear_has_message(); + } + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.club.v1.StreamMention.message) +} + // ------------------------------------------------------------------- // StreamView diff --git a/src/server/proto/Client/connection_service.pb.cc b/src/server/proto/Client/connection_service.pb.cc index 107b796205c..c98ae05dee6 100644 --- a/src/server/proto/Client/connection_service.pb.cc +++ b/src/server/proto/Client/connection_service.pb.cc @@ -363,7 +363,7 @@ void protobuf_AddDesc_connection_5fservice_2eproto() { "se\022\014\n\004time\030\001 \001(\006\022\017\n\007payload\030\002 \001(\014\"\'\n\021Dis" "connectRequest\022\022\n\nerror_code\030\001 \002(\r\"<\n\026Di" "sconnectNotification\022\022\n\nerror_code\030\001 \002(\r" - "\022\016\n\006reason\030\002 \001(\t\"\020\n\016EncryptRequest2\361\005\n\021C" + "\022\016\n\006reason\030\002 \001(\t\"\020\n\016EncryptRequest2\375\005\n\021C" "onnectionService\022j\n\007Connect\022*.bgs.protoc" "ol.connection.v1.ConnectRequest\032+.bgs.pr" "otocol.connection.v1.ConnectResponse\"\006\202\371" @@ -381,10 +381,10 @@ void protobuf_AddDesc_connection_5fservice_2eproto() { "gs.protocol.NoData\"\t\210\002\001\202\371+\002\010\006\022e\n\021Request" "Disconnect\022-.bgs.protocol.connection.v1." "DisconnectRequest\032\031.bgs.protocol.NO_RESP" - "ONSE\"\006\202\371+\002\010\007\0328\202\371+,\n*bnet.protocol.connec" - "tion.ConnectionService\212\371+\004\010\001\020\001B=\n\033bnet.p" - "rotocol.connection.v1B\026ConnectionService" - "ProtoH\001\200\001\000\210\001\001", 2293); + "ONSE\"\006\202\371+\002\010\007\032D\202\371+8\n*bnet.protocol.connec" + "tion.ConnectionService*\nconnection\212\371+\004\010\001" + "\020\001B=\n\033bnet.protocol.connection.v1B\026Conne" + "ctionServiceProtoH\001\200\001\000\210\001\001", 2305); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "connection_service.proto", &protobuf_RegisterTypes); ConnectRequest::default_instance_ = new ConnectRequest(); diff --git a/src/server/proto/Client/embed_types.pb.cc b/src/server/proto/Client/embed_types.pb.cc index 01733db2093..fd4ed159bd2 100644 --- a/src/server/proto/Client/embed_types.pb.cc +++ b/src/server/proto/Client/embed_types.pb.cc @@ -29,6 +29,12 @@ const ::google::protobuf::internal::GeneratedMessageReflection* const ::google::protobuf::Descriptor* Provider_descriptor_ = NULL; const ::google::protobuf::internal::GeneratedMessageReflection* Provider_reflection_ = NULL; +const ::google::protobuf::Descriptor* Favicon_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + Favicon_reflection_ = NULL; +const ::google::protobuf::Descriptor* EmbedHTML_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + EmbedHTML_reflection_ = NULL; const ::google::protobuf::Descriptor* EmbedInfo_descriptor_ = NULL; const ::google::protobuf::internal::GeneratedMessageReflection* EmbedInfo_reflection_ = NULL; @@ -74,14 +80,48 @@ void protobuf_AssignDesc_embed_5ftypes_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(Provider)); - EmbedInfo_descriptor_ = file->message_type(2); - static const int EmbedInfo_offsets_[6] = { + Favicon_descriptor_ = file->message_type(2); + static const int Favicon_offsets_[1] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Favicon, url_), + }; + Favicon_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + Favicon_descriptor_, + Favicon::default_instance_, + Favicon_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Favicon, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Favicon, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(Favicon)); + EmbedHTML_descriptor_ = file->message_type(3); + static const int EmbedHTML_offsets_[3] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EmbedHTML, content_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EmbedHTML, width_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EmbedHTML, height_), + }; + EmbedHTML_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + EmbedHTML_descriptor_, + EmbedHTML::default_instance_, + EmbedHTML_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EmbedHTML, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EmbedHTML, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(EmbedHTML)); + EmbedInfo_descriptor_ = file->message_type(4); + static const int EmbedInfo_offsets_[8] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EmbedInfo, title_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EmbedInfo, type_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EmbedInfo, original_url_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EmbedInfo, thumbnail_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EmbedInfo, provider_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EmbedInfo, description_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EmbedInfo, favicon_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EmbedInfo, html_), }; EmbedInfo_reflection_ = new ::google::protobuf::internal::GeneratedMessageReflection( @@ -111,6 +151,10 @@ void protobuf_RegisterTypes(const ::std::string&) { ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( Provider_descriptor_, &Provider::default_instance()); ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + Favicon_descriptor_, &Favicon::default_instance()); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + EmbedHTML_descriptor_, &EmbedHTML::default_instance()); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( EmbedInfo_descriptor_, &EmbedInfo::default_instance()); } @@ -121,6 +165,10 @@ void protobuf_ShutdownFile_embed_5ftypes_2eproto() { delete EmbedImage_reflection_; delete Provider::default_instance_; delete Provider_reflection_; + delete Favicon::default_instance_; + delete Favicon_reflection_; + delete EmbedHTML::default_instance_; + delete EmbedHTML_reflection_; delete EmbedInfo::default_instance_; delete EmbedInfo_reflection_; } @@ -134,19 +182,27 @@ void protobuf_AddDesc_embed_5ftypes_2eproto() { ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( "\n\021embed_types.proto\022\014bgs.protocol\"8\n\nEmb" "edImage\022\013\n\003url\030\001 \001(\t\022\r\n\005width\030\002 \001(\r\022\016\n\006h" - "eight\030\003 \001(\r\"\030\n\010Provider\022\014\n\004name\030\001 \001(\t\"\252\001" - "\n\tEmbedInfo\022\r\n\005title\030\001 \001(\t\022\014\n\004type\030\002 \001(\t" - "\022\024\n\014original_url\030\003 \001(\t\022+\n\tthumbnail\030\004 \001(" - "\0132\030.bgs.protocol.EmbedImage\022(\n\010provider\030" - "\005 \001(\0132\026.bgs.protocol.Provider\022\023\n\013descrip" - "tion\030\006 \001(\tB\002H\001", 294); + "eight\030\003 \001(\r\"\030\n\010Provider\022\014\n\004name\030\001 \001(\t\"\026\n" + "\007Favicon\022\013\n\003url\030\001 \001(\t\";\n\tEmbedHTML\022\017\n\007co" + "ntent\030\001 \001(\t\022\r\n\005width\030\002 \001(\r\022\016\n\006height\030\003 \001" + "(\r\"\371\001\n\tEmbedInfo\022\r\n\005title\030\001 \001(\t\022\014\n\004type\030" + "\002 \001(\t\022\024\n\014original_url\030\003 \001(\t\022+\n\tthumbnail" + "\030\004 \001(\0132\030.bgs.protocol.EmbedImage\022(\n\010prov" + "ider\030\005 \001(\0132\026.bgs.protocol.Provider\022\023\n\013de" + "scription\030\006 \001(\t\022&\n\007favicon\030\007 \001(\0132\025.bgs.p" + "rotocol.Favicon\022%\n\004html\030\010 \001(\0132\027.bgs.prot" + "ocol.EmbedHTMLB\002H\001", 458); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "embed_types.proto", &protobuf_RegisterTypes); EmbedImage::default_instance_ = new EmbedImage(); Provider::default_instance_ = new Provider(); + Favicon::default_instance_ = new Favicon(); + EmbedHTML::default_instance_ = new EmbedHTML(); EmbedInfo::default_instance_ = new EmbedInfo(); EmbedImage::default_instance_->InitAsDefaultInstance(); Provider::default_instance_->InitAsDefaultInstance(); + Favicon::default_instance_->InitAsDefaultInstance(); + EmbedHTML::default_instance_->InitAsDefaultInstance(); EmbedInfo::default_instance_->InitAsDefaultInstance(); ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_embed_5ftypes_2eproto); } @@ -740,12 +796,593 @@ void Provider::Swap(Provider* other) { // =================================================================== #ifndef _MSC_VER +const int Favicon::kUrlFieldNumber; +#endif // !_MSC_VER + +Favicon::Favicon() + : ::google::protobuf::Message() { + SharedCtor(); + // @@protoc_insertion_point(constructor:bgs.protocol.Favicon) +} + +void Favicon::InitAsDefaultInstance() { +} + +Favicon::Favicon(const Favicon& from) + : ::google::protobuf::Message() { + SharedCtor(); + MergeFrom(from); + // @@protoc_insertion_point(copy_constructor:bgs.protocol.Favicon) +} + +void Favicon::SharedCtor() { + ::google::protobuf::internal::GetEmptyString(); + _cached_size_ = 0; + url_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + ::memset(_has_bits_, 0, sizeof(_has_bits_)); +} + +Favicon::~Favicon() { + // @@protoc_insertion_point(destructor:bgs.protocol.Favicon) + SharedDtor(); +} + +void Favicon::SharedDtor() { + if (url_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + delete url_; + } + if (this != default_instance_) { + } +} + +void Favicon::SetCachedSize(int size) const { + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); +} +const ::google::protobuf::Descriptor* Favicon::descriptor() { + protobuf_AssignDescriptorsOnce(); + return Favicon_descriptor_; +} + +const Favicon& Favicon::default_instance() { + if (default_instance_ == NULL) protobuf_AddDesc_embed_5ftypes_2eproto(); + return *default_instance_; +} + +Favicon* Favicon::default_instance_ = NULL; + +Favicon* Favicon::New() const { + return new Favicon; +} + +void Favicon::Clear() { + if (has_url()) { + if (url_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + url_->clear(); + } + } + ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); +} + +bool Favicon::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:bgs.protocol.Favicon) + for (;;) { + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // optional string url = 1; + case 1: { + if (tag == 10) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_url())); + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->url().data(), this->url().length(), + ::google::protobuf::internal::WireFormat::PARSE, + "url"); + } else { + goto handle_unusual; + } + if (input->ExpectAtEnd()) goto success; + break; + } + + default: { + handle_unusual: + if (tag == 0 || + ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:bgs.protocol.Favicon) + return true; +failure: + // @@protoc_insertion_point(parse_failure:bgs.protocol.Favicon) + return false; +#undef DO_ +} + +void Favicon::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:bgs.protocol.Favicon) + // optional string url = 1; + if (has_url()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->url().data(), this->url().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "url"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 1, this->url(), output); + } + + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:bgs.protocol.Favicon) +} + +::google::protobuf::uint8* Favicon::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.Favicon) + // optional string url = 1; + if (has_url()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->url().data(), this->url().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "url"); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 1, this->url(), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.Favicon) + return target; +} + +int Favicon::ByteSize() const { + int total_size = 0; + + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { + // optional string url = 1; + if (has_url()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->url()); + } + + } + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = total_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} + +void Favicon::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const Favicon* source = + ::google::protobuf::internal::dynamic_cast_if_available<const Favicon*>( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } +} + +void Favicon::MergeFrom(const Favicon& from) { + GOOGLE_CHECK_NE(&from, this); + if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from.has_url()) { + set_url(from.url()); + } + } + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void Favicon::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void Favicon::CopyFrom(const Favicon& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool Favicon::IsInitialized() const { + + return true; +} + +void Favicon::Swap(Favicon* other) { + if (other != this) { + std::swap(url_, other->url_); + std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); + std::swap(_cached_size_, other->_cached_size_); + } +} + +::google::protobuf::Metadata Favicon::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = Favicon_descriptor_; + metadata.reflection = Favicon_reflection_; + return metadata; +} + + +// =================================================================== + +#ifndef _MSC_VER +const int EmbedHTML::kContentFieldNumber; +const int EmbedHTML::kWidthFieldNumber; +const int EmbedHTML::kHeightFieldNumber; +#endif // !_MSC_VER + +EmbedHTML::EmbedHTML() + : ::google::protobuf::Message() { + SharedCtor(); + // @@protoc_insertion_point(constructor:bgs.protocol.EmbedHTML) +} + +void EmbedHTML::InitAsDefaultInstance() { +} + +EmbedHTML::EmbedHTML(const EmbedHTML& from) + : ::google::protobuf::Message() { + SharedCtor(); + MergeFrom(from); + // @@protoc_insertion_point(copy_constructor:bgs.protocol.EmbedHTML) +} + +void EmbedHTML::SharedCtor() { + ::google::protobuf::internal::GetEmptyString(); + _cached_size_ = 0; + content_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + width_ = 0u; + height_ = 0u; + ::memset(_has_bits_, 0, sizeof(_has_bits_)); +} + +EmbedHTML::~EmbedHTML() { + // @@protoc_insertion_point(destructor:bgs.protocol.EmbedHTML) + SharedDtor(); +} + +void EmbedHTML::SharedDtor() { + if (content_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + delete content_; + } + if (this != default_instance_) { + } +} + +void EmbedHTML::SetCachedSize(int size) const { + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); +} +const ::google::protobuf::Descriptor* EmbedHTML::descriptor() { + protobuf_AssignDescriptorsOnce(); + return EmbedHTML_descriptor_; +} + +const EmbedHTML& EmbedHTML::default_instance() { + if (default_instance_ == NULL) protobuf_AddDesc_embed_5ftypes_2eproto(); + return *default_instance_; +} + +EmbedHTML* EmbedHTML::default_instance_ = NULL; + +EmbedHTML* EmbedHTML::New() const { + return new EmbedHTML; +} + +void EmbedHTML::Clear() { +#define OFFSET_OF_FIELD_(f) (reinterpret_cast<char*>( \ + &reinterpret_cast<EmbedHTML*>(16)->f) - \ + reinterpret_cast<char*>(16)) + +#define ZR_(first, last) do { \ + size_t f = OFFSET_OF_FIELD_(first); \ + size_t n = OFFSET_OF_FIELD_(last) - f + sizeof(last); \ + ::memset(&first, 0, n); \ + } while (0) + + if (_has_bits_[0 / 32] & 7) { + ZR_(width_, height_); + if (has_content()) { + if (content_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + content_->clear(); + } + } + } + +#undef OFFSET_OF_FIELD_ +#undef ZR_ + + ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); +} + +bool EmbedHTML::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:bgs.protocol.EmbedHTML) + for (;;) { + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // optional string content = 1; + case 1: { + if (tag == 10) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_content())); + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->content().data(), this->content().length(), + ::google::protobuf::internal::WireFormat::PARSE, + "content"); + } else { + goto handle_unusual; + } + if (input->ExpectTag(16)) goto parse_width; + break; + } + + // optional uint32 width = 2; + case 2: { + if (tag == 16) { + parse_width: + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( + input, &width_))); + set_has_width(); + } else { + goto handle_unusual; + } + if (input->ExpectTag(24)) goto parse_height; + break; + } + + // optional uint32 height = 3; + case 3: { + if (tag == 24) { + parse_height: + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( + input, &height_))); + set_has_height(); + } else { + goto handle_unusual; + } + if (input->ExpectAtEnd()) goto success; + break; + } + + default: { + handle_unusual: + if (tag == 0 || + ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:bgs.protocol.EmbedHTML) + return true; +failure: + // @@protoc_insertion_point(parse_failure:bgs.protocol.EmbedHTML) + return false; +#undef DO_ +} + +void EmbedHTML::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:bgs.protocol.EmbedHTML) + // optional string content = 1; + if (has_content()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->content().data(), this->content().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "content"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 1, this->content(), output); + } + + // optional uint32 width = 2; + if (has_width()) { + ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->width(), output); + } + + // optional uint32 height = 3; + if (has_height()) { + ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->height(), output); + } + + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:bgs.protocol.EmbedHTML) +} + +::google::protobuf::uint8* EmbedHTML::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.EmbedHTML) + // optional string content = 1; + if (has_content()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->content().data(), this->content().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "content"); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 1, this->content(), target); + } + + // optional uint32 width = 2; + if (has_width()) { + target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->width(), target); + } + + // optional uint32 height = 3; + if (has_height()) { + target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->height(), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.EmbedHTML) + return target; +} + +int EmbedHTML::ByteSize() const { + int total_size = 0; + + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { + // optional string content = 1; + if (has_content()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->content()); + } + + // optional uint32 width = 2; + if (has_width()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::UInt32Size( + this->width()); + } + + // optional uint32 height = 3; + if (has_height()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::UInt32Size( + this->height()); + } + + } + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = total_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} + +void EmbedHTML::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const EmbedHTML* source = + ::google::protobuf::internal::dynamic_cast_if_available<const EmbedHTML*>( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } +} + +void EmbedHTML::MergeFrom(const EmbedHTML& from) { + GOOGLE_CHECK_NE(&from, this); + if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from.has_content()) { + set_content(from.content()); + } + if (from.has_width()) { + set_width(from.width()); + } + if (from.has_height()) { + set_height(from.height()); + } + } + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void EmbedHTML::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void EmbedHTML::CopyFrom(const EmbedHTML& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool EmbedHTML::IsInitialized() const { + + return true; +} + +void EmbedHTML::Swap(EmbedHTML* other) { + if (other != this) { + std::swap(content_, other->content_); + std::swap(width_, other->width_); + std::swap(height_, other->height_); + std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); + std::swap(_cached_size_, other->_cached_size_); + } +} + +::google::protobuf::Metadata EmbedHTML::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = EmbedHTML_descriptor_; + metadata.reflection = EmbedHTML_reflection_; + return metadata; +} + + +// =================================================================== + +#ifndef _MSC_VER const int EmbedInfo::kTitleFieldNumber; const int EmbedInfo::kTypeFieldNumber; const int EmbedInfo::kOriginalUrlFieldNumber; const int EmbedInfo::kThumbnailFieldNumber; const int EmbedInfo::kProviderFieldNumber; const int EmbedInfo::kDescriptionFieldNumber; +const int EmbedInfo::kFaviconFieldNumber; +const int EmbedInfo::kHtmlFieldNumber; #endif // !_MSC_VER EmbedInfo::EmbedInfo() @@ -757,6 +1394,8 @@ EmbedInfo::EmbedInfo() void EmbedInfo::InitAsDefaultInstance() { thumbnail_ = const_cast< ::bgs::protocol::EmbedImage*>(&::bgs::protocol::EmbedImage::default_instance()); provider_ = const_cast< ::bgs::protocol::Provider*>(&::bgs::protocol::Provider::default_instance()); + favicon_ = const_cast< ::bgs::protocol::Favicon*>(&::bgs::protocol::Favicon::default_instance()); + html_ = const_cast< ::bgs::protocol::EmbedHTML*>(&::bgs::protocol::EmbedHTML::default_instance()); } EmbedInfo::EmbedInfo(const EmbedInfo& from) @@ -775,6 +1414,8 @@ void EmbedInfo::SharedCtor() { thumbnail_ = NULL; provider_ = NULL; description_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + favicon_ = NULL; + html_ = NULL; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -799,6 +1440,8 @@ void EmbedInfo::SharedDtor() { if (this != default_instance_) { delete thumbnail_; delete provider_; + delete favicon_; + delete html_; } } @@ -824,7 +1467,7 @@ EmbedInfo* EmbedInfo::New() const { } void EmbedInfo::Clear() { - if (_has_bits_[0 / 32] & 63) { + if (_has_bits_[0 / 32] & 255) { if (has_title()) { if (title_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { title_->clear(); @@ -851,6 +1494,12 @@ void EmbedInfo::Clear() { description_->clear(); } } + if (has_favicon()) { + if (favicon_ != NULL) favicon_->::bgs::protocol::Favicon::Clear(); + } + if (has_html()) { + if (html_ != NULL) html_->::bgs::protocol::EmbedHTML::Clear(); + } } ::memset(_has_bits_, 0, sizeof(_has_bits_)); mutable_unknown_fields()->Clear(); @@ -955,6 +1604,32 @@ bool EmbedInfo::MergePartialFromCodedStream( } else { goto handle_unusual; } + if (input->ExpectTag(58)) goto parse_favicon; + break; + } + + // optional .bgs.protocol.Favicon favicon = 7; + case 7: { + if (tag == 58) { + parse_favicon: + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_favicon())); + } else { + goto handle_unusual; + } + if (input->ExpectTag(66)) goto parse_html; + break; + } + + // optional .bgs.protocol.EmbedHTML html = 8; + case 8: { + if (tag == 66) { + parse_html: + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_html())); + } else { + goto handle_unusual; + } if (input->ExpectAtEnd()) goto success; break; } @@ -1036,6 +1711,18 @@ void EmbedInfo::SerializeWithCachedSizes( 6, this->description(), output); } + // optional .bgs.protocol.Favicon favicon = 7; + if (has_favicon()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 7, this->favicon(), output); + } + + // optional .bgs.protocol.EmbedHTML html = 8; + if (has_html()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 8, this->html(), output); + } + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -1104,6 +1791,20 @@ void EmbedInfo::SerializeWithCachedSizes( 6, this->description(), target); } + // optional .bgs.protocol.Favicon favicon = 7; + if (has_favicon()) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 7, this->favicon(), target); + } + + // optional .bgs.protocol.EmbedHTML html = 8; + if (has_html()) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 8, this->html(), target); + } + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -1158,6 +1859,20 @@ int EmbedInfo::ByteSize() const { this->description()); } + // optional .bgs.protocol.Favicon favicon = 7; + if (has_favicon()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->favicon()); + } + + // optional .bgs.protocol.EmbedHTML html = 8; + if (has_html()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->html()); + } + } if (!unknown_fields().empty()) { total_size += @@ -1203,6 +1918,12 @@ void EmbedInfo::MergeFrom(const EmbedInfo& from) { if (from.has_description()) { set_description(from.description()); } + if (from.has_favicon()) { + mutable_favicon()->::bgs::protocol::Favicon::MergeFrom(from.favicon()); + } + if (from.has_html()) { + mutable_html()->::bgs::protocol::EmbedHTML::MergeFrom(from.html()); + } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); } @@ -1232,6 +1953,8 @@ void EmbedInfo::Swap(EmbedInfo* other) { std::swap(thumbnail_, other->thumbnail_); std::swap(provider_, other->provider_); std::swap(description_, other->description_); + std::swap(favicon_, other->favicon_); + std::swap(html_, other->html_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); diff --git a/src/server/proto/Client/embed_types.pb.h b/src/server/proto/Client/embed_types.pb.h index 7b32b2c8d7a..a5bff993b90 100644 --- a/src/server/proto/Client/embed_types.pb.h +++ b/src/server/proto/Client/embed_types.pb.h @@ -37,6 +37,8 @@ void protobuf_ShutdownFile_embed_5ftypes_2eproto(); class EmbedImage; class Provider; +class Favicon; +class EmbedHTML; class EmbedInfo; // =================================================================== @@ -229,6 +231,194 @@ class TC_PROTO_API Provider : public ::google::protobuf::Message { }; // ------------------------------------------------------------------- +class TC_PROTO_API Favicon : public ::google::protobuf::Message { + public: + Favicon(); + virtual ~Favicon(); + + Favicon(const Favicon& from); + + inline Favicon& operator=(const Favicon& from) { + CopyFrom(from); + return *this; + } + + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); + static const Favicon& default_instance(); + + void Swap(Favicon* other); + + // implements Message ---------------------------------------------- + + Favicon* New() const; + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); + void CopyFrom(const Favicon& from); + void MergeFrom(const Favicon& from); + void Clear(); + bool IsInitialized() const; + + int ByteSize() const; + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input); + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; + int GetCachedSize() const { return _cached_size_; } + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const; + public: + ::google::protobuf::Metadata GetMetadata() const; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // optional string url = 1; + inline bool has_url() const; + inline void clear_url(); + static const int kUrlFieldNumber = 1; + inline const ::std::string& url() const; + inline void set_url(const ::std::string& value); + inline void set_url(const char* value); + inline void set_url(const char* value, size_t size); + inline ::std::string* mutable_url(); + inline ::std::string* release_url(); + inline void set_allocated_url(::std::string* url); + + // @@protoc_insertion_point(class_scope:bgs.protocol.Favicon) + private: + inline void set_has_url(); + inline void clear_has_url(); + + ::google::protobuf::UnknownFieldSet _unknown_fields_; + + ::google::protobuf::uint32 _has_bits_[1]; + mutable int _cached_size_; + ::std::string* url_; + friend void TC_PROTO_API protobuf_AddDesc_embed_5ftypes_2eproto(); + friend void protobuf_AssignDesc_embed_5ftypes_2eproto(); + friend void protobuf_ShutdownFile_embed_5ftypes_2eproto(); + + void InitAsDefaultInstance(); + static Favicon* default_instance_; +}; +// ------------------------------------------------------------------- + +class TC_PROTO_API EmbedHTML : public ::google::protobuf::Message { + public: + EmbedHTML(); + virtual ~EmbedHTML(); + + EmbedHTML(const EmbedHTML& from); + + inline EmbedHTML& operator=(const EmbedHTML& from) { + CopyFrom(from); + return *this; + } + + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); + static const EmbedHTML& default_instance(); + + void Swap(EmbedHTML* other); + + // implements Message ---------------------------------------------- + + EmbedHTML* New() const; + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); + void CopyFrom(const EmbedHTML& from); + void MergeFrom(const EmbedHTML& from); + void Clear(); + bool IsInitialized() const; + + int ByteSize() const; + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input); + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; + int GetCachedSize() const { return _cached_size_; } + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const; + public: + ::google::protobuf::Metadata GetMetadata() const; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // optional string content = 1; + inline bool has_content() const; + inline void clear_content(); + static const int kContentFieldNumber = 1; + inline const ::std::string& content() const; + inline void set_content(const ::std::string& value); + inline void set_content(const char* value); + inline void set_content(const char* value, size_t size); + inline ::std::string* mutable_content(); + inline ::std::string* release_content(); + inline void set_allocated_content(::std::string* content); + + // optional uint32 width = 2; + inline bool has_width() const; + inline void clear_width(); + static const int kWidthFieldNumber = 2; + inline ::google::protobuf::uint32 width() const; + inline void set_width(::google::protobuf::uint32 value); + + // optional uint32 height = 3; + inline bool has_height() const; + inline void clear_height(); + static const int kHeightFieldNumber = 3; + inline ::google::protobuf::uint32 height() const; + inline void set_height(::google::protobuf::uint32 value); + + // @@protoc_insertion_point(class_scope:bgs.protocol.EmbedHTML) + private: + inline void set_has_content(); + inline void clear_has_content(); + inline void set_has_width(); + inline void clear_has_width(); + inline void set_has_height(); + inline void clear_has_height(); + + ::google::protobuf::UnknownFieldSet _unknown_fields_; + + ::google::protobuf::uint32 _has_bits_[1]; + mutable int _cached_size_; + ::std::string* content_; + ::google::protobuf::uint32 width_; + ::google::protobuf::uint32 height_; + friend void TC_PROTO_API protobuf_AddDesc_embed_5ftypes_2eproto(); + friend void protobuf_AssignDesc_embed_5ftypes_2eproto(); + friend void protobuf_ShutdownFile_embed_5ftypes_2eproto(); + + void InitAsDefaultInstance(); + static EmbedHTML* default_instance_; +}; +// ------------------------------------------------------------------- + class TC_PROTO_API EmbedInfo : public ::google::protobuf::Message { public: EmbedInfo(); @@ -348,6 +538,24 @@ class TC_PROTO_API EmbedInfo : public ::google::protobuf::Message { inline ::std::string* release_description(); inline void set_allocated_description(::std::string* description); + // optional .bgs.protocol.Favicon favicon = 7; + inline bool has_favicon() const; + inline void clear_favicon(); + static const int kFaviconFieldNumber = 7; + inline const ::bgs::protocol::Favicon& favicon() const; + inline ::bgs::protocol::Favicon* mutable_favicon(); + inline ::bgs::protocol::Favicon* release_favicon(); + inline void set_allocated_favicon(::bgs::protocol::Favicon* favicon); + + // optional .bgs.protocol.EmbedHTML html = 8; + inline bool has_html() const; + inline void clear_html(); + static const int kHtmlFieldNumber = 8; + inline const ::bgs::protocol::EmbedHTML& html() const; + inline ::bgs::protocol::EmbedHTML* mutable_html(); + inline ::bgs::protocol::EmbedHTML* release_html(); + inline void set_allocated_html(::bgs::protocol::EmbedHTML* html); + // @@protoc_insertion_point(class_scope:bgs.protocol.EmbedInfo) private: inline void set_has_title(); @@ -362,6 +570,10 @@ class TC_PROTO_API EmbedInfo : public ::google::protobuf::Message { inline void clear_has_provider(); inline void set_has_description(); inline void clear_has_description(); + inline void set_has_favicon(); + inline void clear_has_favicon(); + inline void set_has_html(); + inline void clear_has_html(); ::google::protobuf::UnknownFieldSet _unknown_fields_; @@ -373,6 +585,8 @@ class TC_PROTO_API EmbedInfo : public ::google::protobuf::Message { ::bgs::protocol::EmbedImage* thumbnail_; ::bgs::protocol::Provider* provider_; ::std::string* description_; + ::bgs::protocol::Favicon* favicon_; + ::bgs::protocol::EmbedHTML* html_; friend void TC_PROTO_API protobuf_AddDesc_embed_5ftypes_2eproto(); friend void protobuf_AssignDesc_embed_5ftypes_2eproto(); friend void protobuf_ShutdownFile_embed_5ftypes_2eproto(); @@ -596,6 +810,214 @@ inline void Provider::set_allocated_name(::std::string* name) { // ------------------------------------------------------------------- +// Favicon + +// optional string url = 1; +inline bool Favicon::has_url() const { + return (_has_bits_[0] & 0x00000001u) != 0; +} +inline void Favicon::set_has_url() { + _has_bits_[0] |= 0x00000001u; +} +inline void Favicon::clear_has_url() { + _has_bits_[0] &= ~0x00000001u; +} +inline void Favicon::clear_url() { + if (url_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + url_->clear(); + } + clear_has_url(); +} +inline const ::std::string& Favicon::url() const { + // @@protoc_insertion_point(field_get:bgs.protocol.Favicon.url) + return *url_; +} +inline void Favicon::set_url(const ::std::string& value) { + set_has_url(); + if (url_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + url_ = new ::std::string; + } + url_->assign(value); + // @@protoc_insertion_point(field_set:bgs.protocol.Favicon.url) +} +inline void Favicon::set_url(const char* value) { + set_has_url(); + if (url_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + url_ = new ::std::string; + } + url_->assign(value); + // @@protoc_insertion_point(field_set_char:bgs.protocol.Favicon.url) +} +inline void Favicon::set_url(const char* value, size_t size) { + set_has_url(); + if (url_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + url_ = new ::std::string; + } + url_->assign(reinterpret_cast<const char*>(value), size); + // @@protoc_insertion_point(field_set_pointer:bgs.protocol.Favicon.url) +} +inline ::std::string* Favicon::mutable_url() { + set_has_url(); + if (url_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + url_ = new ::std::string; + } + // @@protoc_insertion_point(field_mutable:bgs.protocol.Favicon.url) + return url_; +} +inline ::std::string* Favicon::release_url() { + clear_has_url(); + if (url_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + return NULL; + } else { + ::std::string* temp = url_; + url_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return temp; + } +} +inline void Favicon::set_allocated_url(::std::string* url) { + if (url_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + delete url_; + } + if (url) { + set_has_url(); + url_ = url; + } else { + clear_has_url(); + url_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + } + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.Favicon.url) +} + +// ------------------------------------------------------------------- + +// EmbedHTML + +// optional string content = 1; +inline bool EmbedHTML::has_content() const { + return (_has_bits_[0] & 0x00000001u) != 0; +} +inline void EmbedHTML::set_has_content() { + _has_bits_[0] |= 0x00000001u; +} +inline void EmbedHTML::clear_has_content() { + _has_bits_[0] &= ~0x00000001u; +} +inline void EmbedHTML::clear_content() { + if (content_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + content_->clear(); + } + clear_has_content(); +} +inline const ::std::string& EmbedHTML::content() const { + // @@protoc_insertion_point(field_get:bgs.protocol.EmbedHTML.content) + return *content_; +} +inline void EmbedHTML::set_content(const ::std::string& value) { + set_has_content(); + if (content_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + content_ = new ::std::string; + } + content_->assign(value); + // @@protoc_insertion_point(field_set:bgs.protocol.EmbedHTML.content) +} +inline void EmbedHTML::set_content(const char* value) { + set_has_content(); + if (content_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + content_ = new ::std::string; + } + content_->assign(value); + // @@protoc_insertion_point(field_set_char:bgs.protocol.EmbedHTML.content) +} +inline void EmbedHTML::set_content(const char* value, size_t size) { + set_has_content(); + if (content_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + content_ = new ::std::string; + } + content_->assign(reinterpret_cast<const char*>(value), size); + // @@protoc_insertion_point(field_set_pointer:bgs.protocol.EmbedHTML.content) +} +inline ::std::string* EmbedHTML::mutable_content() { + set_has_content(); + if (content_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + content_ = new ::std::string; + } + // @@protoc_insertion_point(field_mutable:bgs.protocol.EmbedHTML.content) + return content_; +} +inline ::std::string* EmbedHTML::release_content() { + clear_has_content(); + if (content_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + return NULL; + } else { + ::std::string* temp = content_; + content_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return temp; + } +} +inline void EmbedHTML::set_allocated_content(::std::string* content) { + if (content_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + delete content_; + } + if (content) { + set_has_content(); + content_ = content; + } else { + clear_has_content(); + content_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + } + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.EmbedHTML.content) +} + +// optional uint32 width = 2; +inline bool EmbedHTML::has_width() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +inline void EmbedHTML::set_has_width() { + _has_bits_[0] |= 0x00000002u; +} +inline void EmbedHTML::clear_has_width() { + _has_bits_[0] &= ~0x00000002u; +} +inline void EmbedHTML::clear_width() { + width_ = 0u; + clear_has_width(); +} +inline ::google::protobuf::uint32 EmbedHTML::width() const { + // @@protoc_insertion_point(field_get:bgs.protocol.EmbedHTML.width) + return width_; +} +inline void EmbedHTML::set_width(::google::protobuf::uint32 value) { + set_has_width(); + width_ = value; + // @@protoc_insertion_point(field_set:bgs.protocol.EmbedHTML.width) +} + +// optional uint32 height = 3; +inline bool EmbedHTML::has_height() const { + return (_has_bits_[0] & 0x00000004u) != 0; +} +inline void EmbedHTML::set_has_height() { + _has_bits_[0] |= 0x00000004u; +} +inline void EmbedHTML::clear_has_height() { + _has_bits_[0] &= ~0x00000004u; +} +inline void EmbedHTML::clear_height() { + height_ = 0u; + clear_has_height(); +} +inline ::google::protobuf::uint32 EmbedHTML::height() const { + // @@protoc_insertion_point(field_get:bgs.protocol.EmbedHTML.height) + return height_; +} +inline void EmbedHTML::set_height(::google::protobuf::uint32 value) { + set_has_height(); + height_ = value; + // @@protoc_insertion_point(field_set:bgs.protocol.EmbedHTML.height) +} + +// ------------------------------------------------------------------- + // EmbedInfo // optional string title = 1; @@ -984,6 +1406,88 @@ inline void EmbedInfo::set_allocated_description(::std::string* description) { // @@protoc_insertion_point(field_set_allocated:bgs.protocol.EmbedInfo.description) } +// optional .bgs.protocol.Favicon favicon = 7; +inline bool EmbedInfo::has_favicon() const { + return (_has_bits_[0] & 0x00000040u) != 0; +} +inline void EmbedInfo::set_has_favicon() { + _has_bits_[0] |= 0x00000040u; +} +inline void EmbedInfo::clear_has_favicon() { + _has_bits_[0] &= ~0x00000040u; +} +inline void EmbedInfo::clear_favicon() { + if (favicon_ != NULL) favicon_->::bgs::protocol::Favicon::Clear(); + clear_has_favicon(); +} +inline const ::bgs::protocol::Favicon& EmbedInfo::favicon() const { + // @@protoc_insertion_point(field_get:bgs.protocol.EmbedInfo.favicon) + return favicon_ != NULL ? *favicon_ : *default_instance_->favicon_; +} +inline ::bgs::protocol::Favicon* EmbedInfo::mutable_favicon() { + set_has_favicon(); + if (favicon_ == NULL) favicon_ = new ::bgs::protocol::Favicon; + // @@protoc_insertion_point(field_mutable:bgs.protocol.EmbedInfo.favicon) + return favicon_; +} +inline ::bgs::protocol::Favicon* EmbedInfo::release_favicon() { + clear_has_favicon(); + ::bgs::protocol::Favicon* temp = favicon_; + favicon_ = NULL; + return temp; +} +inline void EmbedInfo::set_allocated_favicon(::bgs::protocol::Favicon* favicon) { + delete favicon_; + favicon_ = favicon; + if (favicon) { + set_has_favicon(); + } else { + clear_has_favicon(); + } + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.EmbedInfo.favicon) +} + +// optional .bgs.protocol.EmbedHTML html = 8; +inline bool EmbedInfo::has_html() const { + return (_has_bits_[0] & 0x00000080u) != 0; +} +inline void EmbedInfo::set_has_html() { + _has_bits_[0] |= 0x00000080u; +} +inline void EmbedInfo::clear_has_html() { + _has_bits_[0] &= ~0x00000080u; +} +inline void EmbedInfo::clear_html() { + if (html_ != NULL) html_->::bgs::protocol::EmbedHTML::Clear(); + clear_has_html(); +} +inline const ::bgs::protocol::EmbedHTML& EmbedInfo::html() const { + // @@protoc_insertion_point(field_get:bgs.protocol.EmbedInfo.html) + return html_ != NULL ? *html_ : *default_instance_->html_; +} +inline ::bgs::protocol::EmbedHTML* EmbedInfo::mutable_html() { + set_has_html(); + if (html_ == NULL) html_ = new ::bgs::protocol::EmbedHTML; + // @@protoc_insertion_point(field_mutable:bgs.protocol.EmbedInfo.html) + return html_; +} +inline ::bgs::protocol::EmbedHTML* EmbedInfo::release_html() { + clear_has_html(); + ::bgs::protocol::EmbedHTML* temp = html_; + html_ = NULL; + return temp; +} +inline void EmbedInfo::set_allocated_html(::bgs::protocol::EmbedHTML* html) { + delete html_; + html_ = html; + if (html) { + set_has_html(); + } else { + clear_has_html(); + } + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.EmbedInfo.html) +} + // @@protoc_insertion_point(namespace_scope) diff --git a/src/server/proto/Client/entity_types.pb.cc b/src/server/proto/Client/entity_types.pb.cc index a04bd5d93c6..dfcf50e93d7 100644 --- a/src/server/proto/Client/entity_types.pb.cc +++ b/src/server/proto/Client/entity_types.pb.cc @@ -111,11 +111,11 @@ void protobuf_AddDesc_entity_5ftypes_2eproto() { "al_extensions/field_options.proto\032\'globa" "l_extensions/message_options.proto\"=\n\010En" "tityId\022\024\n\004high\030\001 \002(\006B\006\202\371+\002\010\002\022\023\n\003low\030\002 \002(" - "\006B\006\202\371+\002\010\002:\006\202\371+\002\010\001\"\177\n\010Identity\0226\n\naccount" - "_id\030\001 \001(\0132\026.bgs.protocol.EntityIdB\n\212\371+\006:" - "\004\010\001\020\001\022;\n\017game_account_id\030\002 \001(\0132\026.bgs.pro" - "tocol.EntityIdB\n\212\371+\006:\004\010\001\020\002B\036\n\rbnet.proto" - "colB\013EntityProtoH\001", 338); + "\006B\006\202\371+\002\010\002:\006\202\371+\002\010\001\"{\n\010Identity\0224\n\naccount" + "_id\030\001 \001(\0132\026.bgs.protocol.EntityIdB\010\212\371+\004:" + "\002\020\001\0229\n\017game_account_id\030\002 \001(\0132\026.bgs.proto" + "col.EntityIdB\010\212\371+\004:\002\020\002B\036\n\rbnet.protocolB" + "\013EntityProtoH\001", 334); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "entity_types.proto", &protobuf_RegisterTypes); EntityId::default_instance_ = new EntityId(); diff --git a/src/server/proto/Client/friends_types.pb.cc b/src/server/proto/Client/friends_types.pb.cc index e47c3369e00..5a409436bea 100644 --- a/src/server/proto/Client/friends_types.pb.cc +++ b/src/server/proto/Client/friends_types.pb.cc @@ -99,15 +99,13 @@ void protobuf_AssignDesc_friends_5ftypes_2eproto() { ::google::protobuf::MessageFactory::generated_factory(), sizeof(FriendOfFriend)); ReceivedInvitation_descriptor_ = file->message_type(2); - static const int ReceivedInvitation_offsets_[9] = { + static const int ReceivedInvitation_offsets_[7] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReceivedInvitation, id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReceivedInvitation, inviter_identity_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReceivedInvitation, invitee_identity_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReceivedInvitation, inviter_name_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReceivedInvitation, invitee_name_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReceivedInvitation, invitation_message_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReceivedInvitation, creation_time_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReceivedInvitation, expiration_time_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReceivedInvitation, program_), }; ReceivedInvitation_reflection_ = @@ -287,41 +285,40 @@ void protobuf_AddDesc_friends_5ftypes_2eproto() { "\004\"\211\001\n\016FriendOfFriend\022*\n\naccount_id\030\001 \001(\013" "2\026.bgs.protocol.EntityId\022\020\n\004role\030\003 \003(\rB\002" "\020\001\022\022\n\nprivileges\030\004 \001(\004\022\021\n\tfull_name\030\006 \001(" - "\t\022\022\n\nbattle_tag\030\007 \001(\t\"\224\002\n\022ReceivedInvita" + "\t\022\022\n\nbattle_tag\030\007 \001(\t\"\337\001\n\022ReceivedInvita" "tion\022\n\n\002id\030\001 \002(\006\0220\n\020inviter_identity\030\002 \002" "(\0132\026.bgs.protocol.Identity\0220\n\020invitee_id" "entity\030\003 \002(\0132\026.bgs.protocol.Identity\022\024\n\014" "inviter_name\030\004 \001(\t\022\024\n\014invitee_name\030\005 \001(\t" - "\022\032\n\022invitation_message\030\006 \001(\t\022\025\n\rcreation" - "_time\030\007 \001(\004\022\027\n\017expiration_time\030\010 \001(\004\022\017\n\007" - "program\030\t \001(\007*\005\010d\020\220N\"\303\001\n\020FriendInvitatio" - "n\022\020\n\004role\030\002 \003(\rB\002\020\001\022*\n\tattribute\030\003 \003(\0132\027" - ".bgs.protocol.Attribute2q\n\021friend_invita" - "tion\022+.bgs.protocol.friends.v1.ReceivedI" - "nvitation\030g \001(\0132).bgs.protocol.friends.v" - "1.FriendInvitation\"\223\001\n\016SentInvitation\022\n\n" - "\002id\030\001 \001(\006\022\023\n\013target_name\030\002 \001(\t\022\014\n\004role\030\003" - " \001(\r\022*\n\tattribute\030\004 \003(\0132\027.bgs.protocol.A" - "ttribute\022\025\n\rcreation_time\030\005 \001(\004\022\017\n\007progr" - "am\030\006 \001(\007\"\231\002\n\026FriendInvitationParams\022\024\n\014t" - "arget_email\030\001 \001(\t\022\031\n\021target_battle_tag\030\002" - " \001(\t\022\020\n\004role\030\006 \003(\rB\002\020\001\022*\n\tattribute\030\010 \003(" - "\0132\027.bgs.protocol.Attribute\022\023\n\013target_nam" - "e\030\t \001(\t\022\023\n\007program\030\n \001(\007B\002\030\0012f\n\rfriend_p" - "arams\022\036.bgs.protocol.InvitationParams\030g " - "\001(\0132/.bgs.protocol.friends.v1.FriendInvi" - "tationParams\"\312\002\n\021SubscribeResponse\022\023\n\013ma" - "x_friends\030\001 \001(\r\022 \n\030max_received_invitati" - "ons\030\002 \001(\r\022\034\n\024max_sent_invitations\030\003 \001(\r\022" - " \n\004role\030\004 \003(\0132\022.bgs.protocol.Role\0220\n\007fri" - "ends\030\005 \003(\0132\037.bgs.protocol.friends.v1.Fri" - "end\022I\n\024received_invitations\030\007 \003(\0132+.bgs." - "protocol.friends.v1.ReceivedInvitation\022A" - "\n\020sent_invitations\030\010 \003(\0132\'.bgs.protocol." - "friends.v1.SentInvitation\"8\n\027AcceptInvit" - "ationOptions\022\014\n\004role\030\001 \001(\r\022\017\n\007program\030\002 " - "\001(\007B/\n\030bnet.protocol.friends.v1B\021Friends" - "TypesProtoH\001", 1812); + "\022\025\n\rcreation_time\030\007 \001(\004\022\017\n\007program\030\t \001(\007" + "*\005\010d\020\220N\"\303\001\n\020FriendInvitation\022\020\n\004role\030\002 \003" + "(\rB\002\020\001\022*\n\tattribute\030\003 \003(\0132\027.bgs.protocol" + ".Attribute2q\n\021friend_invitation\022+.bgs.pr" + "otocol.friends.v1.ReceivedInvitation\030g \001" + "(\0132).bgs.protocol.friends.v1.FriendInvit" + "ation\"\223\001\n\016SentInvitation\022\n\n\002id\030\001 \001(\006\022\023\n\013" + "target_name\030\002 \001(\t\022\014\n\004role\030\003 \001(\r\022*\n\tattri" + "bute\030\004 \003(\0132\027.bgs.protocol.Attribute\022\025\n\rc" + "reation_time\030\005 \001(\004\022\017\n\007program\030\006 \001(\007\"\231\002\n\026" + "FriendInvitationParams\022\024\n\014target_email\030\001" + " \001(\t\022\031\n\021target_battle_tag\030\002 \001(\t\022\020\n\004role\030" + "\006 \003(\rB\002\020\001\022*\n\tattribute\030\010 \003(\0132\027.bgs.proto" + "col.Attribute\022\023\n\013target_name\030\t \001(\t\022\023\n\007pr" + "ogram\030\n \001(\007B\002\030\0012f\n\rfriend_params\022\036.bgs.p" + "rotocol.InvitationParams\030g \001(\0132/.bgs.pro" + "tocol.friends.v1.FriendInvitationParams\"" + "\326\002\n\021SubscribeResponse\022\027\n\013max_friends\030\001 \001" + "(\rB\002\030\001\022$\n\030max_received_invitations\030\002 \001(\r" + "B\002\030\001\022 \n\024max_sent_invitations\030\003 \001(\rB\002\030\001\022 " + "\n\004role\030\004 \003(\0132\022.bgs.protocol.Role\0220\n\007frie" + "nds\030\005 \003(\0132\037.bgs.protocol.friends.v1.Frie" + "nd\022I\n\024received_invitations\030\007 \003(\0132+.bgs.p" + "rotocol.friends.v1.ReceivedInvitation\022A\n" + "\020sent_invitations\030\010 \003(\0132\'.bgs.protocol.f" + "riends.v1.SentInvitation\"8\n\027AcceptInvita" + "tionOptions\022\014\n\004role\030\001 \001(\r\022\017\n\007program\030\002 \001" + "(\007B/\n\030bnet.protocol.friends.v1B\021FriendsT" + "ypesProtoH\001", 1771); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "friends_types.proto", &protobuf_RegisterTypes); Friend::default_instance_ = new Friend(); @@ -1286,9 +1283,7 @@ const int ReceivedInvitation::kInviterIdentityFieldNumber; const int ReceivedInvitation::kInviteeIdentityFieldNumber; const int ReceivedInvitation::kInviterNameFieldNumber; const int ReceivedInvitation::kInviteeNameFieldNumber; -const int ReceivedInvitation::kInvitationMessageFieldNumber; const int ReceivedInvitation::kCreationTimeFieldNumber; -const int ReceivedInvitation::kExpirationTimeFieldNumber; const int ReceivedInvitation::kProgramFieldNumber; #endif // !_MSC_VER @@ -1318,9 +1313,7 @@ void ReceivedInvitation::SharedCtor() { invitee_identity_ = NULL; inviter_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); invitee_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - invitation_message_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); creation_time_ = GOOGLE_ULONGLONG(0); - expiration_time_ = GOOGLE_ULONGLONG(0); program_ = 0u; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -1337,9 +1330,6 @@ void ReceivedInvitation::SharedDtor() { if (invitee_name_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { delete invitee_name_; } - if (invitation_message_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { - delete invitation_message_; - } if (this != default_instance_) { delete inviter_identity_; delete invitee_identity_; @@ -1379,8 +1369,8 @@ void ReceivedInvitation::Clear() { ::memset(&first, 0, n); \ } while (0) - if (_has_bits_[0 / 32] & 255) { - ZR_(creation_time_, expiration_time_); + if (_has_bits_[0 / 32] & 127) { + ZR_(creation_time_, program_); id_ = GOOGLE_ULONGLONG(0); if (has_inviter_identity()) { if (inviter_identity_ != NULL) inviter_identity_->::bgs::protocol::Identity::Clear(); @@ -1398,13 +1388,7 @@ void ReceivedInvitation::Clear() { invitee_name_->clear(); } } - if (has_invitation_message()) { - if (invitation_message_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { - invitation_message_->clear(); - } - } } - program_ = 0u; #undef OFFSET_OF_FIELD_ #undef ZR_ @@ -1493,23 +1477,6 @@ bool ReceivedInvitation::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(50)) goto parse_invitation_message; - break; - } - - // optional string invitation_message = 6; - case 6: { - if (tag == 50) { - parse_invitation_message: - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_invitation_message())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->invitation_message().data(), this->invitation_message().length(), - ::google::protobuf::internal::WireFormat::PARSE, - "invitation_message"); - } else { - goto handle_unusual; - } if (input->ExpectTag(56)) goto parse_creation_time; break; } @@ -1525,21 +1492,6 @@ bool ReceivedInvitation::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(64)) goto parse_expiration_time; - break; - } - - // optional uint64 expiration_time = 8; - case 8: { - if (tag == 64) { - parse_expiration_time: - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>( - input, &expiration_time_))); - set_has_expiration_time(); - } else { - goto handle_unusual; - } if (input->ExpectTag(77)) goto parse_program; break; } @@ -1626,26 +1578,11 @@ void ReceivedInvitation::SerializeWithCachedSizes( 5, this->invitee_name(), output); } - // optional string invitation_message = 6; - if (has_invitation_message()) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->invitation_message().data(), this->invitation_message().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, - "invitation_message"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 6, this->invitation_message(), output); - } - // optional uint64 creation_time = 7; if (has_creation_time()) { ::google::protobuf::internal::WireFormatLite::WriteUInt64(7, this->creation_time(), output); } - // optional uint64 expiration_time = 8; - if (has_expiration_time()) { - ::google::protobuf::internal::WireFormatLite::WriteUInt64(8, this->expiration_time(), output); - } - // optional fixed32 program = 9; if (has_program()) { ::google::protobuf::internal::WireFormatLite::WriteFixed32(9, this->program(), output); @@ -1706,27 +1643,11 @@ void ReceivedInvitation::SerializeWithCachedSizes( 5, this->invitee_name(), target); } - // optional string invitation_message = 6; - if (has_invitation_message()) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->invitation_message().data(), this->invitation_message().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, - "invitation_message"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 6, this->invitation_message(), target); - } - // optional uint64 creation_time = 7; if (has_creation_time()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(7, this->creation_time(), target); } - // optional uint64 expiration_time = 8; - if (has_expiration_time()) { - target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(8, this->expiration_time(), target); - } - // optional fixed32 program = 9; if (has_program()) { target = ::google::protobuf::internal::WireFormatLite::WriteFixed32ToArray(9, this->program(), target); @@ -1781,13 +1702,6 @@ int ReceivedInvitation::ByteSize() const { this->invitee_name()); } - // optional string invitation_message = 6; - if (has_invitation_message()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->invitation_message()); - } - // optional uint64 creation_time = 7; if (has_creation_time()) { total_size += 1 + @@ -1795,15 +1709,6 @@ int ReceivedInvitation::ByteSize() const { this->creation_time()); } - // optional uint64 expiration_time = 8; - if (has_expiration_time()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::UInt64Size( - this->expiration_time()); - } - - } - if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) { // optional fixed32 program = 9; if (has_program()) { total_size += 1 + 4; @@ -1853,17 +1758,9 @@ void ReceivedInvitation::MergeFrom(const ReceivedInvitation& from) { if (from.has_invitee_name()) { set_invitee_name(from.invitee_name()); } - if (from.has_invitation_message()) { - set_invitation_message(from.invitation_message()); - } if (from.has_creation_time()) { set_creation_time(from.creation_time()); } - if (from.has_expiration_time()) { - set_expiration_time(from.expiration_time()); - } - } - if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) { if (from.has_program()) { set_program(from.program()); } @@ -1904,9 +1801,7 @@ void ReceivedInvitation::Swap(ReceivedInvitation* other) { std::swap(invitee_identity_, other->invitee_identity_); std::swap(inviter_name_, other->inviter_name_); std::swap(invitee_name_, other->invitee_name_); - std::swap(invitation_message_, other->invitation_message_); std::swap(creation_time_, other->creation_time_); - std::swap(expiration_time_, other->expiration_time_); std::swap(program_, other->program_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); @@ -3276,7 +3171,7 @@ bool SubscribeResponse::MergePartialFromCodedStream( tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // optional uint32 max_friends = 1; + // optional uint32 max_friends = 1 [deprecated = true]; case 1: { if (tag == 8) { DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< @@ -3290,7 +3185,7 @@ bool SubscribeResponse::MergePartialFromCodedStream( break; } - // optional uint32 max_received_invitations = 2; + // optional uint32 max_received_invitations = 2 [deprecated = true]; case 2: { if (tag == 16) { parse_max_received_invitations: @@ -3305,7 +3200,7 @@ bool SubscribeResponse::MergePartialFromCodedStream( break; } - // optional uint32 max_sent_invitations = 3; + // optional uint32 max_sent_invitations = 3 [deprecated = true]; case 3: { if (tag == 24) { parse_max_sent_invitations: @@ -3401,17 +3296,17 @@ failure: void SubscribeResponse::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { // @@protoc_insertion_point(serialize_start:bgs.protocol.friends.v1.SubscribeResponse) - // optional uint32 max_friends = 1; + // optional uint32 max_friends = 1 [deprecated = true]; if (has_max_friends()) { ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->max_friends(), output); } - // optional uint32 max_received_invitations = 2; + // optional uint32 max_received_invitations = 2 [deprecated = true]; if (has_max_received_invitations()) { ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->max_received_invitations(), output); } - // optional uint32 max_sent_invitations = 3; + // optional uint32 max_sent_invitations = 3 [deprecated = true]; if (has_max_sent_invitations()) { ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->max_sent_invitations(), output); } @@ -3450,17 +3345,17 @@ void SubscribeResponse::SerializeWithCachedSizes( ::google::protobuf::uint8* SubscribeResponse::SerializeWithCachedSizesToArray( ::google::protobuf::uint8* target) const { // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.friends.v1.SubscribeResponse) - // optional uint32 max_friends = 1; + // optional uint32 max_friends = 1 [deprecated = true]; if (has_max_friends()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->max_friends(), target); } - // optional uint32 max_received_invitations = 2; + // optional uint32 max_received_invitations = 2 [deprecated = true]; if (has_max_received_invitations()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->max_received_invitations(), target); } - // optional uint32 max_sent_invitations = 3; + // optional uint32 max_sent_invitations = 3 [deprecated = true]; if (has_max_sent_invitations()) { target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->max_sent_invitations(), target); } @@ -3505,21 +3400,21 @@ int SubscribeResponse::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // optional uint32 max_friends = 1; + // optional uint32 max_friends = 1 [deprecated = true]; if (has_max_friends()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::UInt32Size( this->max_friends()); } - // optional uint32 max_received_invitations = 2; + // optional uint32 max_received_invitations = 2 [deprecated = true]; if (has_max_received_invitations()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::UInt32Size( this->max_received_invitations()); } - // optional uint32 max_sent_invitations = 3; + // optional uint32 max_sent_invitations = 3 [deprecated = true]; if (has_max_sent_invitations()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::UInt32Size( diff --git a/src/server/proto/Client/friends_types.pb.h b/src/server/proto/Client/friends_types.pb.h index 955e7fb28ad..1f82a8db2d4 100644 --- a/src/server/proto/Client/friends_types.pb.h +++ b/src/server/proto/Client/friends_types.pb.h @@ -427,18 +427,6 @@ class TC_PROTO_API ReceivedInvitation : public ::google::protobuf::Message { inline ::std::string* release_invitee_name(); inline void set_allocated_invitee_name(::std::string* invitee_name); - // optional string invitation_message = 6; - inline bool has_invitation_message() const; - inline void clear_invitation_message(); - static const int kInvitationMessageFieldNumber = 6; - inline const ::std::string& invitation_message() const; - inline void set_invitation_message(const ::std::string& value); - inline void set_invitation_message(const char* value); - inline void set_invitation_message(const char* value, size_t size); - inline ::std::string* mutable_invitation_message(); - inline ::std::string* release_invitation_message(); - inline void set_allocated_invitation_message(::std::string* invitation_message); - // optional uint64 creation_time = 7; inline bool has_creation_time() const; inline void clear_creation_time(); @@ -446,13 +434,6 @@ class TC_PROTO_API ReceivedInvitation : public ::google::protobuf::Message { inline ::google::protobuf::uint64 creation_time() const; inline void set_creation_time(::google::protobuf::uint64 value); - // optional uint64 expiration_time = 8; - inline bool has_expiration_time() const; - inline void clear_expiration_time(); - static const int kExpirationTimeFieldNumber = 8; - inline ::google::protobuf::uint64 expiration_time() const; - inline void set_expiration_time(::google::protobuf::uint64 value); - // optional fixed32 program = 9; inline bool has_program() const; inline void clear_program(); @@ -473,12 +454,8 @@ class TC_PROTO_API ReceivedInvitation : public ::google::protobuf::Message { inline void clear_has_inviter_name(); inline void set_has_invitee_name(); inline void clear_has_invitee_name(); - inline void set_has_invitation_message(); - inline void clear_has_invitation_message(); inline void set_has_creation_time(); inline void clear_has_creation_time(); - inline void set_has_expiration_time(); - inline void clear_has_expiration_time(); inline void set_has_program(); inline void clear_has_program(); @@ -493,9 +470,7 @@ class TC_PROTO_API ReceivedInvitation : public ::google::protobuf::Message { ::bgs::protocol::Identity* invitee_identity_; ::std::string* inviter_name_; ::std::string* invitee_name_; - ::std::string* invitation_message_; ::google::protobuf::uint64 creation_time_; - ::google::protobuf::uint64 expiration_time_; ::google::protobuf::uint32 program_; friend void TC_PROTO_API protobuf_AddDesc_friends_5ftypes_2eproto(); friend void protobuf_AssignDesc_friends_5ftypes_2eproto(); @@ -951,26 +926,26 @@ class TC_PROTO_API SubscribeResponse : public ::google::protobuf::Message { // accessors ------------------------------------------------------- - // optional uint32 max_friends = 1; - inline bool has_max_friends() const; - inline void clear_max_friends(); + // optional uint32 max_friends = 1 [deprecated = true]; + inline bool has_max_friends() const PROTOBUF_DEPRECATED; + inline void clear_max_friends() PROTOBUF_DEPRECATED; static const int kMaxFriendsFieldNumber = 1; - inline ::google::protobuf::uint32 max_friends() const; - inline void set_max_friends(::google::protobuf::uint32 value); + inline ::google::protobuf::uint32 max_friends() const PROTOBUF_DEPRECATED; + inline void set_max_friends(::google::protobuf::uint32 value) PROTOBUF_DEPRECATED; - // optional uint32 max_received_invitations = 2; - inline bool has_max_received_invitations() const; - inline void clear_max_received_invitations(); + // optional uint32 max_received_invitations = 2 [deprecated = true]; + inline bool has_max_received_invitations() const PROTOBUF_DEPRECATED; + inline void clear_max_received_invitations() PROTOBUF_DEPRECATED; static const int kMaxReceivedInvitationsFieldNumber = 2; - inline ::google::protobuf::uint32 max_received_invitations() const; - inline void set_max_received_invitations(::google::protobuf::uint32 value); + inline ::google::protobuf::uint32 max_received_invitations() const PROTOBUF_DEPRECATED; + inline void set_max_received_invitations(::google::protobuf::uint32 value) PROTOBUF_DEPRECATED; - // optional uint32 max_sent_invitations = 3; - inline bool has_max_sent_invitations() const; - inline void clear_max_sent_invitations(); + // optional uint32 max_sent_invitations = 3 [deprecated = true]; + inline bool has_max_sent_invitations() const PROTOBUF_DEPRECATED; + inline void clear_max_sent_invitations() PROTOBUF_DEPRECATED; static const int kMaxSentInvitationsFieldNumber = 3; - inline ::google::protobuf::uint32 max_sent_invitations() const; - inline void set_max_sent_invitations(::google::protobuf::uint32 value); + inline ::google::protobuf::uint32 max_sent_invitations() const PROTOBUF_DEPRECATED; + inline void set_max_sent_invitations(::google::protobuf::uint32 value) PROTOBUF_DEPRECATED; // repeated .bgs.protocol.Role role = 4; inline int role_size() const; @@ -1832,91 +1807,15 @@ inline void ReceivedInvitation::set_allocated_invitee_name(::std::string* invite // @@protoc_insertion_point(field_set_allocated:bgs.protocol.friends.v1.ReceivedInvitation.invitee_name) } -// optional string invitation_message = 6; -inline bool ReceivedInvitation::has_invitation_message() const { - return (_has_bits_[0] & 0x00000020u) != 0; -} -inline void ReceivedInvitation::set_has_invitation_message() { - _has_bits_[0] |= 0x00000020u; -} -inline void ReceivedInvitation::clear_has_invitation_message() { - _has_bits_[0] &= ~0x00000020u; -} -inline void ReceivedInvitation::clear_invitation_message() { - if (invitation_message_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { - invitation_message_->clear(); - } - clear_has_invitation_message(); -} -inline const ::std::string& ReceivedInvitation::invitation_message() const { - // @@protoc_insertion_point(field_get:bgs.protocol.friends.v1.ReceivedInvitation.invitation_message) - return *invitation_message_; -} -inline void ReceivedInvitation::set_invitation_message(const ::std::string& value) { - set_has_invitation_message(); - if (invitation_message_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { - invitation_message_ = new ::std::string; - } - invitation_message_->assign(value); - // @@protoc_insertion_point(field_set:bgs.protocol.friends.v1.ReceivedInvitation.invitation_message) -} -inline void ReceivedInvitation::set_invitation_message(const char* value) { - set_has_invitation_message(); - if (invitation_message_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { - invitation_message_ = new ::std::string; - } - invitation_message_->assign(value); - // @@protoc_insertion_point(field_set_char:bgs.protocol.friends.v1.ReceivedInvitation.invitation_message) -} -inline void ReceivedInvitation::set_invitation_message(const char* value, size_t size) { - set_has_invitation_message(); - if (invitation_message_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { - invitation_message_ = new ::std::string; - } - invitation_message_->assign(reinterpret_cast<const char*>(value), size); - // @@protoc_insertion_point(field_set_pointer:bgs.protocol.friends.v1.ReceivedInvitation.invitation_message) -} -inline ::std::string* ReceivedInvitation::mutable_invitation_message() { - set_has_invitation_message(); - if (invitation_message_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { - invitation_message_ = new ::std::string; - } - // @@protoc_insertion_point(field_mutable:bgs.protocol.friends.v1.ReceivedInvitation.invitation_message) - return invitation_message_; -} -inline ::std::string* ReceivedInvitation::release_invitation_message() { - clear_has_invitation_message(); - if (invitation_message_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { - return NULL; - } else { - ::std::string* temp = invitation_message_; - invitation_message_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - return temp; - } -} -inline void ReceivedInvitation::set_allocated_invitation_message(::std::string* invitation_message) { - if (invitation_message_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { - delete invitation_message_; - } - if (invitation_message) { - set_has_invitation_message(); - invitation_message_ = invitation_message; - } else { - clear_has_invitation_message(); - invitation_message_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - } - // @@protoc_insertion_point(field_set_allocated:bgs.protocol.friends.v1.ReceivedInvitation.invitation_message) -} - // optional uint64 creation_time = 7; inline bool ReceivedInvitation::has_creation_time() const { - return (_has_bits_[0] & 0x00000040u) != 0; + return (_has_bits_[0] & 0x00000020u) != 0; } inline void ReceivedInvitation::set_has_creation_time() { - _has_bits_[0] |= 0x00000040u; + _has_bits_[0] |= 0x00000020u; } inline void ReceivedInvitation::clear_has_creation_time() { - _has_bits_[0] &= ~0x00000040u; + _has_bits_[0] &= ~0x00000020u; } inline void ReceivedInvitation::clear_creation_time() { creation_time_ = GOOGLE_ULONGLONG(0); @@ -1932,39 +1831,15 @@ inline void ReceivedInvitation::set_creation_time(::google::protobuf::uint64 val // @@protoc_insertion_point(field_set:bgs.protocol.friends.v1.ReceivedInvitation.creation_time) } -// optional uint64 expiration_time = 8; -inline bool ReceivedInvitation::has_expiration_time() const { - return (_has_bits_[0] & 0x00000080u) != 0; -} -inline void ReceivedInvitation::set_has_expiration_time() { - _has_bits_[0] |= 0x00000080u; -} -inline void ReceivedInvitation::clear_has_expiration_time() { - _has_bits_[0] &= ~0x00000080u; -} -inline void ReceivedInvitation::clear_expiration_time() { - expiration_time_ = GOOGLE_ULONGLONG(0); - clear_has_expiration_time(); -} -inline ::google::protobuf::uint64 ReceivedInvitation::expiration_time() const { - // @@protoc_insertion_point(field_get:bgs.protocol.friends.v1.ReceivedInvitation.expiration_time) - return expiration_time_; -} -inline void ReceivedInvitation::set_expiration_time(::google::protobuf::uint64 value) { - set_has_expiration_time(); - expiration_time_ = value; - // @@protoc_insertion_point(field_set:bgs.protocol.friends.v1.ReceivedInvitation.expiration_time) -} - // optional fixed32 program = 9; inline bool ReceivedInvitation::has_program() const { - return (_has_bits_[0] & 0x00000100u) != 0; + return (_has_bits_[0] & 0x00000040u) != 0; } inline void ReceivedInvitation::set_has_program() { - _has_bits_[0] |= 0x00000100u; + _has_bits_[0] |= 0x00000040u; } inline void ReceivedInvitation::clear_has_program() { - _has_bits_[0] &= ~0x00000100u; + _has_bits_[0] &= ~0x00000040u; } inline void ReceivedInvitation::clear_program() { program_ = 0u; @@ -2570,7 +2445,7 @@ inline void FriendInvitationParams::set_program(::google::protobuf::uint32 value // SubscribeResponse -// optional uint32 max_friends = 1; +// optional uint32 max_friends = 1 [deprecated = true]; inline bool SubscribeResponse::has_max_friends() const { return (_has_bits_[0] & 0x00000001u) != 0; } @@ -2594,7 +2469,7 @@ inline void SubscribeResponse::set_max_friends(::google::protobuf::uint32 value) // @@protoc_insertion_point(field_set:bgs.protocol.friends.v1.SubscribeResponse.max_friends) } -// optional uint32 max_received_invitations = 2; +// optional uint32 max_received_invitations = 2 [deprecated = true]; inline bool SubscribeResponse::has_max_received_invitations() const { return (_has_bits_[0] & 0x00000002u) != 0; } @@ -2618,7 +2493,7 @@ inline void SubscribeResponse::set_max_received_invitations(::google::protobuf:: // @@protoc_insertion_point(field_set:bgs.protocol.friends.v1.SubscribeResponse.max_received_invitations) } -// optional uint32 max_sent_invitations = 3; +// optional uint32 max_sent_invitations = 3 [deprecated = true]; inline bool SubscribeResponse::has_max_sent_invitations() const { return (_has_bits_[0] & 0x00000004u) != 0; } diff --git a/src/server/proto/Client/game_utilities_service.pb.cc b/src/server/proto/Client/game_utilities_service.pb.cc index 928082f3aca..f4577e1d77f 100644 --- a/src/server/proto/Client/game_utilities_service.pb.cc +++ b/src/server/proto/Client/game_utilities_service.pb.cc @@ -66,6 +66,15 @@ const ::google::protobuf::internal::GeneratedMessageReflection* const ::google::protobuf::Descriptor* GetAllValuesForAttributeResponse_descriptor_ = NULL; const ::google::protobuf::internal::GeneratedMessageReflection* GetAllValuesForAttributeResponse_reflection_ = NULL; +const ::google::protobuf::Descriptor* RegisterUtilitiesRequest_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + RegisterUtilitiesRequest_reflection_ = NULL; +const ::google::protobuf::Descriptor* RegisterUtilitiesResponse_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + RegisterUtilitiesResponse_reflection_ = NULL; +const ::google::protobuf::Descriptor* UnregisterUtilitiesRequest_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + UnregisterUtilitiesRequest_reflection_ = NULL; const ::google::protobuf::ServiceDescriptor* GameUtilitiesService_descriptor_ = NULL; } // namespace @@ -289,6 +298,51 @@ void protobuf_AssignDesc_game_5futilities_5fservice_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(GetAllValuesForAttributeResponse)); + RegisterUtilitiesRequest_descriptor_ = file->message_type(13); + static const int RegisterUtilitiesRequest_offsets_[2] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RegisterUtilitiesRequest, attribute_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RegisterUtilitiesRequest, program_), + }; + RegisterUtilitiesRequest_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + RegisterUtilitiesRequest_descriptor_, + RegisterUtilitiesRequest::default_instance_, + RegisterUtilitiesRequest_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RegisterUtilitiesRequest, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RegisterUtilitiesRequest, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(RegisterUtilitiesRequest)); + RegisterUtilitiesResponse_descriptor_ = file->message_type(14); + static const int RegisterUtilitiesResponse_offsets_[1] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RegisterUtilitiesResponse, client_id_), + }; + RegisterUtilitiesResponse_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + RegisterUtilitiesResponse_descriptor_, + RegisterUtilitiesResponse::default_instance_, + RegisterUtilitiesResponse_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RegisterUtilitiesResponse, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RegisterUtilitiesResponse, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(RegisterUtilitiesResponse)); + UnregisterUtilitiesRequest_descriptor_ = file->message_type(15); + static const int UnregisterUtilitiesRequest_offsets_[1] = { + }; + UnregisterUtilitiesRequest_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + UnregisterUtilitiesRequest_descriptor_, + UnregisterUtilitiesRequest::default_instance_, + UnregisterUtilitiesRequest_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UnregisterUtilitiesRequest, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UnregisterUtilitiesRequest, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(UnregisterUtilitiesRequest)); GameUtilitiesService_descriptor_ = file->service(0); } @@ -328,6 +382,12 @@ void protobuf_RegisterTypes(const ::std::string&) { GetAllValuesForAttributeRequest_descriptor_, &GetAllValuesForAttributeRequest::default_instance()); ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( GetAllValuesForAttributeResponse_descriptor_, &GetAllValuesForAttributeResponse::default_instance()); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + RegisterUtilitiesRequest_descriptor_, &RegisterUtilitiesRequest::default_instance()); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + RegisterUtilitiesResponse_descriptor_, &RegisterUtilitiesResponse::default_instance()); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + UnregisterUtilitiesRequest_descriptor_, &UnregisterUtilitiesRequest::default_instance()); } } // namespace @@ -359,6 +419,12 @@ void protobuf_ShutdownFile_game_5futilities_5fservice_2eproto() { delete GetAllValuesForAttributeRequest_reflection_; delete GetAllValuesForAttributeResponse::default_instance_; delete GetAllValuesForAttributeResponse_reflection_; + delete RegisterUtilitiesRequest::default_instance_; + delete RegisterUtilitiesRequest_reflection_; + delete RegisterUtilitiesResponse::default_instance_; + delete RegisterUtilitiesResponse_reflection_; + delete UnregisterUtilitiesRequest::default_instance_; + delete UnregisterUtilitiesRequest_reflection_; } void protobuf_AddDesc_game_5futilities_5fservice_2eproto() { @@ -417,38 +483,49 @@ void protobuf_AddDesc_game_5futilities_5fservice_2eproto() { "(\t\022(\n\010agent_id\030\002 \001(\0132\026.bgs.protocol.Enti" "tyId\022\017\n\007program\030\005 \001(\007\"R\n GetAllValuesFor" "AttributeResponse\022.\n\017attribute_value\030\001 \003" - "(\0132\025.bgs.protocol.Variant2\220\t\n\024GameUtilit" - "iesService\022}\n\024ProcessClientRequest\022-.bgs" - ".protocol.game_utilities.v1.ClientReques" - "t\032..bgs.protocol.game_utilities.v1.Clien" - "tResponse\"\006\202\371+\002\010\001\022u\n\026PresenceChannelCrea" - "ted\022=.bgs.protocol.game_utilities.v1.Pre" - "senceChannelCreatedRequest\032\024.bgs.protoco" - "l.NoData\"\006\202\371+\002\010\002\022\223\001\n\022GetPlayerVariables\022" - "9.bgs.protocol.game_utilities.v1.GetPlay" - "erVariablesRequest\032:.bgs.protocol.game_u" - "tilities.v1.GetPlayerVariablesResponse\"\006" - "\202\371+\002\010\003\022}\n\024ProcessServerRequest\022-.bgs.pro" - "tocol.game_utilities.v1.ServerRequest\032.." - "bgs.protocol.game_utilities.v1.ServerRes" - "ponse\"\006\202\371+\002\010\006\022w\n\023OnGameAccountOnline\022=.b" - "gs.protocol.game_utilities.v1.GameAccoun" - "tOnlineNotification\032\031.bgs.protocol.NO_RE" - "SPONSE\"\006\202\371+\002\010\007\022y\n\024OnGameAccountOffline\022>" - ".bgs.protocol.game_utilities.v1.GameAcco" - "untOfflineNotification\032\031.bgs.protocol.NO" - "_RESPONSE\"\006\202\371+\002\010\010\022\226\001\n\023GetAchievementsFil" - "e\022:.bgs.protocol.game_utilities.v1.GetAc" - "hievementsFileRequest\032;.bgs.protocol.gam" - "e_utilities.v1.GetAchievementsFileRespon" - "se\"\006\202\371+\002\010\t\022\245\001\n\030GetAllValuesForAttribute\022" - "\?.bgs.protocol.game_utilities.v1.GetAllV" - "aluesForAttributeRequest\032@.bgs.protocol." - "game_utilities.v1.GetAllValuesForAttribu" - "teResponse\"\006\202\371+\002\010\n\0328\202\371+,\n*bnet.protocol." - "game_utilities.GameUtilities\212\371+\004\010\001\020\001BD\n\037" - "bnet.protocol.game_utilities.v1B\031GameUti" - "litiesServiceProtoH\001\200\001\000\210\001\001", 3026); + "(\0132\025.bgs.protocol.Variant\"W\n\030RegisterUti" + "litiesRequest\022*\n\tattribute\030\001 \003(\0132\027.bgs.p" + "rotocol.Attribute\022\017\n\007program\030\002 \001(\007\".\n\031Re" + "gisterUtilitiesResponse\022\021\n\tclient_id\030\001 \001" + "(\t\"\034\n\032UnregisterUtilitiesRequest2\251\013\n\024Gam" + "eUtilitiesService\022}\n\024ProcessClientReques" + "t\022-.bgs.protocol.game_utilities.v1.Clien" + "tRequest\032..bgs.protocol.game_utilities.v" + "1.ClientResponse\"\006\202\371+\002\010\001\022u\n\026PresenceChan" + "nelCreated\022=.bgs.protocol.game_utilities" + ".v1.PresenceChannelCreatedRequest\032\024.bgs." + "protocol.NoData\"\006\202\371+\002\010\002\022\223\001\n\022GetPlayerVar" + "iables\0229.bgs.protocol.game_utilities.v1." + "GetPlayerVariablesRequest\032:.bgs.protocol" + ".game_utilities.v1.GetPlayerVariablesRes" + "ponse\"\006\202\371+\002\010\003\022}\n\024ProcessServerRequest\022-." + "bgs.protocol.game_utilities.v1.ServerReq" + "uest\032..bgs.protocol.game_utilities.v1.Se" + "rverResponse\"\006\202\371+\002\010\006\022w\n\023OnGameAccountOnl" + "ine\022=.bgs.protocol.game_utilities.v1.Gam" + "eAccountOnlineNotification\032\031.bgs.protoco" + "l.NO_RESPONSE\"\006\202\371+\002\010\007\022y\n\024OnGameAccountOf" + "fline\022>.bgs.protocol.game_utilities.v1.G" + "ameAccountOfflineNotification\032\031.bgs.prot" + "ocol.NO_RESPONSE\"\006\202\371+\002\010\010\022\226\001\n\023GetAchievem" + "entsFile\022:.bgs.protocol.game_utilities.v" + "1.GetAchievementsFileRequest\032;.bgs.proto" + "col.game_utilities.v1.GetAchievementsFil" + "eResponse\"\006\202\371+\002\010\t\022\245\001\n\030GetAllValuesForAtt" + "ribute\022\?.bgs.protocol.game_utilities.v1." + "GetAllValuesForAttributeRequest\032@.bgs.pr" + "otocol.game_utilities.v1.GetAllValuesFor" + "AttributeResponse\"\006\202\371+\002\010\n\022\220\001\n\021RegisterUt" + "ilities\0228.bgs.protocol.game_utilities.v1" + ".RegisterUtilitiesRequest\0329.bgs.protocol" + ".game_utilities.v1.RegisterUtilitiesResp" + "onse\"\006\202\371+\002\010\013\022t\n\023UnregisterUtilities\022:.bg" + "s.protocol.game_utilities.v1.UnregisterU" + "tilitiesRequest\032\031.bgs.protocol.NO_RESPON" + "SE\"\006\202\371+\002\010\014\032H\202\371+<\n*bnet.protocol.game_uti" + "lities.GameUtilities*\016game_utilities\212\371+\004" + "\010\001\020\001BD\n\037bnet.protocol.game_utilities.v1B" + "\031GameUtilitiesServiceProtoH\001\200\001\000\210\001\001", 3474); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "game_utilities_service.proto", &protobuf_RegisterTypes); ClientRequest::default_instance_ = new ClientRequest(); @@ -464,6 +541,9 @@ void protobuf_AddDesc_game_5futilities_5fservice_2eproto() { GetAchievementsFileResponse::default_instance_ = new GetAchievementsFileResponse(); GetAllValuesForAttributeRequest::default_instance_ = new GetAllValuesForAttributeRequest(); GetAllValuesForAttributeResponse::default_instance_ = new GetAllValuesForAttributeResponse(); + RegisterUtilitiesRequest::default_instance_ = new RegisterUtilitiesRequest(); + RegisterUtilitiesResponse::default_instance_ = new RegisterUtilitiesResponse(); + UnregisterUtilitiesRequest::default_instance_ = new UnregisterUtilitiesRequest(); ClientRequest::default_instance_->InitAsDefaultInstance(); ClientResponse::default_instance_->InitAsDefaultInstance(); ServerRequest::default_instance_->InitAsDefaultInstance(); @@ -477,6 +557,9 @@ void protobuf_AddDesc_game_5futilities_5fservice_2eproto() { GetAchievementsFileResponse::default_instance_->InitAsDefaultInstance(); GetAllValuesForAttributeRequest::default_instance_->InitAsDefaultInstance(); GetAllValuesForAttributeResponse::default_instance_->InitAsDefaultInstance(); + RegisterUtilitiesRequest::default_instance_->InitAsDefaultInstance(); + RegisterUtilitiesResponse::default_instance_->InitAsDefaultInstance(); + UnregisterUtilitiesRequest::default_instance_->InitAsDefaultInstance(); ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_game_5futilities_5fservice_2eproto); } @@ -4242,6 +4325,684 @@ void GetAllValuesForAttributeResponse::Swap(GetAllValuesForAttributeResponse* ot // =================================================================== +#ifndef _MSC_VER +const int RegisterUtilitiesRequest::kAttributeFieldNumber; +const int RegisterUtilitiesRequest::kProgramFieldNumber; +#endif // !_MSC_VER + +RegisterUtilitiesRequest::RegisterUtilitiesRequest() + : ::google::protobuf::Message() { + SharedCtor(); + // @@protoc_insertion_point(constructor:bgs.protocol.game_utilities.v1.RegisterUtilitiesRequest) +} + +void RegisterUtilitiesRequest::InitAsDefaultInstance() { +} + +RegisterUtilitiesRequest::RegisterUtilitiesRequest(const RegisterUtilitiesRequest& from) + : ::google::protobuf::Message() { + SharedCtor(); + MergeFrom(from); + // @@protoc_insertion_point(copy_constructor:bgs.protocol.game_utilities.v1.RegisterUtilitiesRequest) +} + +void RegisterUtilitiesRequest::SharedCtor() { + _cached_size_ = 0; + program_ = 0u; + ::memset(_has_bits_, 0, sizeof(_has_bits_)); +} + +RegisterUtilitiesRequest::~RegisterUtilitiesRequest() { + // @@protoc_insertion_point(destructor:bgs.protocol.game_utilities.v1.RegisterUtilitiesRequest) + SharedDtor(); +} + +void RegisterUtilitiesRequest::SharedDtor() { + if (this != default_instance_) { + } +} + +void RegisterUtilitiesRequest::SetCachedSize(int size) const { + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); +} +const ::google::protobuf::Descriptor* RegisterUtilitiesRequest::descriptor() { + protobuf_AssignDescriptorsOnce(); + return RegisterUtilitiesRequest_descriptor_; +} + +const RegisterUtilitiesRequest& RegisterUtilitiesRequest::default_instance() { + if (default_instance_ == NULL) protobuf_AddDesc_game_5futilities_5fservice_2eproto(); + return *default_instance_; +} + +RegisterUtilitiesRequest* RegisterUtilitiesRequest::default_instance_ = NULL; + +RegisterUtilitiesRequest* RegisterUtilitiesRequest::New() const { + return new RegisterUtilitiesRequest; +} + +void RegisterUtilitiesRequest::Clear() { + program_ = 0u; + attribute_.Clear(); + ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); +} + +bool RegisterUtilitiesRequest::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:bgs.protocol.game_utilities.v1.RegisterUtilitiesRequest) + for (;;) { + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // repeated .bgs.protocol.Attribute attribute = 1; + case 1: { + if (tag == 10) { + parse_attribute: + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, add_attribute())); + } else { + goto handle_unusual; + } + if (input->ExpectTag(10)) goto parse_attribute; + if (input->ExpectTag(21)) goto parse_program; + break; + } + + // optional fixed32 program = 2; + case 2: { + if (tag == 21) { + parse_program: + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_FIXED32>( + input, &program_))); + set_has_program(); + } else { + goto handle_unusual; + } + if (input->ExpectAtEnd()) goto success; + break; + } + + default: { + handle_unusual: + if (tag == 0 || + ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:bgs.protocol.game_utilities.v1.RegisterUtilitiesRequest) + return true; +failure: + // @@protoc_insertion_point(parse_failure:bgs.protocol.game_utilities.v1.RegisterUtilitiesRequest) + return false; +#undef DO_ +} + +void RegisterUtilitiesRequest::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:bgs.protocol.game_utilities.v1.RegisterUtilitiesRequest) + // repeated .bgs.protocol.Attribute attribute = 1; + for (int i = 0; i < this->attribute_size(); i++) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, this->attribute(i), output); + } + + // optional fixed32 program = 2; + if (has_program()) { + ::google::protobuf::internal::WireFormatLite::WriteFixed32(2, this->program(), output); + } + + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:bgs.protocol.game_utilities.v1.RegisterUtilitiesRequest) +} + +::google::protobuf::uint8* RegisterUtilitiesRequest::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.game_utilities.v1.RegisterUtilitiesRequest) + // repeated .bgs.protocol.Attribute attribute = 1; + for (int i = 0; i < this->attribute_size(); i++) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 1, this->attribute(i), target); + } + + // optional fixed32 program = 2; + if (has_program()) { + target = ::google::protobuf::internal::WireFormatLite::WriteFixed32ToArray(2, this->program(), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.game_utilities.v1.RegisterUtilitiesRequest) + return target; +} + +int RegisterUtilitiesRequest::ByteSize() const { + int total_size = 0; + + if (_has_bits_[1 / 32] & (0xffu << (1 % 32))) { + // optional fixed32 program = 2; + if (has_program()) { + total_size += 1 + 4; + } + + } + // repeated .bgs.protocol.Attribute attribute = 1; + total_size += 1 * this->attribute_size(); + for (int i = 0; i < this->attribute_size(); i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->attribute(i)); + } + + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = total_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} + +void RegisterUtilitiesRequest::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const RegisterUtilitiesRequest* source = + ::google::protobuf::internal::dynamic_cast_if_available<const RegisterUtilitiesRequest*>( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } +} + +void RegisterUtilitiesRequest::MergeFrom(const RegisterUtilitiesRequest& from) { + GOOGLE_CHECK_NE(&from, this); + attribute_.MergeFrom(from.attribute_); + if (from._has_bits_[1 / 32] & (0xffu << (1 % 32))) { + if (from.has_program()) { + set_program(from.program()); + } + } + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void RegisterUtilitiesRequest::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void RegisterUtilitiesRequest::CopyFrom(const RegisterUtilitiesRequest& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool RegisterUtilitiesRequest::IsInitialized() const { + + if (!::google::protobuf::internal::AllAreInitialized(this->attribute())) return false; + return true; +} + +void RegisterUtilitiesRequest::Swap(RegisterUtilitiesRequest* other) { + if (other != this) { + attribute_.Swap(&other->attribute_); + std::swap(program_, other->program_); + std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); + std::swap(_cached_size_, other->_cached_size_); + } +} + +::google::protobuf::Metadata RegisterUtilitiesRequest::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = RegisterUtilitiesRequest_descriptor_; + metadata.reflection = RegisterUtilitiesRequest_reflection_; + return metadata; +} + + +// =================================================================== + +#ifndef _MSC_VER +const int RegisterUtilitiesResponse::kClientIdFieldNumber; +#endif // !_MSC_VER + +RegisterUtilitiesResponse::RegisterUtilitiesResponse() + : ::google::protobuf::Message() { + SharedCtor(); + // @@protoc_insertion_point(constructor:bgs.protocol.game_utilities.v1.RegisterUtilitiesResponse) +} + +void RegisterUtilitiesResponse::InitAsDefaultInstance() { +} + +RegisterUtilitiesResponse::RegisterUtilitiesResponse(const RegisterUtilitiesResponse& from) + : ::google::protobuf::Message() { + SharedCtor(); + MergeFrom(from); + // @@protoc_insertion_point(copy_constructor:bgs.protocol.game_utilities.v1.RegisterUtilitiesResponse) +} + +void RegisterUtilitiesResponse::SharedCtor() { + ::google::protobuf::internal::GetEmptyString(); + _cached_size_ = 0; + client_id_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + ::memset(_has_bits_, 0, sizeof(_has_bits_)); +} + +RegisterUtilitiesResponse::~RegisterUtilitiesResponse() { + // @@protoc_insertion_point(destructor:bgs.protocol.game_utilities.v1.RegisterUtilitiesResponse) + SharedDtor(); +} + +void RegisterUtilitiesResponse::SharedDtor() { + if (client_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + delete client_id_; + } + if (this != default_instance_) { + } +} + +void RegisterUtilitiesResponse::SetCachedSize(int size) const { + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); +} +const ::google::protobuf::Descriptor* RegisterUtilitiesResponse::descriptor() { + protobuf_AssignDescriptorsOnce(); + return RegisterUtilitiesResponse_descriptor_; +} + +const RegisterUtilitiesResponse& RegisterUtilitiesResponse::default_instance() { + if (default_instance_ == NULL) protobuf_AddDesc_game_5futilities_5fservice_2eproto(); + return *default_instance_; +} + +RegisterUtilitiesResponse* RegisterUtilitiesResponse::default_instance_ = NULL; + +RegisterUtilitiesResponse* RegisterUtilitiesResponse::New() const { + return new RegisterUtilitiesResponse; +} + +void RegisterUtilitiesResponse::Clear() { + if (has_client_id()) { + if (client_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + client_id_->clear(); + } + } + ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); +} + +bool RegisterUtilitiesResponse::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:bgs.protocol.game_utilities.v1.RegisterUtilitiesResponse) + for (;;) { + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // optional string client_id = 1; + case 1: { + if (tag == 10) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_client_id())); + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->client_id().data(), this->client_id().length(), + ::google::protobuf::internal::WireFormat::PARSE, + "client_id"); + } else { + goto handle_unusual; + } + if (input->ExpectAtEnd()) goto success; + break; + } + + default: { + handle_unusual: + if (tag == 0 || + ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:bgs.protocol.game_utilities.v1.RegisterUtilitiesResponse) + return true; +failure: + // @@protoc_insertion_point(parse_failure:bgs.protocol.game_utilities.v1.RegisterUtilitiesResponse) + return false; +#undef DO_ +} + +void RegisterUtilitiesResponse::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:bgs.protocol.game_utilities.v1.RegisterUtilitiesResponse) + // optional string client_id = 1; + if (has_client_id()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->client_id().data(), this->client_id().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "client_id"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 1, this->client_id(), output); + } + + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:bgs.protocol.game_utilities.v1.RegisterUtilitiesResponse) +} + +::google::protobuf::uint8* RegisterUtilitiesResponse::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.game_utilities.v1.RegisterUtilitiesResponse) + // optional string client_id = 1; + if (has_client_id()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->client_id().data(), this->client_id().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "client_id"); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 1, this->client_id(), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.game_utilities.v1.RegisterUtilitiesResponse) + return target; +} + +int RegisterUtilitiesResponse::ByteSize() const { + int total_size = 0; + + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { + // optional string client_id = 1; + if (has_client_id()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->client_id()); + } + + } + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = total_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} + +void RegisterUtilitiesResponse::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const RegisterUtilitiesResponse* source = + ::google::protobuf::internal::dynamic_cast_if_available<const RegisterUtilitiesResponse*>( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } +} + +void RegisterUtilitiesResponse::MergeFrom(const RegisterUtilitiesResponse& from) { + GOOGLE_CHECK_NE(&from, this); + if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from.has_client_id()) { + set_client_id(from.client_id()); + } + } + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void RegisterUtilitiesResponse::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void RegisterUtilitiesResponse::CopyFrom(const RegisterUtilitiesResponse& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool RegisterUtilitiesResponse::IsInitialized() const { + + return true; +} + +void RegisterUtilitiesResponse::Swap(RegisterUtilitiesResponse* other) { + if (other != this) { + std::swap(client_id_, other->client_id_); + std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); + std::swap(_cached_size_, other->_cached_size_); + } +} + +::google::protobuf::Metadata RegisterUtilitiesResponse::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = RegisterUtilitiesResponse_descriptor_; + metadata.reflection = RegisterUtilitiesResponse_reflection_; + return metadata; +} + + +// =================================================================== + +#ifndef _MSC_VER +#endif // !_MSC_VER + +UnregisterUtilitiesRequest::UnregisterUtilitiesRequest() + : ::google::protobuf::Message() { + SharedCtor(); + // @@protoc_insertion_point(constructor:bgs.protocol.game_utilities.v1.UnregisterUtilitiesRequest) +} + +void UnregisterUtilitiesRequest::InitAsDefaultInstance() { +} + +UnregisterUtilitiesRequest::UnregisterUtilitiesRequest(const UnregisterUtilitiesRequest& from) + : ::google::protobuf::Message() { + SharedCtor(); + MergeFrom(from); + // @@protoc_insertion_point(copy_constructor:bgs.protocol.game_utilities.v1.UnregisterUtilitiesRequest) +} + +void UnregisterUtilitiesRequest::SharedCtor() { + _cached_size_ = 0; + ::memset(_has_bits_, 0, sizeof(_has_bits_)); +} + +UnregisterUtilitiesRequest::~UnregisterUtilitiesRequest() { + // @@protoc_insertion_point(destructor:bgs.protocol.game_utilities.v1.UnregisterUtilitiesRequest) + SharedDtor(); +} + +void UnregisterUtilitiesRequest::SharedDtor() { + if (this != default_instance_) { + } +} + +void UnregisterUtilitiesRequest::SetCachedSize(int size) const { + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); +} +const ::google::protobuf::Descriptor* UnregisterUtilitiesRequest::descriptor() { + protobuf_AssignDescriptorsOnce(); + return UnregisterUtilitiesRequest_descriptor_; +} + +const UnregisterUtilitiesRequest& UnregisterUtilitiesRequest::default_instance() { + if (default_instance_ == NULL) protobuf_AddDesc_game_5futilities_5fservice_2eproto(); + return *default_instance_; +} + +UnregisterUtilitiesRequest* UnregisterUtilitiesRequest::default_instance_ = NULL; + +UnregisterUtilitiesRequest* UnregisterUtilitiesRequest::New() const { + return new UnregisterUtilitiesRequest; +} + +void UnregisterUtilitiesRequest::Clear() { + ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); +} + +bool UnregisterUtilitiesRequest::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:bgs.protocol.game_utilities.v1.UnregisterUtilitiesRequest) + for (;;) { + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + tag = p.first; + if (!p.second) goto handle_unusual; + handle_unusual: + if (tag == 0 || + ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); + } +success: + // @@protoc_insertion_point(parse_success:bgs.protocol.game_utilities.v1.UnregisterUtilitiesRequest) + return true; +failure: + // @@protoc_insertion_point(parse_failure:bgs.protocol.game_utilities.v1.UnregisterUtilitiesRequest) + return false; +#undef DO_ +} + +void UnregisterUtilitiesRequest::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:bgs.protocol.game_utilities.v1.UnregisterUtilitiesRequest) + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:bgs.protocol.game_utilities.v1.UnregisterUtilitiesRequest) +} + +::google::protobuf::uint8* UnregisterUtilitiesRequest::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.game_utilities.v1.UnregisterUtilitiesRequest) + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.game_utilities.v1.UnregisterUtilitiesRequest) + return target; +} + +int UnregisterUtilitiesRequest::ByteSize() const { + int total_size = 0; + + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = total_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} + +void UnregisterUtilitiesRequest::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const UnregisterUtilitiesRequest* source = + ::google::protobuf::internal::dynamic_cast_if_available<const UnregisterUtilitiesRequest*>( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } +} + +void UnregisterUtilitiesRequest::MergeFrom(const UnregisterUtilitiesRequest& from) { + GOOGLE_CHECK_NE(&from, this); + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void UnregisterUtilitiesRequest::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void UnregisterUtilitiesRequest::CopyFrom(const UnregisterUtilitiesRequest& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool UnregisterUtilitiesRequest::IsInitialized() const { + + return true; +} + +void UnregisterUtilitiesRequest::Swap(UnregisterUtilitiesRequest* other) { + if (other != this) { + _unknown_fields_.Swap(&other->_unknown_fields_); + std::swap(_cached_size_, other->_cached_size_); + } +} + +::google::protobuf::Metadata UnregisterUtilitiesRequest::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = UnregisterUtilitiesRequest_descriptor_; + metadata.reflection = UnregisterUtilitiesRequest_reflection_; + return metadata; +} + + +// =================================================================== + GameUtilitiesService::GameUtilitiesService(bool use_original_hash) : service_hash_(use_original_hash ? OriginalHash::value : NameHash::value) { } @@ -4331,6 +5092,23 @@ void GameUtilitiesService::GetAllValuesForAttribute(::bgs::protocol::game_utilit SendRequest(service_hash_, 10, request, std::move(callback)); } +void GameUtilitiesService::RegisterUtilities(::bgs::protocol::game_utilities::v1::RegisterUtilitiesRequest const* request, std::function<void(::bgs::protocol::game_utilities::v1::RegisterUtilitiesResponse const*)> responseCallback) { + TC_LOG_DEBUG("service.protobuf", "%s Server called client method GameUtilitiesService.RegisterUtilities(bgs.protocol.game_utilities.v1.RegisterUtilitiesRequest{ %s })", + GetCallerInfo().c_str(), request->ShortDebugString().c_str()); + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { + ::bgs::protocol::game_utilities::v1::RegisterUtilitiesResponse response; + if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) + responseCallback(&response); + }; + SendRequest(service_hash_, 11, request, std::move(callback)); +} + +void GameUtilitiesService::UnregisterUtilities(::bgs::protocol::game_utilities::v1::UnregisterUtilitiesRequest const* request) { + TC_LOG_DEBUG("service.protobuf", "%s Server called client method GameUtilitiesService.UnregisterUtilities(bgs.protocol.game_utilities.v1.UnregisterUtilitiesRequest{ %s })", + GetCallerInfo().c_str(), request->ShortDebugString().c_str()); + SendRequest(service_hash_, 12, request); +} + void GameUtilitiesService::CallServerMethod(uint32 token, uint32 methodId, MessageBuffer buffer) { switch(methodId) { case 1: { @@ -4517,6 +5295,46 @@ void GameUtilitiesService::CallServerMethod(uint32 token, uint32 methodId, Messa continuation(this, status, &response); break; } + case 11: { + ::bgs::protocol::game_utilities::v1::RegisterUtilitiesRequest request; + if (!request.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) { + TC_LOG_DEBUG("service.protobuf", "%s Failed to parse request for GameUtilitiesService.RegisterUtilities server method call.", GetCallerInfo().c_str()); + SendResponse(service_hash_, 11, token, ERROR_RPC_MALFORMED_REQUEST); + return; + } + TC_LOG_DEBUG("service.protobuf", "%s Client called server method GameUtilitiesService.RegisterUtilities(bgs.protocol.game_utilities.v1.RegisterUtilitiesRequest{ %s }).", + GetCallerInfo().c_str(), request.ShortDebugString().c_str()); + std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)> continuation = [token](ServiceBase* service, uint32 status, ::google::protobuf::Message const* response) + { + ASSERT(response->GetDescriptor() == ::bgs::protocol::game_utilities::v1::RegisterUtilitiesResponse::descriptor()); + GameUtilitiesService* self = static_cast<GameUtilitiesService*>(service); + TC_LOG_DEBUG("service.protobuf", "%s Client called server method GameUtilitiesService.RegisterUtilities() returned bgs.protocol.game_utilities.v1.RegisterUtilitiesResponse{ %s } status %u.", + self->GetCallerInfo().c_str(), response->ShortDebugString().c_str(), status); + if (!status) + self->SendResponse(self->service_hash_, 11, token, response); + else + self->SendResponse(self->service_hash_, 11, token, status); + }; + ::bgs::protocol::game_utilities::v1::RegisterUtilitiesResponse response; + uint32 status = HandleRegisterUtilities(&request, &response, continuation); + if (continuation) + continuation(this, status, &response); + break; + } + case 12: { + ::bgs::protocol::game_utilities::v1::UnregisterUtilitiesRequest request; + if (!request.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) { + TC_LOG_DEBUG("service.protobuf", "%s Failed to parse request for GameUtilitiesService.UnregisterUtilities server method call.", GetCallerInfo().c_str()); + SendResponse(service_hash_, 12, token, ERROR_RPC_MALFORMED_REQUEST); + return; + } + uint32 status = HandleUnregisterUtilities(&request); + TC_LOG_DEBUG("service.protobuf", "%s Client called server method GameUtilitiesService.UnregisterUtilities(bgs.protocol.game_utilities.v1.UnregisterUtilitiesRequest{ %s }) status %u.", + GetCallerInfo().c_str(), request.ShortDebugString().c_str(), status); + if (status) + SendResponse(service_hash_, 12, token, status); + break; + } default: TC_LOG_ERROR("service.protobuf", "Bad method id %u.", methodId); SendResponse(service_hash_, methodId, token, ERROR_RPC_INVALID_METHOD); @@ -4572,6 +5390,18 @@ uint32 GameUtilitiesService::HandleGetAllValuesForAttribute(::bgs::protocol::gam return ERROR_RPC_NOT_IMPLEMENTED; } +uint32 GameUtilitiesService::HandleRegisterUtilities(::bgs::protocol::game_utilities::v1::RegisterUtilitiesRequest const* request, ::bgs::protocol::game_utilities::v1::RegisterUtilitiesResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) { + TC_LOG_ERROR("service.protobuf", "%s Client tried to call not implemented method GameUtilitiesService.RegisterUtilities({ %s })", + GetCallerInfo().c_str(), request->ShortDebugString().c_str()); + return ERROR_RPC_NOT_IMPLEMENTED; +} + +uint32 GameUtilitiesService::HandleUnregisterUtilities(::bgs::protocol::game_utilities::v1::UnregisterUtilitiesRequest const* request) { + TC_LOG_ERROR("service.protobuf", "%s Client tried to call not implemented method GameUtilitiesService.UnregisterUtilities({ %s })", + GetCallerInfo().c_str(), request->ShortDebugString().c_str()); + return ERROR_RPC_NOT_IMPLEMENTED; +} + // @@protoc_insertion_point(namespace_scope) diff --git a/src/server/proto/Client/game_utilities_service.pb.h b/src/server/proto/Client/game_utilities_service.pb.h index 4ff00feb03d..f7ecb4ce696 100644 --- a/src/server/proto/Client/game_utilities_service.pb.h +++ b/src/server/proto/Client/game_utilities_service.pb.h @@ -58,6 +58,9 @@ class GetAchievementsFileRequest; class GetAchievementsFileResponse; class GetAllValuesForAttributeRequest; class GetAllValuesForAttributeResponse; +class RegisterUtilitiesRequest; +class RegisterUtilitiesResponse; +class UnregisterUtilitiesRequest; // =================================================================== @@ -1326,6 +1329,251 @@ class TC_PROTO_API GetAllValuesForAttributeResponse : public ::google::protobuf: void InitAsDefaultInstance(); static GetAllValuesForAttributeResponse* default_instance_; }; +// ------------------------------------------------------------------- + +class TC_PROTO_API RegisterUtilitiesRequest : public ::google::protobuf::Message { + public: + RegisterUtilitiesRequest(); + virtual ~RegisterUtilitiesRequest(); + + RegisterUtilitiesRequest(const RegisterUtilitiesRequest& from); + + inline RegisterUtilitiesRequest& operator=(const RegisterUtilitiesRequest& from) { + CopyFrom(from); + return *this; + } + + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); + static const RegisterUtilitiesRequest& default_instance(); + + void Swap(RegisterUtilitiesRequest* other); + + // implements Message ---------------------------------------------- + + RegisterUtilitiesRequest* New() const; + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); + void CopyFrom(const RegisterUtilitiesRequest& from); + void MergeFrom(const RegisterUtilitiesRequest& from); + void Clear(); + bool IsInitialized() const; + + int ByteSize() const; + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input); + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; + int GetCachedSize() const { return _cached_size_; } + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const; + public: + ::google::protobuf::Metadata GetMetadata() const; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // repeated .bgs.protocol.Attribute attribute = 1; + inline int attribute_size() const; + inline void clear_attribute(); + static const int kAttributeFieldNumber = 1; + inline const ::bgs::protocol::Attribute& attribute(int index) const; + inline ::bgs::protocol::Attribute* mutable_attribute(int index); + inline ::bgs::protocol::Attribute* add_attribute(); + inline const ::google::protobuf::RepeatedPtrField< ::bgs::protocol::Attribute >& + attribute() const; + inline ::google::protobuf::RepeatedPtrField< ::bgs::protocol::Attribute >* + mutable_attribute(); + + // optional fixed32 program = 2; + inline bool has_program() const; + inline void clear_program(); + static const int kProgramFieldNumber = 2; + inline ::google::protobuf::uint32 program() const; + inline void set_program(::google::protobuf::uint32 value); + + // @@protoc_insertion_point(class_scope:bgs.protocol.game_utilities.v1.RegisterUtilitiesRequest) + private: + inline void set_has_program(); + inline void clear_has_program(); + + ::google::protobuf::UnknownFieldSet _unknown_fields_; + + ::google::protobuf::uint32 _has_bits_[1]; + mutable int _cached_size_; + ::google::protobuf::RepeatedPtrField< ::bgs::protocol::Attribute > attribute_; + ::google::protobuf::uint32 program_; + friend void TC_PROTO_API protobuf_AddDesc_game_5futilities_5fservice_2eproto(); + friend void protobuf_AssignDesc_game_5futilities_5fservice_2eproto(); + friend void protobuf_ShutdownFile_game_5futilities_5fservice_2eproto(); + + void InitAsDefaultInstance(); + static RegisterUtilitiesRequest* default_instance_; +}; +// ------------------------------------------------------------------- + +class TC_PROTO_API RegisterUtilitiesResponse : public ::google::protobuf::Message { + public: + RegisterUtilitiesResponse(); + virtual ~RegisterUtilitiesResponse(); + + RegisterUtilitiesResponse(const RegisterUtilitiesResponse& from); + + inline RegisterUtilitiesResponse& operator=(const RegisterUtilitiesResponse& from) { + CopyFrom(from); + return *this; + } + + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); + static const RegisterUtilitiesResponse& default_instance(); + + void Swap(RegisterUtilitiesResponse* other); + + // implements Message ---------------------------------------------- + + RegisterUtilitiesResponse* New() const; + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); + void CopyFrom(const RegisterUtilitiesResponse& from); + void MergeFrom(const RegisterUtilitiesResponse& from); + void Clear(); + bool IsInitialized() const; + + int ByteSize() const; + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input); + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; + int GetCachedSize() const { return _cached_size_; } + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const; + public: + ::google::protobuf::Metadata GetMetadata() const; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // optional string client_id = 1; + inline bool has_client_id() const; + inline void clear_client_id(); + static const int kClientIdFieldNumber = 1; + inline const ::std::string& client_id() const; + inline void set_client_id(const ::std::string& value); + inline void set_client_id(const char* value); + inline void set_client_id(const char* value, size_t size); + inline ::std::string* mutable_client_id(); + inline ::std::string* release_client_id(); + inline void set_allocated_client_id(::std::string* client_id); + + // @@protoc_insertion_point(class_scope:bgs.protocol.game_utilities.v1.RegisterUtilitiesResponse) + private: + inline void set_has_client_id(); + inline void clear_has_client_id(); + + ::google::protobuf::UnknownFieldSet _unknown_fields_; + + ::google::protobuf::uint32 _has_bits_[1]; + mutable int _cached_size_; + ::std::string* client_id_; + friend void TC_PROTO_API protobuf_AddDesc_game_5futilities_5fservice_2eproto(); + friend void protobuf_AssignDesc_game_5futilities_5fservice_2eproto(); + friend void protobuf_ShutdownFile_game_5futilities_5fservice_2eproto(); + + void InitAsDefaultInstance(); + static RegisterUtilitiesResponse* default_instance_; +}; +// ------------------------------------------------------------------- + +class TC_PROTO_API UnregisterUtilitiesRequest : public ::google::protobuf::Message { + public: + UnregisterUtilitiesRequest(); + virtual ~UnregisterUtilitiesRequest(); + + UnregisterUtilitiesRequest(const UnregisterUtilitiesRequest& from); + + inline UnregisterUtilitiesRequest& operator=(const UnregisterUtilitiesRequest& from) { + CopyFrom(from); + return *this; + } + + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); + static const UnregisterUtilitiesRequest& default_instance(); + + void Swap(UnregisterUtilitiesRequest* other); + + // implements Message ---------------------------------------------- + + UnregisterUtilitiesRequest* New() const; + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); + void CopyFrom(const UnregisterUtilitiesRequest& from); + void MergeFrom(const UnregisterUtilitiesRequest& from); + void Clear(); + bool IsInitialized() const; + + int ByteSize() const; + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input); + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; + int GetCachedSize() const { return _cached_size_; } + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const; + public: + ::google::protobuf::Metadata GetMetadata() const; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // @@protoc_insertion_point(class_scope:bgs.protocol.game_utilities.v1.UnregisterUtilitiesRequest) + private: + + ::google::protobuf::UnknownFieldSet _unknown_fields_; + + ::google::protobuf::uint32 _has_bits_[1]; + mutable int _cached_size_; + friend void TC_PROTO_API protobuf_AddDesc_game_5futilities_5fservice_2eproto(); + friend void protobuf_AssignDesc_game_5futilities_5fservice_2eproto(); + friend void protobuf_ShutdownFile_game_5futilities_5fservice_2eproto(); + + void InitAsDefaultInstance(); + static UnregisterUtilitiesRequest* default_instance_; +}; // =================================================================== class TC_PROTO_API GameUtilitiesService : public ServiceBase @@ -1350,6 +1598,8 @@ class TC_PROTO_API GameUtilitiesService : public ServiceBase void OnGameAccountOffline(::bgs::protocol::game_utilities::v1::GameAccountOfflineNotification const* request); void GetAchievementsFile(::bgs::protocol::game_utilities::v1::GetAchievementsFileRequest const* request, std::function<void(::bgs::protocol::game_utilities::v1::GetAchievementsFileResponse const*)> responseCallback); void GetAllValuesForAttribute(::bgs::protocol::game_utilities::v1::GetAllValuesForAttributeRequest const* request, std::function<void(::bgs::protocol::game_utilities::v1::GetAllValuesForAttributeResponse const*)> responseCallback); + void RegisterUtilities(::bgs::protocol::game_utilities::v1::RegisterUtilitiesRequest const* request, std::function<void(::bgs::protocol::game_utilities::v1::RegisterUtilitiesResponse const*)> responseCallback); + void UnregisterUtilities(::bgs::protocol::game_utilities::v1::UnregisterUtilitiesRequest const* request); // server methods -------------------------------------------------- void CallServerMethod(uint32 token, uint32 methodId, MessageBuffer buffer) override final; @@ -1363,6 +1613,8 @@ class TC_PROTO_API GameUtilitiesService : public ServiceBase virtual uint32 HandleOnGameAccountOffline(::bgs::protocol::game_utilities::v1::GameAccountOfflineNotification const* request); virtual uint32 HandleGetAchievementsFile(::bgs::protocol::game_utilities::v1::GetAchievementsFileRequest const* request, ::bgs::protocol::game_utilities::v1::GetAchievementsFileResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation); virtual uint32 HandleGetAllValuesForAttribute(::bgs::protocol::game_utilities::v1::GetAllValuesForAttributeRequest const* request, ::bgs::protocol::game_utilities::v1::GetAllValuesForAttributeResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation); + virtual uint32 HandleRegisterUtilities(::bgs::protocol::game_utilities::v1::RegisterUtilitiesRequest const* request, ::bgs::protocol::game_utilities::v1::RegisterUtilitiesResponse* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation); + virtual uint32 HandleUnregisterUtilities(::bgs::protocol::game_utilities::v1::UnregisterUtilitiesRequest const* request); private: uint32 service_hash_; @@ -2632,6 +2884,148 @@ GetAllValuesForAttributeResponse::mutable_attribute_value() { return &attribute_value_; } +// ------------------------------------------------------------------- + +// RegisterUtilitiesRequest + +// repeated .bgs.protocol.Attribute attribute = 1; +inline int RegisterUtilitiesRequest::attribute_size() const { + return attribute_.size(); +} +inline void RegisterUtilitiesRequest::clear_attribute() { + attribute_.Clear(); +} +inline const ::bgs::protocol::Attribute& RegisterUtilitiesRequest::attribute(int index) const { + // @@protoc_insertion_point(field_get:bgs.protocol.game_utilities.v1.RegisterUtilitiesRequest.attribute) + return attribute_.Get(index); +} +inline ::bgs::protocol::Attribute* RegisterUtilitiesRequest::mutable_attribute(int index) { + // @@protoc_insertion_point(field_mutable:bgs.protocol.game_utilities.v1.RegisterUtilitiesRequest.attribute) + return attribute_.Mutable(index); +} +inline ::bgs::protocol::Attribute* RegisterUtilitiesRequest::add_attribute() { + // @@protoc_insertion_point(field_add:bgs.protocol.game_utilities.v1.RegisterUtilitiesRequest.attribute) + return attribute_.Add(); +} +inline const ::google::protobuf::RepeatedPtrField< ::bgs::protocol::Attribute >& +RegisterUtilitiesRequest::attribute() const { + // @@protoc_insertion_point(field_list:bgs.protocol.game_utilities.v1.RegisterUtilitiesRequest.attribute) + return attribute_; +} +inline ::google::protobuf::RepeatedPtrField< ::bgs::protocol::Attribute >* +RegisterUtilitiesRequest::mutable_attribute() { + // @@protoc_insertion_point(field_mutable_list:bgs.protocol.game_utilities.v1.RegisterUtilitiesRequest.attribute) + return &attribute_; +} + +// optional fixed32 program = 2; +inline bool RegisterUtilitiesRequest::has_program() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +inline void RegisterUtilitiesRequest::set_has_program() { + _has_bits_[0] |= 0x00000002u; +} +inline void RegisterUtilitiesRequest::clear_has_program() { + _has_bits_[0] &= ~0x00000002u; +} +inline void RegisterUtilitiesRequest::clear_program() { + program_ = 0u; + clear_has_program(); +} +inline ::google::protobuf::uint32 RegisterUtilitiesRequest::program() const { + // @@protoc_insertion_point(field_get:bgs.protocol.game_utilities.v1.RegisterUtilitiesRequest.program) + return program_; +} +inline void RegisterUtilitiesRequest::set_program(::google::protobuf::uint32 value) { + set_has_program(); + program_ = value; + // @@protoc_insertion_point(field_set:bgs.protocol.game_utilities.v1.RegisterUtilitiesRequest.program) +} + +// ------------------------------------------------------------------- + +// RegisterUtilitiesResponse + +// optional string client_id = 1; +inline bool RegisterUtilitiesResponse::has_client_id() const { + return (_has_bits_[0] & 0x00000001u) != 0; +} +inline void RegisterUtilitiesResponse::set_has_client_id() { + _has_bits_[0] |= 0x00000001u; +} +inline void RegisterUtilitiesResponse::clear_has_client_id() { + _has_bits_[0] &= ~0x00000001u; +} +inline void RegisterUtilitiesResponse::clear_client_id() { + if (client_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + client_id_->clear(); + } + clear_has_client_id(); +} +inline const ::std::string& RegisterUtilitiesResponse::client_id() const { + // @@protoc_insertion_point(field_get:bgs.protocol.game_utilities.v1.RegisterUtilitiesResponse.client_id) + return *client_id_; +} +inline void RegisterUtilitiesResponse::set_client_id(const ::std::string& value) { + set_has_client_id(); + if (client_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + client_id_ = new ::std::string; + } + client_id_->assign(value); + // @@protoc_insertion_point(field_set:bgs.protocol.game_utilities.v1.RegisterUtilitiesResponse.client_id) +} +inline void RegisterUtilitiesResponse::set_client_id(const char* value) { + set_has_client_id(); + if (client_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + client_id_ = new ::std::string; + } + client_id_->assign(value); + // @@protoc_insertion_point(field_set_char:bgs.protocol.game_utilities.v1.RegisterUtilitiesResponse.client_id) +} +inline void RegisterUtilitiesResponse::set_client_id(const char* value, size_t size) { + set_has_client_id(); + if (client_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + client_id_ = new ::std::string; + } + client_id_->assign(reinterpret_cast<const char*>(value), size); + // @@protoc_insertion_point(field_set_pointer:bgs.protocol.game_utilities.v1.RegisterUtilitiesResponse.client_id) +} +inline ::std::string* RegisterUtilitiesResponse::mutable_client_id() { + set_has_client_id(); + if (client_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + client_id_ = new ::std::string; + } + // @@protoc_insertion_point(field_mutable:bgs.protocol.game_utilities.v1.RegisterUtilitiesResponse.client_id) + return client_id_; +} +inline ::std::string* RegisterUtilitiesResponse::release_client_id() { + clear_has_client_id(); + if (client_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + return NULL; + } else { + ::std::string* temp = client_id_; + client_id_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return temp; + } +} +inline void RegisterUtilitiesResponse::set_allocated_client_id(::std::string* client_id) { + if (client_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + delete client_id_; + } + if (client_id) { + set_has_client_id(); + client_id_ = client_id; + } else { + clear_has_client_id(); + client_id_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + } + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.game_utilities.v1.RegisterUtilitiesResponse.client_id) +} + +// ------------------------------------------------------------------- + +// UnregisterUtilitiesRequest + // @@protoc_insertion_point(namespace_scope) diff --git a/src/server/proto/Client/global_extensions/field_options.pb.cc b/src/server/proto/Client/global_extensions/field_options.pb.cc index bfc740aee0b..824af2d340a 100644 --- a/src/server/proto/Client/global_extensions/field_options.pb.cc +++ b/src/server/proto/Client/global_extensions/field_options.pb.cc @@ -79,9 +79,10 @@ void protobuf_AssignDesc_global_5fextensions_2ffield_5foptions_2eproto() { "global_extensions/field_options.proto"); GOOGLE_CHECK(file != NULL); BGSFieldOptions_descriptor_ = file->message_type(0); - static const int BGSFieldOptions_offsets_[2] = { + static const int BGSFieldOptions_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSFieldOptions, log_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSFieldOptions, shard_key_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSFieldOptions, fanout_key_), }; BGSFieldOptions_reflection_ = new ::google::protobuf::internal::GeneratedMessageReflection( @@ -307,50 +308,51 @@ void protobuf_AddDesc_global_5fextensions_2ffield_5foptions_2eproto() { ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( "\n%global_extensions/field_options.proto\022" "\014bgs.protocol\032 google/protobuf/descripto" - "r.proto\032\035global_extensions/range.proto\"J" + "r.proto\032\035global_extensions/range.proto\"^" "\n\017BGSFieldOptions\022$\n\003log\030\001 \001(\0162\027.bgs.pro" - "tocol.LogOption\022\021\n\tshard_key\030\002 \001(\010\"\252\003\n\020F" - "ieldRestriction\0226\n\006signed\030\001 \001(\0132$.bgs.pr" - "otocol.SignedFieldRestrictionH\000\022:\n\010unsig" - "ned\030\002 \001(\0132&.bgs.protocol.UnsignedFieldRe" - "strictionH\000\0224\n\005float\030\003 \001(\0132#.bgs.protoco" - "l.FloatFieldRestrictionH\000\0226\n\006string\030\004 \001(" - "\0132$.bgs.protocol.StringFieldRestrictionH" - "\000\022:\n\010repeated\030\005 \001(\0132&.bgs.protocol.Repea" - "tedFieldRestrictionH\000\0228\n\007message\030\006 \001(\0132%" - ".bgs.protocol.MessageFieldRestrictionH\000\022" - "6\n\tentity_id\030\007 \001(\0132!.bgs.protocol.Entity" - "IdRestrictionH\000B\006\n\004type\"\372\002\n\030RepeatedFiel" - "dRestriction\022,\n\004size\030\001 \001(\0132\036.bgs.protoco" - "l.UnsignedIntRange\022\016\n\006unique\030\002 \001(\010\0226\n\006si" - "gned\030\003 \001(\0132$.bgs.protocol.SignedFieldRes" - "trictionH\000\022:\n\010unsigned\030\004 \001(\0132&.bgs.proto" - "col.UnsignedFieldRestrictionH\000\0224\n\005float\030" - "\005 \001(\0132#.bgs.protocol.FloatFieldRestricti" - "onH\000\0226\n\006string\030\006 \001(\0132$.bgs.protocol.Stri" - "ngFieldRestrictionH\000\0226\n\tentity_id\030\007 \001(\0132" - "!.bgs.protocol.EntityIdRestrictionH\000B\006\n\004" - "type\"W\n\026SignedFieldRestriction\022,\n\006limits" - "\030\001 \001(\0132\034.bgs.protocol.SignedIntRange\022\017\n\007" - "exclude\030\002 \003(\022\"[\n\030UnsignedFieldRestrictio" - "n\022.\n\006limits\030\001 \001(\0132\036.bgs.protocol.Unsigne" - "dIntRange\022\017\n\007exclude\030\002 \003(\004\"R\n\025FloatField" - "Restriction\022(\n\006limits\030\001 \001(\0132\030.bgs.protoc" - "ol.FloatRange\022\017\n\007exclude\030\002 \003(\002\"W\n\026String" - "FieldRestriction\022,\n\004size\030\001 \001(\0132\036.bgs.pro" - "tocol.UnsignedIntRange\022\017\n\007exclude\030\002 \003(\t\"" - "\302\001\n\023EntityIdRestriction\022\016\n\006needed\030\001 \001(\010\022" - "4\n\004kind\030\002 \001(\0162&.bgs.protocol.EntityIdRes" - "triction.Kind\"e\n\004Kind\022\007\n\003ANY\020\000\022\013\n\007ACCOUN" - "T\020\001\022\020\n\014GAME_ACCOUNT\020\002\022\033\n\027ACCOUNT_OR_GAME" - "_ACCOUNT\020\003\022\013\n\007SERVICE\020\004\022\013\n\007CHANNEL\020\005\")\n\027" - "MessageFieldRestriction\022\016\n\006needed\030\001 \001(\010*" - " \n\tLogOption\022\n\n\006HIDDEN\020\001\022\007\n\003HEX\020\002:U\n\rfie" - "ld_options\022\035.google.protobuf.FieldOption" - "s\030\220\277\005 \001(\0132\035.bgs.protocol.BGSFieldOptions" - ":N\n\005valid\022\035.google.protobuf.FieldOptions" - "\030\221\277\005 \001(\0132\036.bgs.protocol.FieldRestriction" - "B$\n\rbnet.protocolB\021FieldOptionsProtoH\001", 1838); + "tocol.LogOption\022\021\n\tshard_key\030\002 \001(\010\022\022\n\nfa" + "nout_key\030\003 \001(\010\"\252\003\n\020FieldRestriction\0226\n\006s" + "igned\030\001 \001(\0132$.bgs.protocol.SignedFieldRe" + "strictionH\000\022:\n\010unsigned\030\002 \001(\0132&.bgs.prot" + "ocol.UnsignedFieldRestrictionH\000\0224\n\005float" + "\030\003 \001(\0132#.bgs.protocol.FloatFieldRestrict" + "ionH\000\0226\n\006string\030\004 \001(\0132$.bgs.protocol.Str" + "ingFieldRestrictionH\000\022:\n\010repeated\030\005 \001(\0132" + "&.bgs.protocol.RepeatedFieldRestrictionH" + "\000\0228\n\007message\030\006 \001(\0132%.bgs.protocol.Messag" + "eFieldRestrictionH\000\0226\n\tentity_id\030\007 \001(\0132!" + ".bgs.protocol.EntityIdRestrictionH\000B\006\n\004t" + "ype\"\372\002\n\030RepeatedFieldRestriction\022,\n\004size" + "\030\001 \001(\0132\036.bgs.protocol.UnsignedIntRange\022\016" + "\n\006unique\030\002 \001(\010\0226\n\006signed\030\003 \001(\0132$.bgs.pro" + "tocol.SignedFieldRestrictionH\000\022:\n\010unsign" + "ed\030\004 \001(\0132&.bgs.protocol.UnsignedFieldRes" + "trictionH\000\0224\n\005float\030\005 \001(\0132#.bgs.protocol" + ".FloatFieldRestrictionH\000\0226\n\006string\030\006 \001(\013" + "2$.bgs.protocol.StringFieldRestrictionH\000" + "\0226\n\tentity_id\030\007 \001(\0132!.bgs.protocol.Entit" + "yIdRestrictionH\000B\006\n\004type\"W\n\026SignedFieldR" + "estriction\022,\n\006limits\030\001 \001(\0132\034.bgs.protoco" + "l.SignedIntRange\022\017\n\007exclude\030\002 \003(\022\"[\n\030Uns" + "ignedFieldRestriction\022.\n\006limits\030\001 \001(\0132\036." + "bgs.protocol.UnsignedIntRange\022\017\n\007exclude" + "\030\002 \003(\004\"R\n\025FloatFieldRestriction\022(\n\006limit" + "s\030\001 \001(\0132\030.bgs.protocol.FloatRange\022\017\n\007exc" + "lude\030\002 \003(\002\"W\n\026StringFieldRestriction\022,\n\004" + "size\030\001 \001(\0132\036.bgs.protocol.UnsignedIntRan" + "ge\022\017\n\007exclude\030\002 \003(\t\"\302\001\n\023EntityIdRestrict" + "ion\022\016\n\006needed\030\001 \001(\010\0224\n\004kind\030\002 \001(\0162&.bgs." + "protocol.EntityIdRestriction.Kind\"e\n\004Kin" + "d\022\007\n\003ANY\020\000\022\013\n\007ACCOUNT\020\001\022\020\n\014GAME_ACCOUNT\020" + "\002\022\033\n\027ACCOUNT_OR_GAME_ACCOUNT\020\003\022\013\n\007SERVIC" + "E\020\004\022\013\n\007CHANNEL\020\005\")\n\027MessageFieldRestrict" + "ion\022\016\n\006needed\030\001 \001(\010* \n\tLogOption\022\n\n\006HIDD" + "EN\020\001\022\007\n\003HEX\020\002:U\n\rfield_options\022\035.google." + "protobuf.FieldOptions\030\220\277\005 \001(\0132\035.bgs.prot" + "ocol.BGSFieldOptions:N\n\005valid\022\035.google.p" + "rotobuf.FieldOptions\030\221\277\005 \001(\0132\036.bgs.proto" + "col.FieldRestrictionB$\n\rbnet.protocolB\021F" + "ieldOptionsProtoH\001", 1858); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "global_extensions/field_options.proto", &protobuf_RegisterTypes); BGSFieldOptions::default_instance_ = new BGSFieldOptions(); @@ -410,6 +412,7 @@ bool LogOption_IsValid(int value) { #ifndef _MSC_VER const int BGSFieldOptions::kLogFieldNumber; const int BGSFieldOptions::kShardKeyFieldNumber; +const int BGSFieldOptions::kFanoutKeyFieldNumber; #endif // !_MSC_VER BGSFieldOptions::BGSFieldOptions() @@ -432,6 +435,7 @@ void BGSFieldOptions::SharedCtor() { _cached_size_ = 0; log_ = 1; shard_key_ = false; + fanout_key_ = false; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -467,10 +471,24 @@ BGSFieldOptions* BGSFieldOptions::New() const { } void BGSFieldOptions::Clear() { - if (_has_bits_[0 / 32] & 3) { +#define OFFSET_OF_FIELD_(f) (reinterpret_cast<char*>( \ + &reinterpret_cast<BGSFieldOptions*>(16)->f) - \ + reinterpret_cast<char*>(16)) + +#define ZR_(first, last) do { \ + size_t f = OFFSET_OF_FIELD_(first); \ + size_t n = OFFSET_OF_FIELD_(last) - f + sizeof(last); \ + ::memset(&first, 0, n); \ + } while (0) + + if (_has_bits_[0 / 32] & 7) { + ZR_(shard_key_, fanout_key_); log_ = 1; - shard_key_ = false; } + +#undef OFFSET_OF_FIELD_ +#undef ZR_ + ::memset(_has_bits_, 0, sizeof(_has_bits_)); mutable_unknown_fields()->Clear(); } @@ -515,6 +533,21 @@ bool BGSFieldOptions::MergePartialFromCodedStream( } else { goto handle_unusual; } + if (input->ExpectTag(24)) goto parse_fanout_key; + break; + } + + // optional bool fanout_key = 3; + case 3: { + if (tag == 24) { + parse_fanout_key: + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( + input, &fanout_key_))); + set_has_fanout_key(); + } else { + goto handle_unusual; + } if (input->ExpectAtEnd()) goto success; break; } @@ -555,6 +588,11 @@ void BGSFieldOptions::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->shard_key(), output); } + // optional bool fanout_key = 3; + if (has_fanout_key()) { + ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->fanout_key(), output); + } + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -576,6 +614,11 @@ void BGSFieldOptions::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->shard_key(), target); } + // optional bool fanout_key = 3; + if (has_fanout_key()) { + target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->fanout_key(), target); + } + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -599,6 +642,11 @@ int BGSFieldOptions::ByteSize() const { total_size += 1 + 1; } + // optional bool fanout_key = 3; + if (has_fanout_key()) { + total_size += 1 + 1; + } + } if (!unknown_fields().empty()) { total_size += @@ -632,6 +680,9 @@ void BGSFieldOptions::MergeFrom(const BGSFieldOptions& from) { if (from.has_shard_key()) { set_shard_key(from.shard_key()); } + if (from.has_fanout_key()) { + set_fanout_key(from.fanout_key()); + } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); } @@ -657,6 +708,7 @@ void BGSFieldOptions::Swap(BGSFieldOptions* other) { if (other != this) { std::swap(log_, other->log_); std::swap(shard_key_, other->shard_key_); + std::swap(fanout_key_, other->fanout_key_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); diff --git a/src/server/proto/Client/global_extensions/field_options.pb.h b/src/server/proto/Client/global_extensions/field_options.pb.h index c1a32a2601d..6cd4d1de244 100644 --- a/src/server/proto/Client/global_extensions/field_options.pb.h +++ b/src/server/proto/Client/global_extensions/field_options.pb.h @@ -159,12 +159,21 @@ class TC_PROTO_API BGSFieldOptions : public ::google::protobuf::Message { inline bool shard_key() const; inline void set_shard_key(bool value); + // optional bool fanout_key = 3; + inline bool has_fanout_key() const; + inline void clear_fanout_key(); + static const int kFanoutKeyFieldNumber = 3; + inline bool fanout_key() const; + inline void set_fanout_key(bool value); + // @@protoc_insertion_point(class_scope:bgs.protocol.BGSFieldOptions) private: inline void set_has_log(); inline void clear_has_log(); inline void set_has_shard_key(); inline void clear_has_shard_key(); + inline void set_has_fanout_key(); + inline void clear_has_fanout_key(); ::google::protobuf::UnknownFieldSet _unknown_fields_; @@ -172,6 +181,7 @@ class TC_PROTO_API BGSFieldOptions : public ::google::protobuf::Message { mutable int _cached_size_; int log_; bool shard_key_; + bool fanout_key_; friend void TC_PROTO_API protobuf_AddDesc_global_5fextensions_2ffield_5foptions_2eproto(); friend void protobuf_AssignDesc_global_5fextensions_2ffield_5foptions_2eproto(); friend void protobuf_ShutdownFile_global_5fextensions_2ffield_5foptions_2eproto(); @@ -1152,6 +1162,30 @@ inline void BGSFieldOptions::set_shard_key(bool value) { // @@protoc_insertion_point(field_set:bgs.protocol.BGSFieldOptions.shard_key) } +// optional bool fanout_key = 3; +inline bool BGSFieldOptions::has_fanout_key() const { + return (_has_bits_[0] & 0x00000004u) != 0; +} +inline void BGSFieldOptions::set_has_fanout_key() { + _has_bits_[0] |= 0x00000004u; +} +inline void BGSFieldOptions::clear_has_fanout_key() { + _has_bits_[0] &= ~0x00000004u; +} +inline void BGSFieldOptions::clear_fanout_key() { + fanout_key_ = false; + clear_has_fanout_key(); +} +inline bool BGSFieldOptions::fanout_key() const { + // @@protoc_insertion_point(field_get:bgs.protocol.BGSFieldOptions.fanout_key) + return fanout_key_; +} +inline void BGSFieldOptions::set_fanout_key(bool value) { + set_has_fanout_key(); + fanout_key_ = value; + // @@protoc_insertion_point(field_set:bgs.protocol.BGSFieldOptions.fanout_key) +} + // ------------------------------------------------------------------- // FieldRestriction diff --git a/src/server/proto/Client/global_extensions/message_options.pb.cc b/src/server/proto/Client/global_extensions/message_options.pb.cc index 814967073f9..90fe1686430 100644 --- a/src/server/proto/Client/global_extensions/message_options.pb.cc +++ b/src/server/proto/Client/global_extensions/message_options.pb.cc @@ -37,9 +37,10 @@ void protobuf_AssignDesc_global_5fextensions_2fmessage_5foptions_2eproto() { "global_extensions/message_options.proto"); GOOGLE_CHECK(file != NULL); BGSMessageOptions_descriptor_ = file->message_type(0); - static const int BGSMessageOptions_offsets_[2] = { + static const int BGSMessageOptions_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSMessageOptions, custom_select_shard_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSMessageOptions, custom_validator_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BGSMessageOptions, client_id_fanout_), }; BGSMessageOptions_reflection_ = new ::google::protobuf::internal::GeneratedMessageReflection( @@ -85,12 +86,13 @@ void protobuf_AddDesc_global_5fextensions_2fmessage_5foptions_2eproto() { ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( "\n\'global_extensions/message_options.prot" "o\022\014bgs.protocol\032 google/protobuf/descrip" - "tor.proto\"J\n\021BGSMessageOptions\022\033\n\023custom" + "tor.proto\"d\n\021BGSMessageOptions\022\033\n\023custom" "_select_shard\030\001 \001(\010\022\030\n\020custom_validator\030" - "\002 \001(\010:[\n\017message_options\022\037.google.protob" - "uf.MessageOptions\030\220\277\005 \001(\0132\037.bgs.protocol" - ".BGSMessageOptionsB&\n\rbnet.protocolB\023Mes" - "sageOptionsProtoH\001", 298); + "\002 \001(\010\022\030\n\020client_id_fanout\030\003 \001(\010:[\n\017messa" + "ge_options\022\037.google.protobuf.MessageOpti" + "ons\030\220\277\005 \001(\0132\037.bgs.protocol.BGSMessageOpt" + "ionsB&\n\rbnet.protocolB\023MessageOptionsPro" + "toH\001", 324); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "global_extensions/message_options.proto", &protobuf_RegisterTypes); BGSMessageOptions::default_instance_ = new BGSMessageOptions(); @@ -114,6 +116,7 @@ struct StaticDescriptorInitializer_global_5fextensions_2fmessage_5foptions_2epro #ifndef _MSC_VER const int BGSMessageOptions::kCustomSelectShardFieldNumber; const int BGSMessageOptions::kCustomValidatorFieldNumber; +const int BGSMessageOptions::kClientIdFanoutFieldNumber; #endif // !_MSC_VER BGSMessageOptions::BGSMessageOptions() @@ -136,6 +139,7 @@ void BGSMessageOptions::SharedCtor() { _cached_size_ = 0; custom_select_shard_ = false; custom_validator_ = false; + client_id_fanout_ = false; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -181,7 +185,7 @@ void BGSMessageOptions::Clear() { ::memset(&first, 0, n); \ } while (0) - ZR_(custom_select_shard_, custom_validator_); + ZR_(custom_select_shard_, client_id_fanout_); #undef OFFSET_OF_FIELD_ #undef ZR_ @@ -225,6 +229,21 @@ bool BGSMessageOptions::MergePartialFromCodedStream( } else { goto handle_unusual; } + if (input->ExpectTag(24)) goto parse_client_id_fanout; + break; + } + + // optional bool client_id_fanout = 3; + case 3: { + if (tag == 24) { + parse_client_id_fanout: + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( + input, &client_id_fanout_))); + set_has_client_id_fanout(); + } else { + goto handle_unusual; + } if (input->ExpectAtEnd()) goto success; break; } @@ -264,6 +283,11 @@ void BGSMessageOptions::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->custom_validator(), output); } + // optional bool client_id_fanout = 3; + if (has_client_id_fanout()) { + ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->client_id_fanout(), output); + } + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -284,6 +308,11 @@ void BGSMessageOptions::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->custom_validator(), target); } + // optional bool client_id_fanout = 3; + if (has_client_id_fanout()) { + target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->client_id_fanout(), target); + } + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -306,6 +335,11 @@ int BGSMessageOptions::ByteSize() const { total_size += 1 + 1; } + // optional bool client_id_fanout = 3; + if (has_client_id_fanout()) { + total_size += 1 + 1; + } + } if (!unknown_fields().empty()) { total_size += @@ -339,6 +373,9 @@ void BGSMessageOptions::MergeFrom(const BGSMessageOptions& from) { if (from.has_custom_validator()) { set_custom_validator(from.custom_validator()); } + if (from.has_client_id_fanout()) { + set_client_id_fanout(from.client_id_fanout()); + } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); } @@ -364,6 +401,7 @@ void BGSMessageOptions::Swap(BGSMessageOptions* other) { if (other != this) { std::swap(custom_select_shard_, other->custom_select_shard_); std::swap(custom_validator_, other->custom_validator_); + std::swap(client_id_fanout_, other->client_id_fanout_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); diff --git a/src/server/proto/Client/global_extensions/message_options.pb.h b/src/server/proto/Client/global_extensions/message_options.pb.h index b9a80743723..1ca0cdbbe01 100644 --- a/src/server/proto/Client/global_extensions/message_options.pb.h +++ b/src/server/proto/Client/global_extensions/message_options.pb.h @@ -107,12 +107,21 @@ class TC_PROTO_API BGSMessageOptions : public ::google::protobuf::Message { inline bool custom_validator() const; inline void set_custom_validator(bool value); + // optional bool client_id_fanout = 3; + inline bool has_client_id_fanout() const; + inline void clear_client_id_fanout(); + static const int kClientIdFanoutFieldNumber = 3; + inline bool client_id_fanout() const; + inline void set_client_id_fanout(bool value); + // @@protoc_insertion_point(class_scope:bgs.protocol.BGSMessageOptions) private: inline void set_has_custom_select_shard(); inline void clear_has_custom_select_shard(); inline void set_has_custom_validator(); inline void clear_has_custom_validator(); + inline void set_has_client_id_fanout(); + inline void clear_has_client_id_fanout(); ::google::protobuf::UnknownFieldSet _unknown_fields_; @@ -120,6 +129,7 @@ class TC_PROTO_API BGSMessageOptions : public ::google::protobuf::Message { mutable int _cached_size_; bool custom_select_shard_; bool custom_validator_; + bool client_id_fanout_; friend void TC_PROTO_API protobuf_AddDesc_global_5fextensions_2fmessage_5foptions_2eproto(); friend void protobuf_AssignDesc_global_5fextensions_2fmessage_5foptions_2eproto(); friend void protobuf_ShutdownFile_global_5fextensions_2fmessage_5foptions_2eproto(); @@ -189,6 +199,30 @@ inline void BGSMessageOptions::set_custom_validator(bool value) { // @@protoc_insertion_point(field_set:bgs.protocol.BGSMessageOptions.custom_validator) } +// optional bool client_id_fanout = 3; +inline bool BGSMessageOptions::has_client_id_fanout() const { + return (_has_bits_[0] & 0x00000004u) != 0; +} +inline void BGSMessageOptions::set_has_client_id_fanout() { + _has_bits_[0] |= 0x00000004u; +} +inline void BGSMessageOptions::clear_has_client_id_fanout() { + _has_bits_[0] &= ~0x00000004u; +} +inline void BGSMessageOptions::clear_client_id_fanout() { + client_id_fanout_ = false; + clear_has_client_id_fanout(); +} +inline bool BGSMessageOptions::client_id_fanout() const { + // @@protoc_insertion_point(field_get:bgs.protocol.BGSMessageOptions.client_id_fanout) + return client_id_fanout_; +} +inline void BGSMessageOptions::set_client_id_fanout(bool value) { + set_has_client_id_fanout(); + client_id_fanout_ = value; + // @@protoc_insertion_point(field_set:bgs.protocol.BGSMessageOptions.client_id_fanout) +} + // @@protoc_insertion_point(namespace_scope) diff --git a/src/server/proto/Client/report_service.pb.cc b/src/server/proto/Client/report_service.pb.cc index 7a32bfbff79..81fbd3a94e4 100644 --- a/src/server/proto/Client/report_service.pb.cc +++ b/src/server/proto/Client/report_service.pb.cc @@ -117,20 +117,20 @@ void protobuf_AddDesc_report_5fservice_2eproto() { ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( "\n\024report_service.proto\022\026bgs.protocol.rep" "ort.v1\032\023account_types.proto\032\022report_type" - "s.proto\032\017rpc_types.proto\"T\n\021SendReportRe" + "s.proto\032\017rpc_types.proto\"\\\n\021SendReportRe" "quest\022.\n\006report\030\001 \002(\0132\036.bgs.protocol.rep" - "ort.v1.Report\022\017\n\007program\030\002 \001(\r\"\235\001\n\023Submi" - "tReportRequest\022<\n\010agent_id\030\001 \001(\0132*.bgs.p" - "rotocol.account.v1.GameAccountHandle\0227\n\013" - "report_type\030\002 \001(\0132\".bgs.protocol.report." - "v1.ReportType\022\017\n\007program\030\003 \001(\r2\371\001\n\rRepor" - "tService\022U\n\nSendReport\022).bgs.protocol.re" - "port.v1.SendReportRequest\032\024.bgs.protocol" - ".NoData\"\006\202\371+\002\010\001\022Y\n\014SubmitReport\022+.bgs.pr" - "otocol.report.v1.SubmitReportRequest\032\024.b" - "gs.protocol.NoData\"\006\202\371+\002\010\002\0326\202\371+,\n\"bnet.p" - "rotocol.report.ReportService*\006report\212\371+\002" - "\020\001B\005H\001\200\001\000", 609); + "ort.v1.Report\022\017\n\007program\030\002 \001(\r:\006\202\371+\002\020\001\"\245" + "\001\n\023SubmitReportRequest\022<\n\010agent_id\030\001 \001(\013" + "2*.bgs.protocol.account.v1.GameAccountHa" + "ndle\0227\n\013report_type\030\002 \001(\0132\".bgs.protocol" + ".report.v1.ReportType\022\017\n\007program\030\003 \001(\r:\006" + "\202\371+\002\020\0012\371\001\n\rReportService\022U\n\nSendReport\022)" + ".bgs.protocol.report.v1.SendReportReques" + "t\032\024.bgs.protocol.NoData\"\006\202\371+\002\010\001\022Y\n\014Submi" + "tReport\022+.bgs.protocol.report.v1.SubmitR" + "eportRequest\032\024.bgs.protocol.NoData\"\006\202\371+\002" + "\010\002\0326\202\371+,\n\"bnet.protocol.report.ReportSer" + "vice*\006report\212\371+\002\020\001B\005H\001\200\001\000", 625); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "report_service.proto", &protobuf_RegisterTypes); SendReportRequest::default_instance_ = new SendReportRequest(); diff --git a/src/server/proto/Client/resource_service.pb.cc b/src/server/proto/Client/resource_service.pb.cc index bece2a03a26..6e50f776f20 100644 --- a/src/server/proto/Client/resource_service.pb.cc +++ b/src/server/proto/Client/resource_service.pb.cc @@ -95,12 +95,12 @@ void protobuf_AddDesc_resource_5fservice_2eproto() { "esources.v1\032\032content_handle_types.proto\032" "\017rpc_types.proto\"\\\n\024ContentHandleRequest" "\022\017\n\007program\030\001 \002(\007\022\016\n\006stream\030\002 \002(\007\022\033\n\007ver" - "sion\030\003 \001(\007:\n1701729619:\006\202\371+\002\010\0012\253\001\n\020Resou" + "sion\030\003 \001(\007:\n1701729619:\006\202\371+\002\020\0012\266\001\n\020Resou" "rcesService\022h\n\020GetContentHandle\022/.bgs.pr" "otocol.resources.v1.ContentHandleRequest" - "\032\033.bgs.protocol.ContentHandle\"\006\202\371+\002\010\001\032-\202" - "\371+#\n!bnet.protocol.resources.Resources\212\371" - "+\002\020\001B\005H\001\200\001\000", 371); + "\032\033.bgs.protocol.ContentHandle\"\006\202\371+\002\010\001\0328\202" + "\371+.\n!bnet.protocol.resources.Resources*\t" + "resources\212\371+\002\020\001B\005H\001\200\001\000", 382); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "resource_service.proto", &protobuf_RegisterTypes); ContentHandleRequest::default_instance_ = new ContentHandleRequest(); diff --git a/src/server/proto/Client/rpc_types.pb.cc b/src/server/proto/Client/rpc_types.pb.cc index 30a5ef168f7..cb2cd963a93 100644 --- a/src/server/proto/Client/rpc_types.pb.cc +++ b/src/server/proto/Client/rpc_types.pb.cc @@ -41,6 +41,9 @@ const ::google::protobuf::internal::GeneratedMessageReflection* const ::google::protobuf::Descriptor* ErrorInfo_descriptor_ = NULL; const ::google::protobuf::internal::GeneratedMessageReflection* ErrorInfo_reflection_ = NULL; +const ::google::protobuf::Descriptor* FanoutTarget_descriptor_ = NULL; +const ::google::protobuf::internal::GeneratedMessageReflection* + FanoutTarget_reflection_ = NULL; const ::google::protobuf::Descriptor* Header_descriptor_ = NULL; const ::google::protobuf::internal::GeneratedMessageReflection* Header_reflection_ = NULL; @@ -151,8 +154,24 @@ void protobuf_AssignDesc_rpc_5ftypes_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(ErrorInfo)); - Header_descriptor_ = file->message_type(6); - static const int Header_offsets_[12] = { + FanoutTarget_descriptor_ = file->message_type(6); + static const int FanoutTarget_offsets_[2] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FanoutTarget, client_id_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FanoutTarget, key_), + }; + FanoutTarget_reflection_ = + new ::google::protobuf::internal::GeneratedMessageReflection( + FanoutTarget_descriptor_, + FanoutTarget::default_instance_, + FanoutTarget_offsets_, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FanoutTarget, _has_bits_[0]), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FanoutTarget, _unknown_fields_), + -1, + ::google::protobuf::DescriptorPool::generated_pool(), + ::google::protobuf::MessageFactory::generated_factory(), + sizeof(FanoutTarget)); + Header_descriptor_ = file->message_type(7); + static const int Header_offsets_[14] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Header, service_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Header, method_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Header, token_), @@ -165,6 +184,8 @@ void protobuf_AssignDesc_rpc_5ftypes_2eproto() { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Header, forward_targets_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Header, service_hash_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Header, client_id_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Header, fanout_target_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Header, client_id_fanout_target_), }; Header_reflection_ = new ::google::protobuf::internal::GeneratedMessageReflection( @@ -177,7 +198,7 @@ void protobuf_AssignDesc_rpc_5ftypes_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(Header)); - KafkaHeader_descriptor_ = file->message_type(7); + KafkaHeader_descriptor_ = file->message_type(8); static const int KafkaHeader_offsets_[10] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(KafkaHeader, service_hash_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(KafkaHeader, method_id_), @@ -226,6 +247,8 @@ void protobuf_RegisterTypes(const ::std::string&) { ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( ErrorInfo_descriptor_, &ErrorInfo::default_instance()); ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( + FanoutTarget_descriptor_, &FanoutTarget::default_instance()); + ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( Header_descriptor_, &Header::default_instance()); ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( KafkaHeader_descriptor_, &KafkaHeader::default_instance()); @@ -246,6 +269,8 @@ void protobuf_ShutdownFile_rpc_5ftypes_2eproto() { delete NoData_reflection_; delete ErrorInfo::default_instance_; delete ErrorInfo_reflection_; + delete FanoutTarget::default_instance_; + delete FanoutTarget_reflection_; delete Header::default_instance_; delete Header_reflection_; delete KafkaHeader::default_instance_; @@ -275,21 +300,25 @@ void protobuf_AddDesc_rpc_5ftypes_2eproto() { "\n\tobject_id\030\002 \001(\004:\0010\"\010\n\006NoData\"y\n\tErrorI" "nfo\0223\n\016object_address\030\001 \002(\0132\033.bgs.protoc" "ol.ObjectAddress\022\016\n\006status\030\002 \002(\r\022\024\n\014serv" - "ice_hash\030\003 \002(\r\022\021\n\tmethod_id\030\004 \002(\r\"\241\002\n\006He" - "ader\022\022\n\nservice_id\030\001 \002(\r\022\021\n\tmethod_id\030\002 " - "\001(\r\022\r\n\005token\030\003 \002(\r\022\024\n\tobject_id\030\004 \001(\004:\0010" - "\022\017\n\004size\030\005 \001(\r:\0010\022\021\n\006status\030\006 \001(\r:\0010\022&\n\005" - "error\030\007 \003(\0132\027.bgs.protocol.ErrorInfo\022\017\n\007" - "timeout\030\010 \001(\004\022\023\n\013is_response\030\t \001(\010\0220\n\017fo" - "rward_targets\030\n \003(\0132\027.bgs.protocol.Proce" - "ssId\022\024\n\014service_hash\030\013 \001(\007\022\021\n\tclient_id\030" - "\r \001(\t\"\352\001\n\013KafkaHeader\022\024\n\014service_hash\030\001 " - "\001(\007\022\021\n\tmethod_id\030\002 \001(\r\022\r\n\005token\030\003 \001(\r\022\024\n" - "\tobject_id\030\004 \001(\004:\0010\022\017\n\004size\030\005 \001(\r:\0010\022\021\n\006" - "status\030\006 \001(\r:\0010\022\017\n\007timeout\030\007 \001(\004\022/\n\016forw" - "ard_target\030\010 \001(\0132\027.bgs.protocol.ProcessI" - "d\022\024\n\014return_topic\030\t \001(\t\022\021\n\tclient_id\030\013 \001" - "(\tB\033\n\rbnet.protocolB\010RpcProtoH\001P\000P\001P\002P\003", 1079); + "ice_hash\030\003 \002(\r\022\021\n\tmethod_id\030\004 \002(\r\".\n\014Fan" + "outTarget\022\021\n\tclient_id\030\001 \001(\t\022\013\n\003key\030\002 \001(" + "\014\"\365\002\n\006Header\022\022\n\nservice_id\030\001 \002(\r\022\021\n\tmeth" + "od_id\030\002 \001(\r\022\r\n\005token\030\003 \002(\r\022\024\n\tobject_id\030" + "\004 \001(\004:\0010\022\017\n\004size\030\005 \001(\r:\0010\022\021\n\006status\030\006 \001(" + "\r:\0010\022&\n\005error\030\007 \003(\0132\027.bgs.protocol.Error" + "Info\022\017\n\007timeout\030\010 \001(\004\022\023\n\013is_response\030\t \001" + "(\010\0220\n\017forward_targets\030\n \003(\0132\027.bgs.protoc" + "ol.ProcessId\022\024\n\014service_hash\030\013 \001(\007\022\021\n\tcl" + "ient_id\030\r \001(\t\0221\n\rfanout_target\030\016 \003(\0132\032.b" + "gs.protocol.FanoutTarget\022\037\n\027client_id_fa" + "nout_target\030\017 \003(\t\"\352\001\n\013KafkaHeader\022\024\n\014ser" + "vice_hash\030\001 \001(\007\022\021\n\tmethod_id\030\002 \001(\r\022\r\n\005to" + "ken\030\003 \001(\r\022\024\n\tobject_id\030\004 \001(\004:\0010\022\017\n\004size\030" + "\005 \001(\r:\0010\022\021\n\006status\030\006 \001(\r:\0010\022\017\n\007timeout\030\007" + " \001(\004\022/\n\016forward_target\030\010 \001(\0132\027.bgs.proto" + "col.ProcessId\022\024\n\014return_topic\030\t \001(\t\022\021\n\tc" + "lient_id\030\013 \001(\tB\033\n\rbnet.protocolB\010RpcProt" + "oH\001P\000P\001P\002P\003", 1211); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "rpc_types.proto", &protobuf_RegisterTypes); NO_RESPONSE::default_instance_ = new NO_RESPONSE(); @@ -298,6 +327,7 @@ void protobuf_AddDesc_rpc_5ftypes_2eproto() { ObjectAddress::default_instance_ = new ObjectAddress(); NoData::default_instance_ = new NoData(); ErrorInfo::default_instance_ = new ErrorInfo(); + FanoutTarget::default_instance_ = new FanoutTarget(); Header::default_instance_ = new Header(); KafkaHeader::default_instance_ = new KafkaHeader(); NO_RESPONSE::default_instance_->InitAsDefaultInstance(); @@ -306,6 +336,7 @@ void protobuf_AddDesc_rpc_5ftypes_2eproto() { ObjectAddress::default_instance_->InitAsDefaultInstance(); NoData::default_instance_->InitAsDefaultInstance(); ErrorInfo::default_instance_->InitAsDefaultInstance(); + FanoutTarget::default_instance_->InitAsDefaultInstance(); Header::default_instance_->InitAsDefaultInstance(); KafkaHeader::default_instance_->InitAsDefaultInstance(); ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_rpc_5ftypes_2eproto); @@ -1863,6 +1894,298 @@ void ErrorInfo::Swap(ErrorInfo* other) { // =================================================================== #ifndef _MSC_VER +const int FanoutTarget::kClientIdFieldNumber; +const int FanoutTarget::kKeyFieldNumber; +#endif // !_MSC_VER + +FanoutTarget::FanoutTarget() + : ::google::protobuf::Message() { + SharedCtor(); + // @@protoc_insertion_point(constructor:bgs.protocol.FanoutTarget) +} + +void FanoutTarget::InitAsDefaultInstance() { +} + +FanoutTarget::FanoutTarget(const FanoutTarget& from) + : ::google::protobuf::Message() { + SharedCtor(); + MergeFrom(from); + // @@protoc_insertion_point(copy_constructor:bgs.protocol.FanoutTarget) +} + +void FanoutTarget::SharedCtor() { + ::google::protobuf::internal::GetEmptyString(); + _cached_size_ = 0; + client_id_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + key_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + ::memset(_has_bits_, 0, sizeof(_has_bits_)); +} + +FanoutTarget::~FanoutTarget() { + // @@protoc_insertion_point(destructor:bgs.protocol.FanoutTarget) + SharedDtor(); +} + +void FanoutTarget::SharedDtor() { + if (client_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + delete client_id_; + } + if (key_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + delete key_; + } + if (this != default_instance_) { + } +} + +void FanoutTarget::SetCachedSize(int size) const { + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); +} +const ::google::protobuf::Descriptor* FanoutTarget::descriptor() { + protobuf_AssignDescriptorsOnce(); + return FanoutTarget_descriptor_; +} + +const FanoutTarget& FanoutTarget::default_instance() { + if (default_instance_ == NULL) protobuf_AddDesc_rpc_5ftypes_2eproto(); + return *default_instance_; +} + +FanoutTarget* FanoutTarget::default_instance_ = NULL; + +FanoutTarget* FanoutTarget::New() const { + return new FanoutTarget; +} + +void FanoutTarget::Clear() { + if (_has_bits_[0 / 32] & 3) { + if (has_client_id()) { + if (client_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + client_id_->clear(); + } + } + if (has_key()) { + if (key_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + key_->clear(); + } + } + } + ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->Clear(); +} + +bool FanoutTarget::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:bgs.protocol.FanoutTarget) + for (;;) { + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // optional string client_id = 1; + case 1: { + if (tag == 10) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_client_id())); + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->client_id().data(), this->client_id().length(), + ::google::protobuf::internal::WireFormat::PARSE, + "client_id"); + } else { + goto handle_unusual; + } + if (input->ExpectTag(18)) goto parse_key; + break; + } + + // optional bytes key = 2; + case 2: { + if (tag == 18) { + parse_key: + DO_(::google::protobuf::internal::WireFormatLite::ReadBytes( + input, this->mutable_key())); + } else { + goto handle_unusual; + } + if (input->ExpectAtEnd()) goto success; + break; + } + + default: { + handle_unusual: + if (tag == 0 || + ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:bgs.protocol.FanoutTarget) + return true; +failure: + // @@protoc_insertion_point(parse_failure:bgs.protocol.FanoutTarget) + return false; +#undef DO_ +} + +void FanoutTarget::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:bgs.protocol.FanoutTarget) + // optional string client_id = 1; + if (has_client_id()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->client_id().data(), this->client_id().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "client_id"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 1, this->client_id(), output); + } + + // optional bytes key = 2; + if (has_key()) { + ::google::protobuf::internal::WireFormatLite::WriteBytesMaybeAliased( + 2, this->key(), output); + } + + if (!unknown_fields().empty()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:bgs.protocol.FanoutTarget) +} + +::google::protobuf::uint8* FanoutTarget::SerializeWithCachedSizesToArray( + ::google::protobuf::uint8* target) const { + // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.FanoutTarget) + // optional string client_id = 1; + if (has_client_id()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->client_id().data(), this->client_id().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "client_id"); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 1, this->client_id(), target); + } + + // optional bytes key = 2; + if (has_key()) { + target = + ::google::protobuf::internal::WireFormatLite::WriteBytesToArray( + 2, this->key(), target); + } + + if (!unknown_fields().empty()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.FanoutTarget) + return target; +} + +int FanoutTarget::ByteSize() const { + int total_size = 0; + + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { + // optional string client_id = 1; + if (has_client_id()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->client_id()); + } + + // optional bytes key = 2; + if (has_key()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::BytesSize( + this->key()); + } + + } + if (!unknown_fields().empty()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = total_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} + +void FanoutTarget::MergeFrom(const ::google::protobuf::Message& from) { + GOOGLE_CHECK_NE(&from, this); + const FanoutTarget* source = + ::google::protobuf::internal::dynamic_cast_if_available<const FanoutTarget*>( + &from); + if (source == NULL) { + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + MergeFrom(*source); + } +} + +void FanoutTarget::MergeFrom(const FanoutTarget& from) { + GOOGLE_CHECK_NE(&from, this); + if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from.has_client_id()) { + set_client_id(from.client_id()); + } + if (from.has_key()) { + set_key(from.key()); + } + } + mutable_unknown_fields()->MergeFrom(from.unknown_fields()); +} + +void FanoutTarget::CopyFrom(const ::google::protobuf::Message& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void FanoutTarget::CopyFrom(const FanoutTarget& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool FanoutTarget::IsInitialized() const { + + return true; +} + +void FanoutTarget::Swap(FanoutTarget* other) { + if (other != this) { + std::swap(client_id_, other->client_id_); + std::swap(key_, other->key_); + std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.Swap(&other->_unknown_fields_); + std::swap(_cached_size_, other->_cached_size_); + } +} + +::google::protobuf::Metadata FanoutTarget::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + ::google::protobuf::Metadata metadata; + metadata.descriptor = FanoutTarget_descriptor_; + metadata.reflection = FanoutTarget_reflection_; + return metadata; +} + + +// =================================================================== + +#ifndef _MSC_VER const int Header::kServiceIdFieldNumber; const int Header::kMethodIdFieldNumber; const int Header::kTokenFieldNumber; @@ -1875,6 +2198,8 @@ const int Header::kIsResponseFieldNumber; const int Header::kForwardTargetsFieldNumber; const int Header::kServiceHashFieldNumber; const int Header::kClientIdFieldNumber; +const int Header::kFanoutTargetFieldNumber; +const int Header::kClientIdFanoutTargetFieldNumber; #endif // !_MSC_VER Header::Header() @@ -1974,6 +2299,8 @@ void Header::Clear() { error_.Clear(); forward_targets_.Clear(); + fanout_target_.Clear(); + client_id_fanout_target_.Clear(); ::memset(_has_bits_, 0, sizeof(_has_bits_)); mutable_unknown_fields()->Clear(); } @@ -2163,6 +2490,39 @@ bool Header::MergePartialFromCodedStream( } else { goto handle_unusual; } + if (input->ExpectTag(114)) goto parse_fanout_target; + break; + } + + // repeated .bgs.protocol.FanoutTarget fanout_target = 14; + case 14: { + if (tag == 114) { + parse_fanout_target: + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, add_fanout_target())); + } else { + goto handle_unusual; + } + if (input->ExpectTag(114)) goto parse_fanout_target; + if (input->ExpectTag(122)) goto parse_client_id_fanout_target; + break; + } + + // repeated string client_id_fanout_target = 15; + case 15: { + if (tag == 122) { + parse_client_id_fanout_target: + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->add_client_id_fanout_target())); + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->client_id_fanout_target(this->client_id_fanout_target_size() - 1).data(), + this->client_id_fanout_target(this->client_id_fanout_target_size() - 1).length(), + ::google::protobuf::internal::WireFormat::PARSE, + "client_id_fanout_target"); + } else { + goto handle_unusual; + } + if (input->ExpectTag(122)) goto parse_client_id_fanout_target; if (input->ExpectAtEnd()) goto success; break; } @@ -2259,6 +2619,22 @@ void Header::SerializeWithCachedSizes( 13, this->client_id(), output); } + // repeated .bgs.protocol.FanoutTarget fanout_target = 14; + for (int i = 0; i < this->fanout_target_size(); i++) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 14, this->fanout_target(i), output); + } + + // repeated string client_id_fanout_target = 15; + for (int i = 0; i < this->client_id_fanout_target_size(); i++) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->client_id_fanout_target(i).data(), this->client_id_fanout_target(i).length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "client_id_fanout_target"); + ::google::protobuf::internal::WireFormatLite::WriteString( + 15, this->client_id_fanout_target(i), output); + } + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -2339,6 +2715,23 @@ void Header::SerializeWithCachedSizes( 13, this->client_id(), target); } + // repeated .bgs.protocol.FanoutTarget fanout_target = 14; + for (int i = 0; i < this->fanout_target_size(); i++) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteMessageNoVirtualToArray( + 14, this->fanout_target(i), target); + } + + // repeated string client_id_fanout_target = 15; + for (int i = 0; i < this->client_id_fanout_target_size(); i++) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->client_id_fanout_target(i).data(), this->client_id_fanout_target(i).length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "client_id_fanout_target"); + target = ::google::protobuf::internal::WireFormatLite:: + WriteStringToArray(15, this->client_id_fanout_target(i), target); + } + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -2436,6 +2829,21 @@ int Header::ByteSize() const { this->forward_targets(i)); } + // repeated .bgs.protocol.FanoutTarget fanout_target = 14; + total_size += 1 * this->fanout_target_size(); + for (int i = 0; i < this->fanout_target_size(); i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->fanout_target(i)); + } + + // repeated string client_id_fanout_target = 15; + total_size += 1 * this->client_id_fanout_target_size(); + for (int i = 0; i < this->client_id_fanout_target_size(); i++) { + total_size += ::google::protobuf::internal::WireFormatLite::StringSize( + this->client_id_fanout_target(i)); + } + if (!unknown_fields().empty()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( @@ -2463,6 +2871,8 @@ void Header::MergeFrom(const Header& from) { GOOGLE_CHECK_NE(&from, this); error_.MergeFrom(from.error_); forward_targets_.MergeFrom(from.forward_targets_); + fanout_target_.MergeFrom(from.fanout_target_); + client_id_fanout_target_.MergeFrom(from.client_id_fanout_target_); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { if (from.has_service_id()) { set_service_id(from.service_id()); @@ -2534,6 +2944,8 @@ void Header::Swap(Header* other) { forward_targets_.Swap(&other->forward_targets_); std::swap(service_hash_, other->service_hash_); std::swap(client_id_, other->client_id_); + fanout_target_.Swap(&other->fanout_target_); + client_id_fanout_target_.Swap(&other->client_id_fanout_target_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); diff --git a/src/server/proto/Client/rpc_types.pb.h b/src/server/proto/Client/rpc_types.pb.h index 4d56daf3131..7808a857c03 100644 --- a/src/server/proto/Client/rpc_types.pb.h +++ b/src/server/proto/Client/rpc_types.pb.h @@ -45,6 +45,7 @@ class ProcessId; class ObjectAddress; class NoData; class ErrorInfo; +class FanoutTarget; class Header; class KafkaHeader; @@ -573,6 +574,105 @@ class TC_PROTO_API ErrorInfo : public ::google::protobuf::Message { }; // ------------------------------------------------------------------- +class TC_PROTO_API FanoutTarget : public ::google::protobuf::Message { + public: + FanoutTarget(); + virtual ~FanoutTarget(); + + FanoutTarget(const FanoutTarget& from); + + inline FanoutTarget& operator=(const FanoutTarget& from) { + CopyFrom(from); + return *this; + } + + inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const { + return _unknown_fields_; + } + + inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ::google::protobuf::Descriptor* descriptor(); + static const FanoutTarget& default_instance(); + + void Swap(FanoutTarget* other); + + // implements Message ---------------------------------------------- + + FanoutTarget* New() const; + void CopyFrom(const ::google::protobuf::Message& from); + void MergeFrom(const ::google::protobuf::Message& from); + void CopyFrom(const FanoutTarget& from); + void MergeFrom(const FanoutTarget& from); + void Clear(); + bool IsInitialized() const; + + int ByteSize() const; + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input); + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const; + ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; + int GetCachedSize() const { return _cached_size_; } + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const; + public: + ::google::protobuf::Metadata GetMetadata() const; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // optional string client_id = 1; + inline bool has_client_id() const; + inline void clear_client_id(); + static const int kClientIdFieldNumber = 1; + inline const ::std::string& client_id() const; + inline void set_client_id(const ::std::string& value); + inline void set_client_id(const char* value); + inline void set_client_id(const char* value, size_t size); + inline ::std::string* mutable_client_id(); + inline ::std::string* release_client_id(); + inline void set_allocated_client_id(::std::string* client_id); + + // optional bytes key = 2; + inline bool has_key() const; + inline void clear_key(); + static const int kKeyFieldNumber = 2; + inline const ::std::string& key() const; + inline void set_key(const ::std::string& value); + inline void set_key(const char* value); + inline void set_key(const void* value, size_t size); + inline ::std::string* mutable_key(); + inline ::std::string* release_key(); + inline void set_allocated_key(::std::string* key); + + // @@protoc_insertion_point(class_scope:bgs.protocol.FanoutTarget) + private: + inline void set_has_client_id(); + inline void clear_has_client_id(); + inline void set_has_key(); + inline void clear_has_key(); + + ::google::protobuf::UnknownFieldSet _unknown_fields_; + + ::google::protobuf::uint32 _has_bits_[1]; + mutable int _cached_size_; + ::std::string* client_id_; + ::std::string* key_; + friend void TC_PROTO_API protobuf_AddDesc_rpc_5ftypes_2eproto(); + friend void protobuf_AssignDesc_rpc_5ftypes_2eproto(); + friend void protobuf_ShutdownFile_rpc_5ftypes_2eproto(); + + void InitAsDefaultInstance(); + static FanoutTarget* default_instance_; +}; +// ------------------------------------------------------------------- + class TC_PROTO_API Header : public ::google::protobuf::Message { public: Header(); @@ -725,6 +825,34 @@ class TC_PROTO_API Header : public ::google::protobuf::Message { inline ::std::string* release_client_id(); inline void set_allocated_client_id(::std::string* client_id); + // repeated .bgs.protocol.FanoutTarget fanout_target = 14; + inline int fanout_target_size() const; + inline void clear_fanout_target(); + static const int kFanoutTargetFieldNumber = 14; + inline const ::bgs::protocol::FanoutTarget& fanout_target(int index) const; + inline ::bgs::protocol::FanoutTarget* mutable_fanout_target(int index); + inline ::bgs::protocol::FanoutTarget* add_fanout_target(); + inline const ::google::protobuf::RepeatedPtrField< ::bgs::protocol::FanoutTarget >& + fanout_target() const; + inline ::google::protobuf::RepeatedPtrField< ::bgs::protocol::FanoutTarget >* + mutable_fanout_target(); + + // repeated string client_id_fanout_target = 15; + inline int client_id_fanout_target_size() const; + inline void clear_client_id_fanout_target(); + static const int kClientIdFanoutTargetFieldNumber = 15; + inline const ::std::string& client_id_fanout_target(int index) const; + inline ::std::string* mutable_client_id_fanout_target(int index); + inline void set_client_id_fanout_target(int index, const ::std::string& value); + inline void set_client_id_fanout_target(int index, const char* value); + inline void set_client_id_fanout_target(int index, const char* value, size_t size); + inline ::std::string* add_client_id_fanout_target(); + inline void add_client_id_fanout_target(const ::std::string& value); + inline void add_client_id_fanout_target(const char* value); + inline void add_client_id_fanout_target(const char* value, size_t size); + inline const ::google::protobuf::RepeatedPtrField< ::std::string>& client_id_fanout_target() const; + inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_client_id_fanout_target(); + // @@protoc_insertion_point(class_scope:bgs.protocol.Header) private: inline void set_has_service_id(); @@ -763,6 +891,8 @@ class TC_PROTO_API Header : public ::google::protobuf::Message { ::google::protobuf::uint64 timeout_; ::google::protobuf::RepeatedPtrField< ::bgs::protocol::ProcessId > forward_targets_; ::std::string* client_id_; + ::google::protobuf::RepeatedPtrField< ::bgs::protocol::FanoutTarget > fanout_target_; + ::google::protobuf::RepeatedPtrField< ::std::string> client_id_fanout_target_; ::google::protobuf::uint32 service_hash_; friend void TC_PROTO_API protobuf_AddDesc_rpc_5ftypes_2eproto(); friend void protobuf_AssignDesc_rpc_5ftypes_2eproto(); @@ -1310,6 +1440,162 @@ inline void ErrorInfo::set_method_id(::google::protobuf::uint32 value) { // ------------------------------------------------------------------- +// FanoutTarget + +// optional string client_id = 1; +inline bool FanoutTarget::has_client_id() const { + return (_has_bits_[0] & 0x00000001u) != 0; +} +inline void FanoutTarget::set_has_client_id() { + _has_bits_[0] |= 0x00000001u; +} +inline void FanoutTarget::clear_has_client_id() { + _has_bits_[0] &= ~0x00000001u; +} +inline void FanoutTarget::clear_client_id() { + if (client_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + client_id_->clear(); + } + clear_has_client_id(); +} +inline const ::std::string& FanoutTarget::client_id() const { + // @@protoc_insertion_point(field_get:bgs.protocol.FanoutTarget.client_id) + return *client_id_; +} +inline void FanoutTarget::set_client_id(const ::std::string& value) { + set_has_client_id(); + if (client_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + client_id_ = new ::std::string; + } + client_id_->assign(value); + // @@protoc_insertion_point(field_set:bgs.protocol.FanoutTarget.client_id) +} +inline void FanoutTarget::set_client_id(const char* value) { + set_has_client_id(); + if (client_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + client_id_ = new ::std::string; + } + client_id_->assign(value); + // @@protoc_insertion_point(field_set_char:bgs.protocol.FanoutTarget.client_id) +} +inline void FanoutTarget::set_client_id(const char* value, size_t size) { + set_has_client_id(); + if (client_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + client_id_ = new ::std::string; + } + client_id_->assign(reinterpret_cast<const char*>(value), size); + // @@protoc_insertion_point(field_set_pointer:bgs.protocol.FanoutTarget.client_id) +} +inline ::std::string* FanoutTarget::mutable_client_id() { + set_has_client_id(); + if (client_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + client_id_ = new ::std::string; + } + // @@protoc_insertion_point(field_mutable:bgs.protocol.FanoutTarget.client_id) + return client_id_; +} +inline ::std::string* FanoutTarget::release_client_id() { + clear_has_client_id(); + if (client_id_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + return NULL; + } else { + ::std::string* temp = client_id_; + client_id_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return temp; + } +} +inline void FanoutTarget::set_allocated_client_id(::std::string* client_id) { + if (client_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + delete client_id_; + } + if (client_id) { + set_has_client_id(); + client_id_ = client_id; + } else { + clear_has_client_id(); + client_id_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + } + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.FanoutTarget.client_id) +} + +// optional bytes key = 2; +inline bool FanoutTarget::has_key() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +inline void FanoutTarget::set_has_key() { + _has_bits_[0] |= 0x00000002u; +} +inline void FanoutTarget::clear_has_key() { + _has_bits_[0] &= ~0x00000002u; +} +inline void FanoutTarget::clear_key() { + if (key_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + key_->clear(); + } + clear_has_key(); +} +inline const ::std::string& FanoutTarget::key() const { + // @@protoc_insertion_point(field_get:bgs.protocol.FanoutTarget.key) + return *key_; +} +inline void FanoutTarget::set_key(const ::std::string& value) { + set_has_key(); + if (key_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + key_ = new ::std::string; + } + key_->assign(value); + // @@protoc_insertion_point(field_set:bgs.protocol.FanoutTarget.key) +} +inline void FanoutTarget::set_key(const char* value) { + set_has_key(); + if (key_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + key_ = new ::std::string; + } + key_->assign(value); + // @@protoc_insertion_point(field_set_char:bgs.protocol.FanoutTarget.key) +} +inline void FanoutTarget::set_key(const void* value, size_t size) { + set_has_key(); + if (key_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + key_ = new ::std::string; + } + key_->assign(reinterpret_cast<const char*>(value), size); + // @@protoc_insertion_point(field_set_pointer:bgs.protocol.FanoutTarget.key) +} +inline ::std::string* FanoutTarget::mutable_key() { + set_has_key(); + if (key_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + key_ = new ::std::string; + } + // @@protoc_insertion_point(field_mutable:bgs.protocol.FanoutTarget.key) + return key_; +} +inline ::std::string* FanoutTarget::release_key() { + clear_has_key(); + if (key_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + return NULL; + } else { + ::std::string* temp = key_; + key_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return temp; + } +} +inline void FanoutTarget::set_allocated_key(::std::string* key) { + if (key_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + delete key_; + } + if (key) { + set_has_key(); + key_ = key; + } else { + clear_has_key(); + key_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + } + // @@protoc_insertion_point(field_set_allocated:bgs.protocol.FanoutTarget.key) +} + +// ------------------------------------------------------------------- + // Header // required uint32 service_id = 1; @@ -1664,6 +1950,90 @@ inline void Header::set_allocated_client_id(::std::string* client_id) { // @@protoc_insertion_point(field_set_allocated:bgs.protocol.Header.client_id) } +// repeated .bgs.protocol.FanoutTarget fanout_target = 14; +inline int Header::fanout_target_size() const { + return fanout_target_.size(); +} +inline void Header::clear_fanout_target() { + fanout_target_.Clear(); +} +inline const ::bgs::protocol::FanoutTarget& Header::fanout_target(int index) const { + // @@protoc_insertion_point(field_get:bgs.protocol.Header.fanout_target) + return fanout_target_.Get(index); +} +inline ::bgs::protocol::FanoutTarget* Header::mutable_fanout_target(int index) { + // @@protoc_insertion_point(field_mutable:bgs.protocol.Header.fanout_target) + return fanout_target_.Mutable(index); +} +inline ::bgs::protocol::FanoutTarget* Header::add_fanout_target() { + // @@protoc_insertion_point(field_add:bgs.protocol.Header.fanout_target) + return fanout_target_.Add(); +} +inline const ::google::protobuf::RepeatedPtrField< ::bgs::protocol::FanoutTarget >& +Header::fanout_target() const { + // @@protoc_insertion_point(field_list:bgs.protocol.Header.fanout_target) + return fanout_target_; +} +inline ::google::protobuf::RepeatedPtrField< ::bgs::protocol::FanoutTarget >* +Header::mutable_fanout_target() { + // @@protoc_insertion_point(field_mutable_list:bgs.protocol.Header.fanout_target) + return &fanout_target_; +} + +// repeated string client_id_fanout_target = 15; +inline int Header::client_id_fanout_target_size() const { + return client_id_fanout_target_.size(); +} +inline void Header::clear_client_id_fanout_target() { + client_id_fanout_target_.Clear(); +} +inline const ::std::string& Header::client_id_fanout_target(int index) const { + // @@protoc_insertion_point(field_get:bgs.protocol.Header.client_id_fanout_target) + return client_id_fanout_target_.Get(index); +} +inline ::std::string* Header::mutable_client_id_fanout_target(int index) { + // @@protoc_insertion_point(field_mutable:bgs.protocol.Header.client_id_fanout_target) + return client_id_fanout_target_.Mutable(index); +} +inline void Header::set_client_id_fanout_target(int index, const ::std::string& value) { + // @@protoc_insertion_point(field_set:bgs.protocol.Header.client_id_fanout_target) + client_id_fanout_target_.Mutable(index)->assign(value); +} +inline void Header::set_client_id_fanout_target(int index, const char* value) { + client_id_fanout_target_.Mutable(index)->assign(value); + // @@protoc_insertion_point(field_set_char:bgs.protocol.Header.client_id_fanout_target) +} +inline void Header::set_client_id_fanout_target(int index, const char* value, size_t size) { + client_id_fanout_target_.Mutable(index)->assign( + reinterpret_cast<const char*>(value), size); + // @@protoc_insertion_point(field_set_pointer:bgs.protocol.Header.client_id_fanout_target) +} +inline ::std::string* Header::add_client_id_fanout_target() { + return client_id_fanout_target_.Add(); +} +inline void Header::add_client_id_fanout_target(const ::std::string& value) { + client_id_fanout_target_.Add()->assign(value); + // @@protoc_insertion_point(field_add:bgs.protocol.Header.client_id_fanout_target) +} +inline void Header::add_client_id_fanout_target(const char* value) { + client_id_fanout_target_.Add()->assign(value); + // @@protoc_insertion_point(field_add_char:bgs.protocol.Header.client_id_fanout_target) +} +inline void Header::add_client_id_fanout_target(const char* value, size_t size) { + client_id_fanout_target_.Add()->assign(reinterpret_cast<const char*>(value), size); + // @@protoc_insertion_point(field_add_pointer:bgs.protocol.Header.client_id_fanout_target) +} +inline const ::google::protobuf::RepeatedPtrField< ::std::string>& +Header::client_id_fanout_target() const { + // @@protoc_insertion_point(field_list:bgs.protocol.Header.client_id_fanout_target) + return client_id_fanout_target_; +} +inline ::google::protobuf::RepeatedPtrField< ::std::string>* +Header::mutable_client_id_fanout_target() { + // @@protoc_insertion_point(field_mutable_list:bgs.protocol.Header.client_id_fanout_target) + return &client_id_fanout_target_; +} + // ------------------------------------------------------------------- // KafkaHeader diff --git a/src/server/proto/Client/voice_types.pb.cc b/src/server/proto/Client/voice_types.pb.cc index 0fed25ba2fc..c1a6934a710 100644 --- a/src/server/proto/Client/voice_types.pb.cc +++ b/src/server/proto/Client/voice_types.pb.cc @@ -95,10 +95,11 @@ void protobuf_AddDesc_voice_5ftypes_2eproto() { "\033.bgs.protocol.VoiceJoinType\0222\n\013mute_rea" "son\030\005 \001(\0162\035.bgs.protocol.VoiceMuteReason" "*<\n\rVoiceJoinType\022\025\n\021VOICE_JOIN_NORMAL\020\000" - "\022\024\n\020VOICE_JOIN_MUTED\020\001*\202\001\n\017VoiceMuteReas" + "\022\024\n\020VOICE_JOIN_MUTED\020\001*\243\001\n\017VoiceMuteReas" "on\022\032\n\026VOICE_MUTE_REASON_NONE\020\000\0222\n.VOICE_" "MUTE_REASON_PARENTAL_CONTROL_LISTEN_ONLY" - "\020\001\022\037\n\033VOICE_MUTE_REASON_REQUESTED\020\002B\002H\001", 399); + "\020\001\022\037\n\033VOICE_MUTE_REASON_REQUESTED\020\002\022\037\n\033V" + "OICE_MUTE_REASON_SQUELCHED\020\003B\002H\001", 432); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "voice_types.proto", &protobuf_RegisterTypes); VoiceCredentials::default_instance_ = new VoiceCredentials(); @@ -135,6 +136,7 @@ bool VoiceMuteReason_IsValid(int value) { case 0: case 1: case 2: + case 3: return true; default: return false; diff --git a/src/server/proto/Client/voice_types.pb.h b/src/server/proto/Client/voice_types.pb.h index 658ca9917d5..3784af85015 100644 --- a/src/server/proto/Client/voice_types.pb.h +++ b/src/server/proto/Client/voice_types.pb.h @@ -60,11 +60,12 @@ inline bool VoiceJoinType_Parse( enum VoiceMuteReason { VOICE_MUTE_REASON_NONE = 0, VOICE_MUTE_REASON_PARENTAL_CONTROL_LISTEN_ONLY = 1, - VOICE_MUTE_REASON_REQUESTED = 2 + VOICE_MUTE_REASON_REQUESTED = 2, + VOICE_MUTE_REASON_SQUELCHED = 3 }; TC_PROTO_API bool VoiceMuteReason_IsValid(int value); const VoiceMuteReason VoiceMuteReason_MIN = VOICE_MUTE_REASON_NONE; -const VoiceMuteReason VoiceMuteReason_MAX = VOICE_MUTE_REASON_REQUESTED; +const VoiceMuteReason VoiceMuteReason_MAX = VOICE_MUTE_REASON_SQUELCHED; const int VoiceMuteReason_ARRAYSIZE = VoiceMuteReason_MAX + 1; TC_PROTO_API const ::google::protobuf::EnumDescriptor* VoiceMuteReason_descriptor(); |