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

Fix sending response to setPollAnser.

Browse Source
This commit is contained in:
levlam 2020-12-22 01:51:20 +03:00
parent 7d73126506
commit 656a641290
3 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
td/telegram/PollManager.cpp
View File

@ -844,26 +844,34 @@ void PollManager::on_set_poll_answer(PollId poll_id, uint64 generation,
poll->was_saved = false; poll->was_saved = false;
} }
if (result.is_ok()) { if (result.is_ok()) {
td_->updates_manager_->on_get_updates(result.move_as_ok(), Promise<Unit>()); td_->updates_manager_->on_get_updates(
result.move_as_ok(), PromiseCreator::lambda([actor_id = actor_id(this), poll_id,
for (auto &promise : promises) { promises = std::move(promises)](Result<Unit> &&result) mutable {
promise.set_value(Unit()); send_closure(actor_id, &PollManager::on_set_poll_answer_finished, poll_id, Unit(), std::move(promises));
} }));
} else { } else {
for (auto &promise : promises) { on_set_poll_answer_finished(poll_id, result.move_as_error(), std::move(promises));
promise.set_error(result.error().clone()); }
}
void PollManager::on_set_poll_answer_finished(PollId poll_id, Result<Unit> &&result, vector<Promise<Unit>> &&promises) {
if (!G()->close_flag()) {
auto poll = get_poll(poll_id);
if (poll != nullptr && !poll->was_saved) {
// no updates was sent during updates processing, so send them
// poll wasn't changed, so there is no reason to actually save it
if (!(poll->is_closed && poll->is_updated_after_close)) {
LOG(INFO) << "Schedule updating of " << poll_id << " soon";
update_poll_timeout_.set_timeout_in(poll_id.get(), 0.0);
}
notify_on_poll_update(poll_id);
poll->was_saved = true;
} }
} }
if (poll != nullptr && !poll->was_saved) {
// no updates was sent during updates processing, so send them
// poll wasn't changed, so there is no reason to actually save it
if (!(poll->is_closed && poll->is_updated_after_close)) {
LOG(INFO) << "Schedule updating of " << poll_id << " soon";
update_poll_timeout_.set_timeout_in(poll_id.get(), 0.0);
}
notify_on_poll_update(poll_id); for (auto &promise : promises) {
poll->was_saved = true; promise.set_result(result.clone());
} }
} }

2
td/telegram/PollManager.h
View File

@ -186,6 +186,8 @@ class PollManager : public Actor {
void on_set_poll_answer(PollId poll_id, uint64 generation, Result<tl_object_ptr<telegram_api::Updates>> &&result); void on_set_poll_answer(PollId poll_id, uint64 generation, Result<tl_object_ptr<telegram_api::Updates>> &&result);
void on_set_poll_answer_finished(PollId poll_id, Result<Unit> &&result, vector<Promise<Unit>> &&promises);
void invalidate_poll_voters(const Poll *poll, PollId poll_id); void invalidate_poll_voters(const Poll *poll, PollId poll_id);
void invalidate_poll_option_voters(const Poll *poll, PollId poll_id, size_t option_index); void invalidate_poll_option_voters(const Poll *poll, PollId poll_id, size_t option_index);

2
td/telegram/UpdatesManager.cpp
View File

@ -1258,7 +1258,7 @@ void UpdatesManager::on_pending_updates(vector<tl_object_ptr<telegram_api::Updat
return promise.set_value(Unit()); return promise.set_value(Unit());
} }
if (running_get_difference_) { if (running_get_difference_ /*|| string(source) != string("postponed updates")*/) {
LOG(INFO) << "Postpone " << updates.size() << " updates [" << seq_begin << ", " << seq_end LOG(INFO) << "Postpone " << updates.size() << " updates [" << seq_begin << ", " << seq_end
<< "] with date = " << date << " from " << source; << "] with date = " << date << " from " << source;
postponed_updates_.emplace(seq_begin, postponed_updates_.emplace(seq_begin,