tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add source to get_chat_type_object.

Browse Source
This commit is contained in:
levlam 2024-03-29 11:19:50 +03:00
parent ba89fef472
commit a042122b7a
6 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
td/telegram/ContactsManager.cpp
View File

@ -15382,7 +15382,7 @@ void ContactsManager::on_create_new_secret_chat(SecretChatId secret_chat_id,
CHECK(secret_chat_id.is_valid()); CHECK(secret_chat_id.is_valid());
DialogId dialog_id(secret_chat_id); DialogId dialog_id(secret_chat_id);
td_->dialog_manager_->force_create_dialog(dialog_id, "on_create_new_secret_chat"); td_->dialog_manager_->force_create_dialog(dialog_id, "on_create_new_secret_chat");
promise.set_value(td_->messages_manager_->get_chat_object(dialog_id)); promise.set_value(td_->messages_manager_->get_chat_object(dialog_id, "on_create_new_secret_chat"));
} }
bool ContactsManager::have_secret_chat(SecretChatId secret_chat_id) const { bool ContactsManager::have_secret_chat(SecretChatId secret_chat_id) const {

14
td/telegram/DialogManager.cpp
View File

@ -872,26 +872,26 @@ td_api::object_ptr<td_api::chats> DialogManager::get_chats_object(const std::pai
return get_chats_object(dialog_ids.first, dialog_ids.second, source); return get_chats_object(dialog_ids.first, dialog_ids.second, source);
} }
td_api::object_ptr<td_api::ChatType> DialogManager::get_chat_type_object(DialogId dialog_id) const { td_api::object_ptr<td_api::ChatType> DialogManager::get_chat_type_object(DialogId dialog_id, const char *source) const {
switch (dialog_id.get_type()) { switch (dialog_id.get_type()) {
case DialogType::User: case DialogType::User:
return td_api::make_object<td_api::chatTypePrivate>( return td_api::make_object<td_api::chatTypePrivate>(
td_->contacts_manager_->get_user_id_object(dialog_id.get_user_id(), "chatTypePrivate")); td_->contacts_manager_->get_user_id_object(dialog_id.get_user_id(), source));
case DialogType::Chat: case DialogType::Chat:
return td_api::make_object<td_api::chatTypeBasicGroup>( return td_api::make_object<td_api::chatTypeBasicGroup>(
td_->contacts_manager_->get_basic_group_id_object(dialog_id.get_chat_id(), "chatTypeBasicGroup")); td_->contacts_manager_->get_basic_group_id_object(dialog_id.get_chat_id(), source));
case DialogType::Channel: { case DialogType::Channel: {
auto channel_id = dialog_id.get_channel_id(); auto channel_id = dialog_id.get_channel_id();
return td_api::make_object<td_api::chatTypeSupergroup>( return td_api::make_object<td_api::chatTypeSupergroup>(
td_->contacts_manager_->get_supergroup_id_object(channel_id, "chatTypeSupergroup"), td_->contacts_manager_->get_supergroup_id_object(channel_id, source),
!td_->contacts_manager_->is_megagroup_channel(channel_id)); !td_->contacts_manager_->is_megagroup_channel(channel_id));
} }
case DialogType::SecretChat: { case DialogType::SecretChat: {
auto secret_chat_id = dialog_id.get_secret_chat_id(); auto secret_chat_id = dialog_id.get_secret_chat_id();
auto user_id = td_->contacts_manager_->get_secret_chat_user_id(secret_chat_id); auto user_id = td_->contacts_manager_->get_secret_chat_user_id(secret_chat_id);
return td_api::make_object<td_api::chatTypeSecret>( return td_api::make_object<td_api::chatTypeSecret>(
td_->contacts_manager_->get_secret_chat_id_object(secret_chat_id, "chatTypeSecret"), td_->contacts_manager_->get_secret_chat_id_object(secret_chat_id, source),
td_->contacts_manager_->get_user_id_object(user_id, "chatTypeSecret")); td_->contacts_manager_->get_user_id_object(user_id, source));
} }
case DialogType::None: case DialogType::None:
default: default:
@ -956,7 +956,7 @@ void DialogManager::on_migrate_chat_to_megagroup(ChatId chat_id, Promise<td_api:
auto dialog_id = DialogId(channel_id); auto dialog_id = DialogId(channel_id);
force_create_dialog(dialog_id, "on_migrate_chat_to_megagroup"); force_create_dialog(dialog_id, "on_migrate_chat_to_megagroup");
promise.set_value(td_->messages_manager_->get_chat_object(dialog_id)); promise.set_value(td_->messages_manager_->get_chat_object(dialog_id, "on_migrate_chat_to_megagroup"));
} }
bool DialogManager::is_anonymous_administrator(DialogId dialog_id, string *author_signature) const { bool DialogManager::is_anonymous_administrator(DialogId dialog_id, string *author_signature) const {

2
td/telegram/DialogManager.h
View File

@ -106,7 +106,7 @@ class DialogManager final : public Actor {
td_api::object_ptr<td_api::chats> get_chats_object(const std::pair<int32, vector<DialogId>> &dialog_ids, td_api::object_ptr<td_api::chats> get_chats_object(const std::pair<int32, vector<DialogId>> &dialog_ids,
const char *source) const; const char *source) const;
td_api::object_ptr<td_api::ChatType> get_chat_type_object(DialogId dialog_id) const; td_api::object_ptr<td_api::ChatType> get_chat_type_object(DialogId dialog_id, const char *source) const;
NotificationSettingsScope get_dialog_notification_setting_scope(DialogId dialog_id) const; NotificationSettingsScope get_dialog_notification_setting_scope(DialogId dialog_id) const;

28
td/telegram/MessagesManager.cpp
View File

@ -13677,7 +13677,7 @@ MessageFullId MessagesManager::on_get_message(MessageInfo &&message_info, const
auto pending_created_dialog = std::move(it->second); auto pending_created_dialog = std::move(it->second);
pending_created_dialogs_.erase(it); pending_created_dialogs_.erase(it);
pending_created_dialog.promise_.set_value(get_chat_object(d)); pending_created_dialog.promise_.set_value(get_chat_object(d, "on_get_message"));
if (!pending_created_dialog.group_invite_privacy_forbidden_user_ids_.empty()) { if (!pending_created_dialog.group_invite_privacy_forbidden_user_ids_.empty()) {
send_closure(G()->dialog_participant_manager(), send_closure(G()->dialog_participant_manager(),
&DialogParticipantManager::send_update_add_chat_members_privacy_forbidden, dialog_id, &DialogParticipantManager::send_update_add_chat_members_privacy_forbidden, dialog_id,
@ -19289,7 +19289,7 @@ td_api::object_ptr<td_api::MessageSender> MessagesManager::get_default_message_s
: nullptr; : nullptr;
} }
td_api::object_ptr<td_api::chat> MessagesManager::get_chat_object(const Dialog *d) const { td_api::object_ptr<td_api::chat> MessagesManager::get_chat_object(const Dialog *d, const char *source) const {
CHECK(d != nullptr); CHECK(d != nullptr);
bool is_premium = td_->option_manager_->get_option_boolean("is_premium"); bool is_premium = td_->option_manager_->get_option_boolean("is_premium");
@ -19303,7 +19303,7 @@ td_api::object_ptr<td_api::chat> MessagesManager::get_chat_object(const Dialog *
auto chat_lists = transform(get_dialog_list_ids(d), auto chat_lists = transform(get_dialog_list_ids(d),
[](DialogListId dialog_list_id) { return dialog_list_id.get_chat_list_object(); }); [](DialogListId dialog_list_id) { return dialog_list_id.get_chat_list_object(); });
return make_tl_object<td_api::chat>( return make_tl_object<td_api::chat>(
d->dialog_id.get(), td_->dialog_manager_->get_chat_type_object(d->dialog_id), d->dialog_id.get(), td_->dialog_manager_->get_chat_type_object(d->dialog_id, source),
td_->dialog_manager_->get_dialog_title(d->dialog_id), td_->dialog_manager_->get_dialog_title(d->dialog_id),
get_chat_photo_info_object(td_->file_manager_.get(), td_->dialog_manager_->get_dialog_photo(d->dialog_id)), get_chat_photo_info_object(td_->file_manager_.get(), td_->dialog_manager_->get_dialog_photo(d->dialog_id)),
td_->dialog_manager_->get_dialog_accent_color_id_object(d->dialog_id), td_->dialog_manager_->get_dialog_accent_color_id_object(d->dialog_id),
@ -19311,11 +19311,11 @@ td_api::object_ptr<td_api::chat> MessagesManager::get_chat_object(const Dialog *
td_->dialog_manager_->get_dialog_profile_accent_color_id_object(d->dialog_id), td_->dialog_manager_->get_dialog_profile_accent_color_id_object(d->dialog_id),
td_->dialog_manager_->get_dialog_profile_background_custom_emoji_id(d->dialog_id).get(), td_->dialog_manager_->get_dialog_profile_background_custom_emoji_id(d->dialog_id).get(),
td_->dialog_manager_->get_dialog_default_permissions(d->dialog_id).get_chat_permissions_object(), td_->dialog_manager_->get_dialog_default_permissions(d->dialog_id).get_chat_permissions_object(),
get_message_object(d->dialog_id, get_message(d, d->last_message_id), "get_chat_object"), get_message_object(d->dialog_id, get_message(d, d->last_message_id), source), get_chat_positions_object(d),
get_chat_positions_object(d), std::move(chat_lists), get_default_message_sender_object(d), std::move(chat_lists), get_default_message_sender_object(d), block_list_id.get_block_list_object(),
block_list_id.get_block_list_object(), td_->dialog_manager_->get_dialog_has_protected_content(d->dialog_id), td_->dialog_manager_->get_dialog_has_protected_content(d->dialog_id), is_translatable, d->is_marked_as_unread,
is_translatable, d->is_marked_as_unread, get_dialog_view_as_topics(d), get_dialog_has_scheduled_messages(d), get_dialog_view_as_topics(d), get_dialog_has_scheduled_messages(d), can_delete.for_self_,
can_delete.for_self_, can_delete.for_all_users_, td_->dialog_manager_->can_report_dialog(d->dialog_id), can_delete.for_all_users_, td_->dialog_manager_->can_report_dialog(d->dialog_id),
d->notification_settings.silent_send_message, d->server_unread_count + d->local_unread_count, d->notification_settings.silent_send_message, d->server_unread_count + d->local_unread_count,
d->last_read_inbox_message_id.get(), d->last_read_outbox_message_id.get(), d->unread_mention_count, d->last_read_inbox_message_id.get(), d->last_read_outbox_message_id.get(), d->unread_mention_count,
d->unread_reaction_count, get_chat_notification_settings_object(&d->notification_settings), d->unread_reaction_count, get_chat_notification_settings_object(&d->notification_settings),
@ -19326,12 +19326,12 @@ td_api::object_ptr<td_api::chat> MessagesManager::get_chat_object(const Dialog *
d->client_data); d->client_data);
} }
td_api::object_ptr<td_api::chat> MessagesManager::get_chat_object(DialogId dialog_id) { td_api::object_ptr<td_api::chat> MessagesManager::get_chat_object(DialogId dialog_id, const char *source) {
const Dialog *d = get_dialog(dialog_id); const Dialog *d = get_dialog(dialog_id);
if (postponed_chat_read_inbox_updates_.erase(dialog_id) > 0) { if (postponed_chat_read_inbox_updates_.erase(dialog_id) > 0) {
send_update_chat_read_inbox(d, true, "get_chat_object"); send_update_chat_read_inbox(d, true, source);
} }
return get_chat_object(d); return get_chat_object(d, source);
} }
td_api::object_ptr<td_api::draftMessage> MessagesManager::get_my_dialog_draft_message_object() const { td_api::object_ptr<td_api::draftMessage> MessagesManager::get_my_dialog_draft_message_object() const {
@ -28690,7 +28690,7 @@ void MessagesManager::send_update_new_chat(Dialog *d) {
(void)td_->dialog_manager_->get_dialog_photo(d->dialog_id); // to apply pending user photo (void)td_->dialog_manager_->get_dialog_photo(d->dialog_id); // to apply pending user photo
} }
d->is_update_new_chat_being_sent = true; d->is_update_new_chat_being_sent = true;
auto chat_object = get_chat_object(d); auto chat_object = get_chat_object(d, "send_update_new_chat");
bool has_action_bar = chat_object->action_bar_ != nullptr; bool has_action_bar = chat_object->action_bar_ != nullptr;
bool has_background = chat_object->background_ != nullptr; bool has_background = chat_object->background_ != nullptr;
bool has_theme = !chat_object->theme_name_.empty(); bool has_theme = !chat_object->theme_name_.empty();
@ -30854,7 +30854,7 @@ void MessagesManager::on_create_new_dialog(telegram_api::object_ptr<telegram_api
// dialog have been already created and at least one non-temporary message was added, // dialog have been already created and at least one non-temporary message was added,
// i.e. we are not interested in the creation of dialog by searchMessages // i.e. we are not interested in the creation of dialog by searchMessages
// then messages have already been added, so just set promise // then messages have already been added, so just set promise
return promise.set_value(get_chat_object(d)); return promise.set_value(get_chat_object(d, "on_create_new_dialog"));
} }
if (pending_created_dialogs_.count(dialog_id) == 0) { if (pending_created_dialogs_.count(dialog_id) == 0) {
@ -38412,7 +38412,7 @@ void MessagesManager::get_current_state(vector<td_api::object_ptr<td_api::Update
vector<td_api::object_ptr<td_api::Update>> last_message_updates; vector<td_api::object_ptr<td_api::Update>> last_message_updates;
dialogs_.foreach([&](const DialogId &dialog_id, const unique_ptr<Dialog> &dialog) { dialogs_.foreach([&](const DialogId &dialog_id, const unique_ptr<Dialog> &dialog) {
const Dialog *d = dialog.get(); const Dialog *d = dialog.get();
auto update = td_api::make_object<td_api::updateNewChat>(get_chat_object(d)); auto update = td_api::make_object<td_api::updateNewChat>(get_chat_object(d, "get_current_state"));
if (update->chat_->last_message_ != nullptr) { if (update->chat_->last_message_ != nullptr) {
last_message_updates.push_back(td_api::make_object<td_api::updateChatLastMessage>( last_message_updates.push_back(td_api::make_object<td_api::updateChatLastMessage>(
get_chat_id_object(dialog_id, "updateChatLastMessage"), std::move(update->chat_->last_message_), get_chat_id_object(dialog_id, "updateChatLastMessage"), std::move(update->chat_->last_message_),

4
td/telegram/MessagesManager.h
View File

@ -682,7 +682,7 @@ class MessagesManager final : public Actor {
int64 get_chat_id_object(DialogId dialog_id, const char *source) const; int64 get_chat_id_object(DialogId dialog_id, const char *source) const;
td_api::object_ptr<td_api::chat> get_chat_object(DialogId dialog_id); td_api::object_ptr<td_api::chat> get_chat_object(DialogId dialog_id, const char *source);
td_api::object_ptr<td_api::draftMessage> get_my_dialog_draft_message_object() const; td_api::object_ptr<td_api::draftMessage> get_my_dialog_draft_message_object() const;
@ -2612,7 +2612,7 @@ class MessagesManager final : public Actor {
td_api::object_ptr<td_api::MessageSender> get_default_message_sender_object(const Dialog *d) const; td_api::object_ptr<td_api::MessageSender> get_default_message_sender_object(const Dialog *d) const;
td_api::object_ptr<td_api::chat> get_chat_object(const Dialog *d) const; td_api::object_ptr<td_api::chat> get_chat_object(const Dialog *d, const char *source) const;
Dialog *get_dialog(DialogId dialog_id); Dialog *get_dialog(DialogId dialog_id);
const Dialog *get_dialog(DialogId dialog_id) const; const Dialog *get_dialog(DialogId dialog_id) const;

8
td/telegram/Td.cpp
View File

@ -748,7 +748,7 @@ class GetChatRequest final : public RequestActor<> {
if (!dialog_found_) { if (!dialog_found_) {
send_error(Status::Error(400, "Chat is not accessible")); send_error(Status::Error(400, "Chat is not accessible"));
} else { } else {
send_result(td_->messages_manager_->get_chat_object(dialog_id_)); send_result(td_->messages_manager_->get_chat_object(dialog_id_, "GetChatRequest"));
} }
} }
@ -809,7 +809,7 @@ class SearchPublicChatRequest final : public RequestActor<> {
} }
void do_send_result() final { void do_send_result() final {
send_result(td_->messages_manager_->get_chat_object(dialog_id_)); send_result(td_->messages_manager_->get_chat_object(dialog_id_, "SearchPublicChatRequest"));
} }
public: public:
@ -1664,7 +1664,7 @@ class CreateChatRequest final : public RequestActor<> {
} }
void do_send_result() final { void do_send_result() final {
send_result(td_->messages_manager_->get_chat_object(dialog_id_)); send_result(td_->messages_manager_->get_chat_object(dialog_id_, "CreateChatRequest"));
} }
public: public:
@ -1712,7 +1712,7 @@ class JoinChatByInviteLinkRequest final : public RequestActor<DialogId> {
void do_send_result() final { void do_send_result() final {
CHECK(dialog_id_.is_valid()); CHECK(dialog_id_.is_valid());
td_->dialog_manager_->force_create_dialog(dialog_id_, "join chat via an invite link"); td_->dialog_manager_->force_create_dialog(dialog_id_, "join chat via an invite link");
send_result(td_->messages_manager_->get_chat_object(dialog_id_)); send_result(td_->messages_manager_->get_chat_object(dialog_id_, "JoinChatByInviteLinkRequest"));
} }
public: public: