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

Merge remote-tracking branch 'td/master'

Browse Source
This commit is contained in:
Andrea Cavalli 2021-12-21 01:49:41 +01:00
commit 4cdd439ec6
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
td/telegram/ContactsManager.cpp
View File

@ -15230,7 +15230,7 @@ void ContactsManager::get_channel_participants(ChannelId channel_id,
return promise.set_error(Status::Error(400, "Parameter offset must be non-negative")); return promise.set_error(Status::Error(400, "Parameter offset must be non-negative"));
} }
auto channel_full = get_channel_full_force(channel_id, false, "get_channel_participants"); auto channel_full = get_channel_full_force(channel_id, true, "get_channel_participants");
if (channel_full != nullptr && !channel_full->is_expired() && !channel_full->can_get_participants) { if (channel_full != nullptr && !channel_full->is_expired() && !channel_full->can_get_participants) {
return promise.set_error(Status::Error(400, "Member list is inaccessible")); return promise.set_error(Status::Error(400, "Member list is inaccessible"));
} }

4
td/telegram/MessagesManager.cpp
View File

@ -30210,7 +30210,9 @@ void MessagesManager::on_send_message_fail(int64 random_id, Status error) {
<< *m->reply_markup; << *m->reply_markup;
} }
} }
LOG_IF(WARNING, error_code != 403) << "Fail to send " << full_message_id << " with the error " << error; if (error_code != 403 && !(error_code == 500 && G()->close_flag())) {
LOG(WARNING) << "Fail to send " << full_message_id << " with the error " << error;
}
if (error_code <= 0) { if (error_code <= 0) {
error_code = 500; error_code = 500;
} }

7
td/telegram/Td.cpp
View File

@ -3298,7 +3298,7 @@ void Td::dec_actor_refcnt() {
create_reference(); create_reference();
close_flag_ = 3; close_flag_ = 3;
} else if (close_flag_ == 3) { } else if (close_flag_ == 3) {
LOG(WARNING) << "ON_ACTORS_CLOSED"; LOG(INFO) << "All actors were closed";
Timer timer; Timer timer;
animations_manager_.reset(); animations_manager_.reset();
LOG(DEBUG) << "AnimationsManager was cleared" << timer; LOG(DEBUG) << "AnimationsManager was cleared" << timer;
@ -3386,7 +3386,6 @@ void Td::dec_actor_refcnt() {
} }
void Td::on_closed() { void Td::on_closed() {
LOG(WARNING) << "ON_CLOSED";
close_flag_ = 5; close_flag_ = 5;
send_update( send_update(
td_api::make_object<td_api::updateAuthorizationState>(td_api::make_object<td_api::authorizationStateClosed>())); td_api::make_object<td_api::updateAuthorizationState>(td_api::make_object<td_api::authorizationStateClosed>()));
@ -3396,7 +3395,7 @@ void Td::on_closed() {
void Td::dec_stop_cnt() { void Td::dec_stop_cnt() {
stop_cnt_--; stop_cnt_--;
if (stop_cnt_ == 0) { if (stop_cnt_ == 0) {
LOG(WARNING) << "Stop Td"; LOG(INFO) << "Stop Td";
set_context(std::move(old_context_)); set_context(std::move(old_context_));
stop(); stop();
} }
@ -3410,7 +3409,7 @@ void Td::dec_request_actor_refcnt() {
request_actor_refcnt_--; request_actor_refcnt_--;
LOG(DEBUG) << "Decrease request actor count to " << request_actor_refcnt_; LOG(DEBUG) << "Decrease request actor count to " << request_actor_refcnt_;
if (request_actor_refcnt_ == 0) { if (request_actor_refcnt_ == 0) {
LOG(WARNING) << "Have no request actors"; LOG(INFO) << "Have no request actors";
clear(); clear();
dec_actor_refcnt(); // remove guard dec_actor_refcnt(); // remove guard
} }

1
td/telegram/cli.cpp
View File

@ -4545,7 +4545,6 @@ class CliClient final : public Actor {
rl_callback_handler_remove(); rl_callback_handler_remove();
#endif #endif
Scheduler::instance()->finish(); Scheduler::instance()->finish();
LOG(WARNING) << "STOP";
stop(); stop();
} }
} }