From a9ed4292055cd94575fb1f1d52051640e45df410 Mon Sep 17 00:00:00 2001 From: levlam Date: Sat, 3 Feb 2018 02:05:11 +0300 Subject: [PATCH] Add source to get_*_id_object. GitOrigin-RevId: 4d3016274a22be4a59ee088ad6f3d9c297128a08 --- td/telegram/CallActor.cpp | 2 +- td/telegram/CallbackQueriesManager.cpp | 20 +++++---- td/telegram/ContactsManager.cpp | 60 +++++++++++++++----------- td/telegram/ContactsManager.h | 8 ++-- td/telegram/InlineQueriesManager.cpp | 13 +++--- td/telegram/MessagesManager.cpp | 59 ++++++++++++++----------- td/telegram/Payments.cpp | 3 +- td/telegram/Td.cpp | 27 +++++++----- td/telegram/UpdatesManager.cpp | 42 +++++++++--------- 9 files changed, 131 insertions(+), 103 deletions(-) diff --git a/td/telegram/CallActor.cpp b/td/telegram/CallActor.cpp index d997899f..2dd70218 100644 --- a/td/telegram/CallActor.cpp +++ b/td/telegram/CallActor.cpp @@ -565,7 +565,7 @@ void CallActor::flush_call_state() { call_state_need_flush_ = false; // can't call const function - // send_closure(G()->contacts_manager(), &ContactsManager::get_user_id_object, user_id_); + // send_closure(G()->contacts_manager(), &ContactsManager::get_user_id_object, user_id_, "flush_call_state"); send_closure(G()->td(), &Td::send_update, make_tl_object( make_tl_object(local_call_id_.get(), is_outgoing_ ? user_id_.get() : call_admin_id_, diff --git a/td/telegram/CallbackQueriesManager.cpp b/td/telegram/CallbackQueriesManager.cpp index 41d8a7d5..46bd5e1c 100644 --- a/td/telegram/CallbackQueriesManager.cpp +++ b/td/telegram/CallbackQueriesManager.cpp @@ -177,10 +177,11 @@ void CallbackQueriesManager::on_new_query(int32 flags, int64 callback_query_id, } td_->messages_manager_->force_create_dialog(dialog_id, "on_new_callback_query"); - send_closure(G()->td(), &Td::send_update, - make_tl_object( - callback_query_id, td_->contacts_manager_->get_user_id_object(sender_user_id), dialog_id.get(), - message_id.get(), chat_instance, std::move(payload))); + send_closure( + G()->td(), &Td::send_update, + make_tl_object( + callback_query_id, td_->contacts_manager_->get_user_id_object(sender_user_id, "updateNewCallbackQuery"), + dialog_id.get(), message_id.get(), chat_instance, std::move(payload))); } void CallbackQueriesManager::on_new_inline_query( @@ -202,11 +203,12 @@ void CallbackQueriesManager::on_new_inline_query( if (payload == nullptr) { return; } - send_closure(G()->td(), &Td::send_update, - make_tl_object( - callback_query_id, td_->contacts_manager_->get_user_id_object(sender_user_id), - InlineQueriesManager::get_inline_message_id(std::move(inline_message_id)), chat_instance, - std::move(payload))); + send_closure( + G()->td(), &Td::send_update, + make_tl_object( + callback_query_id, td_->contacts_manager_->get_user_id_object(sender_user_id, "updateNewInlineCallbackQuery"), + InlineQueriesManager::get_inline_message_id(std::move(inline_message_id)), chat_instance, + std::move(payload))); } int64 CallbackQueriesManager::send_callback_query(FullMessageId full_message_id, diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp index da7875dd..8cf6cbac 100644 --- a/td/telegram/ContactsManager.cpp +++ b/td/telegram/ContactsManager.cpp @@ -3243,7 +3243,7 @@ void ContactsManager::on_load_imported_contacts_finished() { LOG(INFO) << "Finished to load " << all_imported_contacts_.size() << " imported contacts"; for (const auto &contact : all_imported_contacts_) { - get_user_id_object(contact.get_user_id()); // to ensure updateUser + get_user_id_object(contact.get_user_id(), "on_load_imported_contacts_finished"); // to ensure updateUser } are_imported_contacts_loaded_ = true; @@ -4328,7 +4328,7 @@ void ContactsManager::on_imported_contacts(int64 random_id, vector impor std::unordered_map unique_id_to_unimported_contact_invites; for (size_t i = 0; i < add_size; i++) { auto unique_id = imported_contacts_pos_[i]; - get_user_id_object(imported_contact_user_ids[i]); // to ensure updateUser + get_user_id_object(imported_contact_user_ids[i], "on_imported_contacts"); // to ensure updateUser all_imported_contacts_[unique_id].set_user_id(imported_contact_user_ids[i]); unique_id_to_unimported_contact_invites[unique_id] = unimported_contact_invites[i]; } @@ -5823,7 +5823,7 @@ void ContactsManager::update_user_full(UserFull *user_full, UserId user_id) { user_full->is_changed = false; if (user_full->is_inited) { send_closure(G()->td(), &Td::send_update, - make_tl_object(get_user_id_object(user_id), + make_tl_object(get_user_id_object(user_id, "updateUserFullInfo"), get_user_full_info_object(user_id, user_full))); } } @@ -5841,9 +5841,10 @@ void ContactsManager::update_chat_full(ChatFull *chat_full, ChatId chat_id) { on_update_dialog_administrators(DialogId(chat_id), std::move(administrator_user_ids), chat_full->version != -1); chat_full->is_changed = false; - send_closure(G()->td(), &Td::send_update, - make_tl_object(get_basic_group_id_object(chat_id), - get_basic_group_full_info_object(chat_full))); + send_closure( + G()->td(), &Td::send_update, + make_tl_object(get_basic_group_id_object(chat_id, "update_chat_full"), + get_basic_group_full_info_object(chat_full))); } } @@ -5854,9 +5855,10 @@ void ContactsManager::update_channel_full(ChannelFull *channel_full, ChannelId c channel_full->administrator_count = channel_full->participant_count; } channel_full->is_changed = false; - send_closure(G()->td(), &Td::send_update, - make_tl_object(get_supergroup_id_object(channel_id), - get_channel_full_info_object(channel_full))); + send_closure( + G()->td(), &Td::send_update, + make_tl_object(get_supergroup_id_object(channel_id, "update_channel_full"), + get_channel_full_info_object(channel_full))); } } @@ -6604,7 +6606,8 @@ tl_object_ptr ContactsManager::get_chat_member_object( const DialogParticipant &dialog_participant) const { UserId participant_user_id = dialog_participant.user_id; return make_tl_object( - get_user_id_object(participant_user_id), get_user_id_object(dialog_participant.inviter_user_id), + get_user_id_object(participant_user_id, "chatMember.user_id"), + get_user_id_object(dialog_participant.inviter_user_id, "chatMember.inviter_user_id"), dialog_participant.joined_date, dialog_participant.status.get_chat_member_status_object(), get_bot_info_object(participant_user_id)); } @@ -8948,9 +8951,9 @@ tl_object_ptr ContactsManager::get_user_status_object(const } } -int32 ContactsManager::get_user_id_object(UserId user_id) const { +int32 ContactsManager::get_user_id_object(UserId user_id, const char *source) const { if (user_id.is_valid() && get_user(user_id) == nullptr && unknown_users_.count(user_id) == 0) { - LOG(ERROR) << "Have no info about " << user_id; + LOG(ERROR) << "Have no info about " << user_id << " from " << source; unknown_users_.insert(user_id); send_closure(G()->td(), &Td::send_update, td_api::make_object(td_api::make_object( @@ -8988,7 +8991,7 @@ tl_object_ptr ContactsManager::get_user_object(UserId user_id, con } vector ContactsManager::get_user_ids_object(const vector &user_ids) const { - return transform(user_ids, [this](UserId user_id) { return get_user_id_object(user_id); }); + return transform(user_ids, [this](UserId user_id) { return get_user_id_object(user_id, "get_user_ids_object"); }); } tl_object_ptr ContactsManager::get_users_object(int32 total_count, @@ -9013,9 +9016,9 @@ tl_object_ptr ContactsManager::get_user_full_info_object(U get_bot_info_object(user_full->bot_info.get())); } -int32 ContactsManager::get_basic_group_id_object(ChatId chat_id) const { +int32 ContactsManager::get_basic_group_id_object(ChatId chat_id, const char *source) const { if (chat_id.is_valid() && get_chat(chat_id) == nullptr && unknown_chats_.count(chat_id) == 0) { - LOG(ERROR) << "Have no info about " << chat_id; + LOG(ERROR) << "Have no info about " << chat_id << " from " << source; unknown_chats_.insert(chat_id); send_closure( G()->td(), &Td::send_update, @@ -9035,7 +9038,8 @@ tl_object_ptr ContactsManager::get_basic_group_object(ChatId } return make_tl_object( chat_id.get(), chat->participant_count, get_chat_status(chat).get_chat_member_status_object(), - chat->everyone_is_administrator, chat->is_active, get_supergroup_id_object(chat->migrated_to_channel_id)); + chat->everyone_is_administrator, chat->is_active, + get_supergroup_id_object(chat->migrated_to_channel_id, "get_basic_group_object")); } tl_object_ptr ContactsManager::get_basic_group_full_info_object(ChatId chat_id) const { @@ -9046,15 +9050,15 @@ tl_object_ptr ContactsManager::get_basic_group_full_ const ChatFull *chat_full) const { CHECK(chat_full != nullptr); return make_tl_object( - get_user_id_object(chat_full->creator_user_id), + get_user_id_object(chat_full->creator_user_id, "basicGroupFullInfo"), transform(chat_full->participants, [this](const DialogParticipant &chat_participant) { return get_chat_member_object(chat_participant); }), chat_full->invite_link); } -int32 ContactsManager::get_supergroup_id_object(ChannelId channel_id) const { +int32 ContactsManager::get_supergroup_id_object(ChannelId channel_id, const char *source) const { if (channel_id.is_valid() && get_channel(channel_id) == nullptr && unknown_channels_.count(channel_id) == 0) { - LOG(ERROR) << "Have no info about " << channel_id; + LOG(ERROR) << "Have no info about " << channel_id << " received from " << source; unknown_channels_.insert(channel_id); send_closure(G()->td(), &Td::send_update, td_api::make_object(td_api::make_object( @@ -9091,7 +9095,8 @@ tl_object_ptr ContactsManager::get_channel_full_info channel_full->restricted_count, channel_full->banned_count, channel_full->can_get_participants, channel_full->can_set_username, channel_full->can_set_sticker_set, channel_full->is_all_history_available, channel_full->sticker_set_id, channel_full->invite_link, channel_full->pinned_message_id.get(), - get_basic_group_id_object(channel_full->migrated_from_chat_id), channel_full->migrated_from_max_message_id.get()); + get_basic_group_id_object(channel_full->migrated_from_chat_id, "get_channel_full_info_object"), + channel_full->migrated_from_max_message_id.get()); } tl_object_ptr ContactsManager::get_secret_chat_state_object(SecretChatState state) { @@ -9109,10 +9114,10 @@ tl_object_ptr ContactsManager::get_secret_chat_state_ob } } -int32 ContactsManager::get_secret_chat_id_object(SecretChatId secret_chat_id) const { +int32 ContactsManager::get_secret_chat_id_object(SecretChatId secret_chat_id, const char *source) const { if (secret_chat_id.is_valid() && get_secret_chat(secret_chat_id) == nullptr && unknown_secret_chats_.count(secret_chat_id) == 0) { - LOG(ERROR) << "Have no info about " << secret_chat_id; + LOG(ERROR) << "Have no info about " << secret_chat_id << " from " << source; unknown_secret_chats_.insert(secret_chat_id); send_closure( G()->td(), &Td::send_update, @@ -9133,8 +9138,9 @@ tl_object_ptr ContactsManager::get_secret_chat_object(Secret } get_user_force(secret_chat->user_id); return td_api::make_object( - secret_chat_id.get(), get_user_id_object(secret_chat->user_id), get_secret_chat_state_object(secret_chat->state), - secret_chat->is_outbound, secret_chat->ttl, secret_chat->key_hash, secret_chat->layer); + secret_chat_id.get(), get_user_id_object(secret_chat->user_id, "secretChat"), + get_secret_chat_state_object(secret_chat->state), secret_chat->is_outbound, secret_chat->ttl, + secret_chat->key_hash, secret_chat->layer); } tl_object_ptr ContactsManager::get_link_state_object(LinkState link) { @@ -9205,7 +9211,8 @@ tl_object_ptr ContactsManager::get_chat_invite_link_ } else { LOG(ERROR) << "Have no information about " << chat_id; } - chat_type = td_api::make_object(get_basic_group_id_object(chat_id)); + chat_type = td_api::make_object( + get_basic_group_id_object(chat_id, "get_chat_invite_link_info_object")); } else if (invite_link_info->channel_id != ChannelId()) { CHECK(invite_link_info->chat_id == ChatId()); auto channel_id = invite_link_info->channel_id; @@ -9223,7 +9230,8 @@ tl_object_ptr ContactsManager::get_chat_invite_link_ } else { LOG(ERROR) << "Have no information about " << channel_id; } - chat_type = td_api::make_object(get_supergroup_id_object(channel_id), !is_megagroup); + chat_type = td_api::make_object( + get_supergroup_id_object(channel_id, "get_chat_invite_link_info_object"), !is_megagroup); } else { title = invite_link_info->title; photo = &invite_link_info->photo; diff --git a/td/telegram/ContactsManager.h b/td/telegram/ContactsManager.h index 2f2303eb..5b0481a1 100644 --- a/td/telegram/ContactsManager.h +++ b/td/telegram/ContactsManager.h @@ -364,7 +364,7 @@ class ContactsManager : public Actor { vector get_dialog_administrators(DialogId chat_id, int left_tries, Promise &&promise); - int32 get_user_id_object(UserId user_id) const; + int32 get_user_id_object(UserId user_id, const char *source) const; tl_object_ptr get_user_object(UserId user_id) const; @@ -374,19 +374,19 @@ class ContactsManager : public Actor { tl_object_ptr get_user_full_info_object(UserId user_id) const; - int32 get_basic_group_id_object(ChatId chat_id) const; + int32 get_basic_group_id_object(ChatId chat_id, const char *source) const; tl_object_ptr get_basic_group_object(ChatId chat_id) const; tl_object_ptr get_basic_group_full_info_object(ChatId chat_id) const; - int32 get_supergroup_id_object(ChannelId channel_id) const; + int32 get_supergroup_id_object(ChannelId channel_id, const char *source) const; tl_object_ptr get_supergroup_object(ChannelId channel_id) const; tl_object_ptr get_channel_full_info_object(ChannelId channel_id) const; - int32 get_secret_chat_id_object(SecretChatId secret_chat_id) const; + int32 get_secret_chat_id_object(SecretChatId secret_chat_id, const char *source) const; tl_object_ptr get_secret_chat_object(SecretChatId secret_chat_id); diff --git a/td/telegram/InlineQueriesManager.cpp b/td/telegram/InlineQueriesManager.cpp index 9167d843..9282d779 100644 --- a/td/telegram/InlineQueriesManager.cpp +++ b/td/telegram/InlineQueriesManager.cpp @@ -1728,10 +1728,10 @@ void InlineQueriesManager::on_new_query(int64 query_id, UserId sender_user_id, L LOG(ERROR) << "Receive new inline query"; return; } - send_closure( - G()->td(), &Td::send_update, - make_tl_object(query_id, td_->contacts_manager_->get_user_id_object(sender_user_id), - user_location.get_location_object(), query, offset)); + send_closure(G()->td(), &Td::send_update, + make_tl_object( + query_id, td_->contacts_manager_->get_user_id_object(sender_user_id, "updateNewInlineQuery"), + user_location.get_location_object(), query, offset)); } void InlineQueriesManager::on_chosen_result( @@ -1748,8 +1748,9 @@ void InlineQueriesManager::on_chosen_result( } send_closure(G()->td(), &Td::send_update, make_tl_object( - td_->contacts_manager_->get_user_id_object(user_id), user_location.get_location_object(), query, - result_id, get_inline_message_id(std::move(input_bot_inline_message_id)))); + td_->contacts_manager_->get_user_id_object(user_id, "updateNewChosenInlineResult"), + user_location.get_location_object(), query, result_id, + get_inline_message_id(std::move(input_bot_inline_message_id)))); } bool InlineQueriesManager::update_bot_usage(UserId bot_user_id) { diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp index 8807c18d..55e2f291 100644 --- a/td/telegram/MessagesManager.cpp +++ b/td/telegram/MessagesManager.cpp @@ -1772,6 +1772,11 @@ class SendSecretMessageActor : public NetActor { void send(DialogId dialog_id, int64 reply_to_random_id, int32 ttl, const string &message, SecretInputMedia media, vector> &&entities, UserId via_bot_user_id, int64 media_album_id, int64 random_id) { + if (false && !media.empty()) { + td->messages_manager_->on_send_secret_message_error(random_id, Status::Error(400, "FILE_PART_1_MISSING"), Auto()); + return; + } + CHECK(dialog_id.get_type() == DialogType::SecretChat); random_id_ = random_id; @@ -8205,12 +8210,13 @@ tl_object_ptr MessagesManager::get_message_content_objec return make_tl_object(); case MessageChatDeleteUser::ID: { const MessageChatDeleteUser *m = static_cast(content); - return make_tl_object(td_->contacts_manager_->get_user_id_object(m->user_id)); + return make_tl_object( + td_->contacts_manager_->get_user_id_object(m->user_id, "messageChatDeleteMember")); } case MessageChatMigrateTo::ID: { const MessageChatMigrateTo *m = static_cast(content); return make_tl_object( - td_->contacts_manager_->get_supergroup_id_object(m->migrated_to_channel_id)); + td_->contacts_manager_->get_supergroup_id_object(m->migrated_to_channel_id, "messageChatUpgradeTo")); } case MessageChannelCreate::ID: { const MessageChannelCreate *m = static_cast(content); @@ -8219,7 +8225,8 @@ tl_object_ptr MessagesManager::get_message_content_objec case MessageChannelMigrateFrom::ID: { const MessageChannelMigrateFrom *m = static_cast(content); return make_tl_object( - m->title, td_->contacts_manager_->get_basic_group_id_object(m->migrated_from_chat_id)); + m->title, + td_->contacts_manager_->get_basic_group_id_object(m->migrated_from_chat_id, "messageChatUpgradeFrom")); } case MessagePinMessage::ID: { const MessagePinMessage *m = static_cast(content); @@ -11923,21 +11930,23 @@ tl_object_ptr MessagesManager::get_chat_type_object(DialogId d switch (dialog_id.get_type()) { case DialogType::User: return make_tl_object( - td_->contacts_manager_->get_user_id_object(dialog_id.get_user_id())); + td_->contacts_manager_->get_user_id_object(dialog_id.get_user_id(), "chatTypePrivate")); case DialogType::Chat: return make_tl_object( - td_->contacts_manager_->get_basic_group_id_object(dialog_id.get_chat_id())); + td_->contacts_manager_->get_basic_group_id_object(dialog_id.get_chat_id(), "chatTypeBasicGroup")); case DialogType::Channel: { auto channel_id = dialog_id.get_channel_id(); auto channel_type = td_->contacts_manager_->get_channel_type(channel_id); - return make_tl_object(td_->contacts_manager_->get_supergroup_id_object(channel_id), - channel_type != ChannelType::Megagroup); + return make_tl_object( + td_->contacts_manager_->get_supergroup_id_object(channel_id, "chatTypeSupergroup"), + channel_type != ChannelType::Megagroup); } case DialogType::SecretChat: { auto secret_chat_id = dialog_id.get_secret_chat_id(); auto user_id = td_->contacts_manager_->get_secret_chat_user_id(secret_chat_id); - return make_tl_object(td_->contacts_manager_->get_secret_chat_id_object(secret_chat_id), - td_->contacts_manager_->get_user_id_object(user_id)); + return make_tl_object( + td_->contacts_manager_->get_secret_chat_id_object(secret_chat_id, "chatTypeSecret"), + td_->contacts_manager_->get_user_id_object(user_id, "chatTypeSecret")); } case DialogType::None: default: @@ -13495,15 +13504,15 @@ tl_object_ptr MessagesManager::get_message_object(DialogId dial } } return make_tl_object( - message->message_id.get(), td_->contacts_manager_->get_user_id_object(message->sender_user_id), dialog_id.get(), - std::move(sending_state), is_outgoing, can_edit_message(dialog_id, message, false, true), + message->message_id.get(), td_->contacts_manager_->get_user_id_object(message->sender_user_id, "sender_user_id"), + dialog_id.get(), std::move(sending_state), is_outgoing, can_edit_message(dialog_id, message, false, true), can_forward_message(dialog_id, message), can_delete_for_self, can_delete_for_all_users, message->is_channel_post, message->contains_unread_mention, message->date, message->edit_date, get_message_forward_info_object(message->forward_info), message->reply_to_message_id.get(), message->ttl, message->ttl_expires_at != 0 ? std::max(message->ttl_expires_at - Time::now(), 1e-3) : message->ttl, - td_->contacts_manager_->get_user_id_object(message->via_bot_user_id), message->author_signature, message->views, - message->media_album_id, get_message_content_object(message->content.get()), - get_reply_markup_object(message->reply_markup)); + td_->contacts_manager_->get_user_id_object(message->via_bot_user_id, "via_bot_user_id"), + message->author_signature, message->views, message->media_album_id, + get_message_content_object(message->content.get()), get_reply_markup_object(message->reply_markup)); } tl_object_ptr MessagesManager::get_messages_object(int32 total_count, DialogId dialog_id, @@ -17012,8 +17021,8 @@ void MessagesManager::on_get_game_high_scores(int64 random_id, LOG(ERROR) << "Receive wrong score = " << score; continue; } - result->scores_.push_back( - make_tl_object(position, td_->contacts_manager_->get_user_id_object(user_id), score)); + result->scores_.push_back(make_tl_object( + position, td_->contacts_manager_->get_user_id_object(user_id, "gameHighScore"), score)); } } @@ -17117,8 +17126,8 @@ tl_object_ptr MessagesManager::get_message_forward_i forward_info->message_id.get(), forward_info->from_dialog_id.get(), forward_info->from_message_id.get()); } return make_tl_object( - td_->contacts_manager_->get_user_id_object(forward_info->sender_user_id), forward_info->date, - forward_info->from_dialog_id.get(), forward_info->from_message_id.get()); + td_->contacts_manager_->get_user_id_object(forward_info->sender_user_id, "messageForwardedFromUser"), + forward_info->date, forward_info->from_dialog_id.get(), forward_info->from_message_id.get()); } Result> MessagesManager::get_dialog_reply_markup( @@ -19424,8 +19433,9 @@ tl_object_ptr MessagesManager::get_chat_event_action_ob case telegram_api::channelAdminLogEventActionParticipantInvite::ID: { auto action = move_tl_object_as(action_ptr); auto member = td_->contacts_manager_->get_dialog_participant(ChannelId(), std::move(action->participant_)); - return make_tl_object(td_->contacts_manager_->get_user_id_object(member.user_id), - member.status.get_chat_member_status_object()); + return make_tl_object( + td_->contacts_manager_->get_user_id_object(member.user_id, "chatEventMemberInvited"), + member.status.get_chat_member_status_object()); } case telegram_api::channelAdminLogEventActionParticipantToggleBan::ID: { auto action = move_tl_object_as(action_ptr); @@ -19438,7 +19448,7 @@ tl_object_ptr MessagesManager::get_chat_event_action_ob return nullptr; } return make_tl_object( - td_->contacts_manager_->get_user_id_object(old_member.user_id), + td_->contacts_manager_->get_user_id_object(old_member.user_id, "chatEventMemberRestricted"), old_member.status.get_chat_member_status_object(), new_member.status.get_chat_member_status_object()); } case telegram_api::channelAdminLogEventActionParticipantToggleAdmin::ID: { @@ -19452,7 +19462,7 @@ tl_object_ptr MessagesManager::get_chat_event_action_ob return nullptr; } return make_tl_object( - td_->contacts_manager_->get_user_id_object(old_member.user_id), + td_->contacts_manager_->get_user_id_object(old_member.user_id, "chatEventMemberPromoted"), old_member.status.get_chat_member_status_object(), new_member.status.get_chat_member_status_object()); } case telegram_api::channelAdminLogEventActionChangeTitle::ID: { @@ -19568,7 +19578,7 @@ void MessagesManager::on_get_event_log(int64 random_id, continue; } result->events_.push_back(make_tl_object( - event->id_, event->date_, td_->contacts_manager_->get_user_id_object(user_id), std::move(action))); + event->id_, event->date_, td_->contacts_manager_->get_user_id_object(user_id, "chatEvent"), std::move(action))); } } @@ -20290,7 +20300,8 @@ unique_ptr MessagesManager::get_message_content(FormattedText me case telegram_api::messageMediaContact::ID: { auto message_contact = move_tl_object_as(media); if (message_contact->user_id_ != 0) { - td_->contacts_manager_->get_user_id_object(UserId(message_contact->user_id_)); // to ensure updateUser + td_->contacts_manager_->get_user_id_object(UserId(message_contact->user_id_), + "messageMediaContact"); // to ensure updateUser } return make_unique(Contact(message_contact->phone_number_, message_contact->first_name_, message_contact->last_name_, message_contact->user_id_)); diff --git a/td/telegram/Payments.cpp b/td/telegram/Payments.cpp index a49c11d6..2dc2d619 100644 --- a/td/telegram/Payments.cpp +++ b/td/telegram/Payments.cpp @@ -416,7 +416,8 @@ class GetPaymentReceiptQuery : public Td::ResultHandler { promise_.set_value(make_tl_object( payment_receipt->date_, - G()->td().get_actor_unsafe()->contacts_manager_->get_user_id_object(payments_provider_user_id), + G()->td().get_actor_unsafe()->contacts_manager_->get_user_id_object(payments_provider_user_id, + "paymentReceipt"), convert_invoice(std::move(payment_receipt->invoice_)), convert_order_info(std::move(payment_receipt->info_)), convert_shipping_option(std::move(payment_receipt->shipping_)), std::move(payment_receipt->credentials_title_))); diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp index a8324e79..6f779b19 100644 --- a/td/telegram/Td.cpp +++ b/td/telegram/Td.cpp @@ -229,7 +229,8 @@ class GetRecentMeUrlsQuery : public Td::ResultHandler { result = nullptr; break; } - result->type_ = make_tl_object(td->contacts_manager_->get_user_id_object(user_id)); + result->type_ = make_tl_object( + td->contacts_manager_->get_user_id_object(user_id, "tMeUrlTypeUser")); break; } case telegram_api::recentMeUrlChat::ID: { @@ -241,8 +242,8 @@ class GetRecentMeUrlsQuery : public Td::ResultHandler { result = nullptr; break; } - result->type_ = - make_tl_object(td->contacts_manager_->get_supergroup_id_object(channel_id)); + result->type_ = make_tl_object( + td->contacts_manager_->get_supergroup_id_object(channel_id, "tMeUrlTypeSupergroup")); break; } case telegram_api::recentMeUrlChatInvite::ID: { @@ -2077,10 +2078,12 @@ class ImportContactsRequest : public RequestActor<> { void do_send_result() override { CHECK(imported_contacts_.first.size() == contacts_.size()); CHECK(imported_contacts_.second.size() == contacts_.size()); - send_result(make_tl_object( - transform(imported_contacts_.first, - [this](UserId user_id) { return td->contacts_manager_->get_user_id_object(user_id); }), - std::move(imported_contacts_.second))); + send_result(make_tl_object(transform(imported_contacts_.first, + [this](UserId user_id) { + return td->contacts_manager_->get_user_id_object( + user_id, "ImportContactsRequest"); + }), + std::move(imported_contacts_.second))); } public: @@ -2158,10 +2161,12 @@ class ChangeImportedContactsRequest : public RequestActor<> { void do_send_result() override { CHECK(imported_contacts_.first.size() == contacts_size_); CHECK(imported_contacts_.second.size() == contacts_size_); - send_result(make_tl_object( - transform(imported_contacts_.first, - [this](UserId user_id) { return td->contacts_manager_->get_user_id_object(user_id); }), - std::move(imported_contacts_.second))); + send_result(make_tl_object(transform(imported_contacts_.first, + [this](UserId user_id) { + return td->contacts_manager_->get_user_id_object( + user_id, "ChangeImportedContactsRequest"); + }), + std::move(imported_contacts_.second))); } public: diff --git a/td/telegram/UpdatesManager.cpp b/td/telegram/UpdatesManager.cpp index cef8f73d..e276e6db 100644 --- a/td/telegram/UpdatesManager.cpp +++ b/td/telegram/UpdatesManager.cpp @@ -1464,10 +1464,10 @@ void UpdatesManager::on_update(tl_object_ptr upd LOG(DEBUG) << "Ignore user typing in unknown " << dialog_id; return; } - send_closure( - G()->td(), &Td::send_update, - make_tl_object(dialog_id.get(), td_->contacts_manager_->get_user_id_object(user_id), - convertSendMessageAction(std::move(update->action_)))); + send_closure(G()->td(), &Td::send_update, + make_tl_object( + dialog_id.get(), td_->contacts_manager_->get_user_id_object(user_id, "updateUserTyping"), + convertSendMessageAction(std::move(update->action_)))); } void UpdatesManager::on_update(tl_object_ptr update, bool /*force_apply*/) { @@ -1486,10 +1486,10 @@ void UpdatesManager::on_update(tl_object_ptr return; } } - send_closure( - G()->td(), &Td::send_update, - make_tl_object(dialog_id.get(), td_->contacts_manager_->get_user_id_object(user_id), - convertSendMessageAction(std::move(update->action_)))); + send_closure(G()->td(), &Td::send_update, + make_tl_object( + dialog_id.get(), td_->contacts_manager_->get_user_id_object(user_id, "updateChatUserTyping"), + convertSendMessageAction(std::move(update->action_)))); } void UpdatesManager::on_update(tl_object_ptr update, bool /*force_apply*/) { @@ -1507,10 +1507,10 @@ void UpdatesManager::on_update(tl_object_ptrtd(), &Td::send_update, - make_tl_object(dialog_id.get(), td_->contacts_manager_->get_user_id_object(user_id), - make_tl_object())); + send_closure(G()->td(), &Td::send_update, + make_tl_object( + dialog_id.get(), td_->contacts_manager_->get_user_id_object(user_id, "updateEncryptedChatTyping"), + make_tl_object())); } void UpdatesManager::on_update(tl_object_ptr update, bool /*force_apply*/) { @@ -1666,12 +1666,12 @@ void UpdatesManager::on_update(tl_object_ptrshipping_address_ != nullptr); - send_closure( - G()->td(), &Td::send_update, - make_tl_object( - update->query_id_, td_->contacts_manager_->get_user_id_object(user_id), update->payload_.as_slice().str(), - get_shipping_address_object( - get_shipping_address(std::move(update->shipping_address_))))); // TODO use convert_shipping_address + send_closure(G()->td(), &Td::send_update, + make_tl_object( + update->query_id_, td_->contacts_manager_->get_user_id_object(user_id, "updateNewShippingQuery"), + update->payload_.as_slice().str(), + get_shipping_address_object(get_shipping_address( + std::move(update->shipping_address_))))); // TODO use convert_shipping_address } void UpdatesManager::on_update(tl_object_ptr update, bool /*force_apply*/) { @@ -1683,9 +1683,9 @@ void UpdatesManager::on_update(tl_object_ptrtd(), &Td::send_update, make_tl_object( - update->query_id_, td_->contacts_manager_->get_user_id_object(user_id), update->currency_, - update->total_amount_, update->payload_.as_slice().str(), update->shipping_option_id_, - get_order_info_object(get_order_info(std::move(update->info_))))); + update->query_id_, td_->contacts_manager_->get_user_id_object(user_id, "updateNewPreCheckoutQuery"), + update->currency_, update->total_amount_, update->payload_.as_slice().str(), + update->shipping_option_id_, get_order_info_object(get_order_info(std::move(update->info_))))); } void UpdatesManager::on_update(tl_object_ptr update, bool /*force_apply*/) {