diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl index 79ea526b9..6c91e907e 100644 --- a/td/generate/scheme/td_api.tl +++ b/td/generate/scheme/td_api.tl @@ -2407,7 +2407,7 @@ updateActiveNotifications groups:vector = Update; updateHavePendingNotifications have_pending_notifications:Bool = Update; //@description Some messages were deleted @chat_id Chat identifier @message_ids Identifiers of the deleted messages -//@is_permanent True, if the messages are permanently deleted by a user (as opposed to just becoming unaccessible) +//@is_permanent True, if the messages are permanently deleted by a user (as opposed to just becoming inaccessible) //@from_cache True, if the messages are deleted only from the cache and can possibly be retrieved again in the future updateDeleteMessages chat_id:int53 message_ids:vector is_permanent:Bool from_cache:Bool = Update; diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp index e2b557a21..d449c7c29 100644 --- a/td/telegram/ContactsManager.cpp +++ b/td/telegram/ContactsManager.cpp @@ -8703,7 +8703,7 @@ bool ContactsManager::get_user_full(UserId user_id, Promise &&promise) { if (user_full == nullptr || !user_full->is_inited) { auto input_user = get_input_user(user_id); if (input_user == nullptr) { - promise.set_error(Status::Error(6, "Can't get info about unaccessible user")); + promise.set_error(Status::Error(6, "Can't get info about inaccessible user")); return false; } diff --git a/td/telegram/MessageEntity.cpp b/td/telegram/MessageEntity.cpp index 44f41c856..c60a4d5b9 100644 --- a/td/telegram/MessageEntity.cpp +++ b/td/telegram/MessageEntity.cpp @@ -1896,7 +1896,7 @@ vector get_message_entities(const ContactsManager *contacts_manag continue; } if (!contacts_manager->have_input_user(user_id)) { - LOG(ERROR) << "Receive unaccessible " << user_id << " in MentionName from " << source; + LOG(ERROR) << "Receive inaccessible " << user_id << " in MentionName from " << source; continue; } entities.emplace_back(entity_mention_name->offset_, entity_mention_name->length_, user_id); diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp index ca7a8d392..a91382e21 100644 --- a/td/telegram/MessagesManager.cpp +++ b/td/telegram/MessagesManager.cpp @@ -20027,8 +20027,8 @@ DialogId MessagesManager::resolve_dialog_username(const string &username) { return it->second.dialog_id; } - auto it2 = unaccessible_resolved_usernames_.find(clean_username(username)); - if (it2 != unaccessible_resolved_usernames_.end()) { + auto it2 = inaccessible_resolved_usernames_.find(clean_username(username)); + if (it2 != inaccessible_resolved_usernames_.end()) { return it2->second; } @@ -20053,8 +20053,8 @@ DialogId MessagesManager::search_public_dialog(const string &username_to_search, } dialog_id = it->second.dialog_id; } else { - auto it2 = unaccessible_resolved_usernames_.find(username); - if (it2 != unaccessible_resolved_usernames_.end()) { + auto it2 = inaccessible_resolved_usernames_.find(username); + if (it2 != inaccessible_resolved_usernames_.end()) { dialog_id = it2->second; } } @@ -20241,7 +20241,7 @@ void MessagesManager::on_dialog_username_updated(DialogId dialog_id, const strin } if (!old_username.empty() && old_username != new_username) { resolved_usernames_.erase(clean_username(old_username)); - unaccessible_resolved_usernames_.erase(clean_username(old_username)); + inaccessible_resolved_usernames_.erase(clean_username(old_username)); } if (!new_username.empty()) { auto cache_time = is_update_about_username_change_received(dialog_id) ? USERNAME_CACHE_EXPIRE_TIME @@ -20263,11 +20263,11 @@ void MessagesManager::on_resolved_username(const string &username, DialogId dial return; } - unaccessible_resolved_usernames_[clean_username(username)] = dialog_id; + inaccessible_resolved_usernames_[clean_username(username)] = dialog_id; } void MessagesManager::drop_username(const string &username) { - unaccessible_resolved_usernames_.erase(clean_username(username)); + inaccessible_resolved_usernames_.erase(clean_username(username)); auto it = resolved_usernames_.find(clean_username(username)); if (it == resolved_usernames_.end()) { diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h index 852bfa35e..b7d2e7e4d 100644 --- a/td/telegram/MessagesManager.h +++ b/td/telegram/MessagesManager.h @@ -2334,7 +2334,7 @@ class MessagesManager : public Actor { }; std::unordered_map resolved_usernames_; - std::unordered_map unaccessible_resolved_usernames_; + std::unordered_map inaccessible_resolved_usernames_; struct PendingOnGetDialogs { vector> dialogs; diff --git a/td/telegram/PrivacyManager.cpp b/td/telegram/PrivacyManager.cpp index 4e9eb57ae..341c86526 100644 --- a/td/telegram/PrivacyManager.cpp +++ b/td/telegram/PrivacyManager.cpp @@ -195,7 +195,7 @@ Result PrivacyManager::UserPrivacySettin UserPrivacySettingRule res(*rule); for (auto user_id : res.user_ids_) { if (!G()->td().get_actor_unsafe()->contacts_manager_->have_user(UserId(user_id))) { - return Status::Error(500, "Got unaccessible user from the server"); + return Status::Error(500, "Got inaccessible user from the server"); } } return res; diff --git a/td/telegram/RequestActor.h b/td/telegram/RequestActor.h index 2984cb88c..179d14381 100644 --- a/td/telegram/RequestActor.h +++ b/td/telegram/RequestActor.h @@ -47,7 +47,7 @@ class RequestActor : public Actor { } else { if (--tries_left_ == 0) { future.close(); - do_send_error(Status::Error(400, "Requested data is unaccessible")); + do_send_error(Status::Error(400, "Requested data is inaccessible")); return stop(); }