andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Return previous is_blocked value, when block/unblock request fails.

Browse Source 
GitOrigin-RevId: e8132bcd987c8abe75fe4e01fb199f4dada74259
This commit is contained in:
levlam 2019-10-11 18:55:14 +03:00
parent d2047ff6d1
commit 438300b2cf
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
td/telegram/ContactsManager.cpp
View File

@ -336,9 +336,13 @@ class ResetWebAuthorizationsQuery : public Td::ResultHandler {
}; };
class SetUserIsBlockedQuery : public Td::ResultHandler { class SetUserIsBlockedQuery : public Td::ResultHandler {
Promise<Unit> promise_;
UserId user_id_; UserId user_id_;
public: public:
explicit SetUserIsBlockedQuery(Promise<Unit> &&promise) : promise_(std::move(promise)) {
}
void send(UserId user_id, tl_object_ptr<telegram_api::InputUser> &&user, bool is_blocked) { void send(UserId user_id, tl_object_ptr<telegram_api::InputUser> &&user, bool is_blocked) {
user_id_ = user_id; user_id_ = user_id;
if (is_blocked) { if (is_blocked) {
@ -358,15 +362,12 @@ class SetUserIsBlockedQuery : public Td::ResultHandler {
bool result = result_ptr.ok(); bool result = result_ptr.ok();
LOG_IF(WARNING, !result) << "Block/Unblock " << user_id_ << " has failed"; LOG_IF(WARNING, !result) << "Block/Unblock " << user_id_ << " has failed";
promise_.set_value(Unit());
} }
void on_error(uint64 id, Status status) override { void on_error(uint64 id, Status status) override {
if (!G()->close_flag()) { promise_.set_error(std::move(status));
LOG(WARNING) << "Receive error for SetUserIsBlockedQuery: " << status;
td->contacts_manager_->reload_user_full(user_id_);
td->messages_manager_->repair_dialog_action_bar(DialogId(user_id_));
}
status.ignore();
} }
}; };
@ -3804,12 +3805,25 @@ Status ContactsManager::set_user_is_blocked(UserId user_id, bool is_blocked) {
return Status::Error(5, "User not found"); return Status::Error(5, "User not found");
} }
td_->create_handler<SetUserIsBlockedQuery>()->send(user_id, std::move(user), is_blocked); auto query_promise = PromiseCreator::lambda([actor_id = actor_id(this), user_id, is_blocked](Result<Unit> result) {
if (!G()->close_flag() && result.is_error()) {
send_closure(actor_id, &ContactsManager::on_set_user_is_blocked_failed, user_id, is_blocked,
result.move_as_error());
}
});
td_->create_handler<SetUserIsBlockedQuery>(std::move(query_promise))->send(user_id, std::move(user), is_blocked);
on_update_user_is_blocked(user_id, is_blocked); on_update_user_is_blocked(user_id, is_blocked);
return Status::OK(); return Status::OK();
} }
void ContactsManager::on_set_user_is_blocked_failed(UserId user_id, bool is_blocked, Status error) {
LOG(WARNING) << "Receive error for SetUserIsBlockedQuery: " << error;
on_update_user_is_blocked(user_id, !is_blocked);
reload_user_full(user_id);
td_->messages_manager_->repair_dialog_action_bar(DialogId(user_id));
}
bool ContactsManager::is_valid_username(const string &username) { bool ContactsManager::is_valid_username(const string &username) {
if (username.size() < 5 || username.size() > 32) { if (username.size() < 5 || username.size() > 32) {
return false; return false;

2
td/telegram/ContactsManager.h
View File

@ -962,6 +962,8 @@ class ContactsManager : public Actor {
tl_object_ptr<telegram_api::botInfo> &&bot_info); tl_object_ptr<telegram_api::botInfo> &&bot_info);
void drop_user_full(UserId user_id); void drop_user_full(UserId user_id);
void on_set_user_is_blocked_failed(UserId user_id, bool is_blocked, Status error);
void on_update_chat_status(Chat *c, ChatId chat_id, DialogParticipantStatus status); void on_update_chat_status(Chat *c, ChatId chat_id, DialogParticipantStatus status);
void on_update_chat_default_permissions(Chat *c, ChatId chat_id, RestrictedRights default_permissions, int32 version); void on_update_chat_default_permissions(Chat *c, ChatId chat_id, RestrictedRights default_permissions, int32 version);
void on_update_chat_participant_count(Chat *c, ChatId chat_id, int32 participant_count, int32 version, void on_update_chat_participant_count(Chat *c, ChatId chat_id, int32 participant_count, int32 version,