From 77de3d9f48b9a27ea23d184f070c2f2b5cd8a0b5 Mon Sep 17 00:00:00 2001 From: levlam Date: Fri, 14 Feb 2020 01:20:33 +0300 Subject: [PATCH] Simplify more methods implementation. GitOrigin-RevId: a70f40f7b8917b3a41fd26476d357c0ad63ab062 --- td/telegram/Td.cpp | 52 +++++++--------------------------------------- 1 file changed, 7 insertions(+), 45 deletions(-) diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp index 1d9ee32c..610ca22a 100644 --- a/td/telegram/Td.cpp +++ b/td/telegram/Td.cpp @@ -1254,24 +1254,6 @@ class EditMessageReplyMarkupRequest : public RequestOnceActor { } }; -class EditMessageSchedulingStateRequest : public RequestOnceActor { - FullMessageId full_message_id_; - td_api::object_ptr scheduling_state_; - - void do_run(Promise &&promise) override { - td->messages_manager_->edit_message_scheduling_state(full_message_id_, std::move(scheduling_state_), - std::move(promise)); - } - - public: - EditMessageSchedulingStateRequest(ActorShared td, uint64 request_id, int64 dialog_id, int64 message_id, - td_api::object_ptr scheduling_state) - : RequestOnceActor(std::move(td), request_id) - , full_message_id_(DialogId(dialog_id), MessageId(message_id)) - , scheduling_state_(std::move(scheduling_state)) { - } -}; - class SetGameScoreRequest : public RequestOnceActor { FullMessageId full_message_id_; bool edit_message_; @@ -2935,29 +2917,6 @@ class SetBackgroundRequest : public RequestActor<> { } }; -class RemoveBackgroundRequest : public RequestOnceActor { - BackgroundId background_id_; - - void do_run(Promise &&promise) override { - td->background_manager_->remove_background(background_id_, std::move(promise)); - } - - public: - RemoveBackgroundRequest(ActorShared td, uint64 request_id, int64 background_id) - : RequestOnceActor(std::move(td), request_id), background_id_(background_id) { - } -}; - -class ResetBackgroundsRequest : public RequestOnceActor { - void do_run(Promise &&promise) override { - td->background_manager_->reset_backgrounds(std::move(promise)); - } - - public: - ResetBackgroundsRequest(ActorShared td, uint64 request_id) : RequestOnceActor(std::move(td), request_id) { - } -}; - Td::Td(unique_ptr callback) : callback_(std::move(callback)) { } @@ -5565,8 +5524,9 @@ void Td::on_request(uint64 id, td_api::editInlineMessageReplyMarkup &request) { void Td::on_request(uint64 id, td_api::editMessageSchedulingState &request) { CHECK_IS_USER(); - CREATE_REQUEST(EditMessageSchedulingStateRequest, request.chat_id_, request.message_id_, - std::move(request.scheduling_state_)); + CREATE_OK_REQUEST_PROMISE(); + messages_manager_->edit_message_scheduling_state({DialogId(request.chat_id_), MessageId(request.message_id_)}, + std::move(request.scheduling_state_), std::move(promise)); } void Td::on_request(uint64 id, td_api::setGameScore &request) { @@ -7268,12 +7228,14 @@ void Td::on_request(uint64 id, td_api::setBackground &request) { void Td::on_request(uint64 id, const td_api::removeBackground &request) { CHECK_IS_USER(); - CREATE_REQUEST(RemoveBackgroundRequest, request.background_id_); + CREATE_OK_REQUEST_PROMISE(); + background_manager_->remove_background(BackgroundId(request.background_id_), std::move(promise)); } void Td::on_request(uint64 id, const td_api::resetBackgrounds &request) { CHECK_IS_USER(); - CREATE_NO_ARGS_REQUEST(ResetBackgroundsRequest); + CREATE_OK_REQUEST_PROMISE(); + background_manager_->reset_backgrounds(std::move(promise)); } void Td::on_request(uint64 id, td_api::getRecentlyVisitedTMeUrls &request) {