From 44efa70789efbb8182fdc6d94181b66ce7368d16 Mon Sep 17 00:00:00 2001 From: levlam Date: Thu, 30 Sep 2021 13:53:16 +0300 Subject: [PATCH] Pass Contact to add_contact. --- td/telegram/Contact.cpp | 25 ++++++++++++++++++------- td/telegram/Contact.h | 8 +++++++- td/telegram/ContactsManager.cpp | 23 +++++++++-------------- td/telegram/ContactsManager.h | 2 +- td/telegram/Td.cpp | 10 ++++------ 5 files changed, 39 insertions(+), 29 deletions(-) diff --git a/td/telegram/Contact.cpp b/td/telegram/Contact.cpp index bfe4cd4d5..94b71d060 100644 --- a/td/telegram/Contact.cpp +++ b/td/telegram/Contact.cpp @@ -36,10 +36,18 @@ UserId Contact::get_user_id() const { return user_id_; } -string Contact::get_phone_number() const { +const string &Contact::get_phone_number() const { return phone_number_; } +const string &Contact::get_first_name() const { + return first_name_; +} + +const string &Contact::get_last_name() const { + return last_name_; +} + tl_object_ptr Contact::get_contact_object() const { return make_tl_object(phone_number_, first_name_, last_name_, vcard_, user_id_.get()); } @@ -82,10 +90,7 @@ StringBuilder &operator<<(StringBuilder &string_builder, const Contact &contact) << ", vCard size = " << contact.vcard_.size() << contact.user_id_ << "]"; } -Result process_input_message_contact(tl_object_ptr &&input_message_content) { - CHECK(input_message_content != nullptr); - CHECK(input_message_content->get_id() == td_api::inputMessageContact::ID); - auto contact = std::move(static_cast(input_message_content.get())->contact_); +Result get_contact(td_api::object_ptr &&contact) { if (contact == nullptr) { return Status::Error(400, "Contact must be non-empty"); } @@ -103,8 +108,14 @@ Result process_input_message_contact(tl_object_ptrphone_number_, contact->first_name_, contact->last_name_, contact->vcard_, - UserId(contact->user_id_)); + return Contact(std::move(contact->phone_number_), std::move(contact->first_name_), std::move(contact->last_name_), + std::move(contact->vcard_), UserId(contact->user_id_)); +} + +Result process_input_message_contact(tl_object_ptr &&input_message_content) { + CHECK(input_message_content != nullptr); + CHECK(input_message_content->get_id() == td_api::inputMessageContact::ID); + return get_contact(std::move(static_cast(input_message_content.get())->contact_)); } } // namespace td diff --git a/td/telegram/Contact.h b/td/telegram/Contact.h index 5ab981018..924555406 100644 --- a/td/telegram/Contact.h +++ b/td/telegram/Contact.h @@ -46,7 +46,11 @@ class Contact { UserId get_user_id() const; - string get_phone_number() const; + const string &get_phone_number() const; + + const string &get_first_name() const; + + const string &get_last_name() const; tl_object_ptr get_contact_object() const; @@ -139,6 +143,8 @@ struct ContactHash { } }; +Result get_contact(td_api::object_ptr &&contact) TD_WARN_UNUSED_RESULT; + Result process_input_message_contact(tl_object_ptr &&input_message_content) TD_WARN_UNUSED_RESULT; diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp index 66474f957..0adb385ff 100644 --- a/td/telegram/ContactsManager.cpp +++ b/td/telegram/ContactsManager.cpp @@ -444,15 +444,16 @@ class AddContactQuery final : public Td::ResultHandler { explicit AddContactQuery(Promise &&promise) : promise_(std::move(promise)) { } - void send(UserId user_id, tl_object_ptr &&input_user, const string &first_name, - const string &last_name, const string &phone_number, bool share_phone_number) { + void send(UserId user_id, tl_object_ptr &&input_user, const Contact &contact, + bool share_phone_number) { user_id_ = user_id; int32 flags = 0; if (share_phone_number) { flags |= telegram_api::contacts_addContact::ADD_PHONE_PRIVACY_EXCEPTION_MASK; } - send_query(G()->net_query_creator().create(telegram_api::contacts_addContact( - flags, false /*ignored*/, std::move(input_user), first_name, last_name, phone_number))); + send_query(G()->net_query_creator().create( + telegram_api::contacts_addContact(flags, false /*ignored*/, std::move(input_user), contact.get_first_name(), + contact.get_last_name(), contact.get_phone_number()))); } void on_result(uint64 id, BufferSlice packet) final { @@ -5324,12 +5325,7 @@ void ContactsManager::reload_contacts(bool force) { } } -void ContactsManager::add_contact(td_api::object_ptr &&contact, bool share_phone_number, - Promise &&promise) { - if (contact == nullptr) { - return promise.set_error(Status::Error(400, "Added contact must be non-empty")); - } - +void ContactsManager::add_contact(Contact contact, bool share_phone_number, Promise &&promise) { if (G()->close_flag()) { return promise.set_error(Status::Error(500, "Request aborted")); } @@ -5342,17 +5338,16 @@ void ContactsManager::add_contact(td_api::object_ptr &&contact, return; } - LOG(INFO) << "Add " << oneline(to_string(contact)) << " with share_phone_number = " << share_phone_number; + LOG(INFO) << "Add " << contact << " with share_phone_number = " << share_phone_number; - UserId user_id{contact->user_id_}; + auto user_id = contact.get_user_id(); auto input_user = get_input_user(user_id); if (input_user == nullptr) { return promise.set_error(Status::Error(400, "User not found")); } td_->create_handler(std::move(promise)) - ->send(user_id, std::move(input_user), contact->first_name_, contact->last_name_, contact->phone_number_, - share_phone_number); + ->send(user_id, std::move(input_user), contact, share_phone_number); } std::pair, vector> ContactsManager::import_contacts( diff --git a/td/telegram/ContactsManager.h b/td/telegram/ContactsManager.h index dec95fcc3..49e615675 100644 --- a/td/telegram/ContactsManager.h +++ b/td/telegram/ContactsManager.h @@ -288,7 +288,7 @@ class ContactsManager final : public Actor { void disconnect_website(int64 authorizations_id, Promise &&promise) const; void disconnect_all_websites(Promise &&promise) const; - void add_contact(td_api::object_ptr &&contact, bool share_phone_number, Promise &&promise); + void add_contact(Contact contact, bool share_phone_number, Promise &&promise); std::pair, vector> import_contacts(const vector> &contacts, int64 &random_id, Promise &&promise); diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp index aa16a4968..526b909d4 100644 --- a/td/telegram/Td.cpp +++ b/td/telegram/Td.cpp @@ -6645,14 +6645,12 @@ void Td::on_request(uint64 id, const td_api::getBlockedMessageSenders &request) void Td::on_request(uint64 id, td_api::addContact &request) { CHECK_IS_USER(); - if (request.contact_ == nullptr) { - return send_error_raw(id, 400, "Contact must be non-empty"); + auto r_contact = get_contact(std::move(request.contact_)); + if (r_contact.is_error()) { + return send_closure(actor_id(this), &Td::send_error, id, r_contact.move_as_error()); } - CLEAN_INPUT_STRING(request.contact_->phone_number_); - CLEAN_INPUT_STRING(request.contact_->first_name_); - CLEAN_INPUT_STRING(request.contact_->last_name_); CREATE_OK_REQUEST_PROMISE(); - contacts_manager_->add_contact(std::move(request.contact_), request.share_phone_number_, std::move(promise)); + contacts_manager_->add_contact(r_contact.move_as_ok(), request.share_phone_number_, std::move(promise)); } void Td::on_request(uint64 id, td_api::importContacts &request) {