opensourcemirror
/
td
mirror of https://github.com/tdlib/td.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix some plural spelling.

This commit is contained in:
levlam 2024-03-28 02:03:03 +03:00
parent f195fcd6db
commit 11a35768b7
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
td/telegram/ContactsManager.cpp
View File

@ -5739,14 +5739,14 @@ void ContactsManager::on_update_contacts_reset() {
if (!are_imported_contacts_loaded_) {
if (load_imported_contacts_queries_.empty()) {
CHECK(all_imported_contacts_.empty());
LOG(INFO) << "Imported contacts was never loaded, just clear them";
LOG(INFO) << "Imported contacts were never loaded, just clear them";
} else {
LOG(INFO) << "Imported contacts are being loaded, clear them after they will be loaded";
need_clear_imported_contacts_ = true;
}
} else {
if (!are_imported_contacts_changing_) {
LOG(INFO) << "Imported contacts was loaded, but aren't changing now, just clear them";
LOG(INFO) << "Imported contacts were loaded, but aren't changing now, just clear them";
all_imported_contacts_.clear();
} else {
LOG(INFO) << "Imported contacts are changing now, clear them after they will be changed";

4
td/telegram/DialogFilter.cpp
View File

@ -533,12 +533,12 @@ unique_ptr<DialogFilter> DialogFilter::merge_dialog_filter_changes(const DialogF
auto merge_ordered_changes = [dialog_filter_id](auto &new_dialog_ids, auto old_server_dialog_ids,
auto new_server_dialog_ids) {
if (old_server_dialog_ids == new_server_dialog_ids) {
LOG(INFO) << "Pinned chats was not changed remotely in " << dialog_filter_id << ", keep local changes";
LOG(INFO) << "Pinned chats were not changed remotely in " << dialog_filter_id << ", keep local changes";
return;
}
if (InputDialogId::are_equivalent(new_dialog_ids, old_server_dialog_ids)) {
LOG(INFO) << "Pinned chats was not changed locally in " << dialog_filter_id << ", keep remote changes";
LOG(INFO) << "Pinned chats were not changed locally in " << dialog_filter_id << ", keep remote changes";
size_t kept_server_dialogs = 0;
FlatHashSet<DialogId, DialogIdHash> removed_dialog_ids;

2
td/telegram/InlineQueriesManager.cpp
View File

@ -2086,7 +2086,7 @@ bool InlineQueriesManager::load_recently_used_bots(Promise<Unit> &promise) {
LOG(INFO) << "Load recently used inline bots " << saved_bots << '/' << saved_bot_ids;
if (recently_used_bots_loaded_ == 1 && resolve_recent_inline_bots_multipromise_.promise_count() == 0) {
// queries was sent and have already been finished
// queries were sent and have already been finished
auto newly_used_bots = std::move(recently_used_bot_user_ids_);
recently_used_bot_user_ids_.clear();

8
td/telegram/MessagesManager.cpp
View File

@ -3724,7 +3724,7 @@ class DeleteMessagesQuery final : public Td::ResultHandler {
void on_error(Status status) final {
if (!G()->is_expected_error(status)) {
// MESSAGE_DELETE_FORBIDDEN can be returned in group chats when administrator rights was removed
// MESSAGE_DELETE_FORBIDDEN can be returned in group chats when administrator rights were removed
// MESSAGE_DELETE_FORBIDDEN can be returned in private chats for bots when revoke time limit exceeded
if (status.message() != "MESSAGE_DELETE_FORBIDDEN" ||
(dialog_id_.get_type() == DialogType::User && !td_->auth_manager_->is_bot())) {
@ -8627,7 +8627,7 @@ void MessagesManager::on_get_history(DialogId dialog_id, MessageId from_message_
}
// be aware that returned messages are guaranteed to be consecutive messages, but if !from_the_end they
// may be older (if some messages was deleted) or newer (if some messages were added) than an expected answer
// may be older (if some messages were deleted) or newer (if some messages were added) than an expected answer
// be aware that any subset of the returned messages may be already deleted and returned as MessageEmpty
bool is_channel_message = dialog_id.get_type() == DialogType::Channel;
MessageId first_added_message_id;
@ -15059,7 +15059,7 @@ unique_ptr<MessagesManager::Message> MessagesManager::do_delete_message(Dialog *
if (*it != nullptr) {
if ((*it)->get_message_id() < d->first_database_message_id && d->dialog_id.get_type() == DialogType::Channel) {
// possible if messages was deleted from database, but not from memory after updateChannelTooLong
// possible if messages were deleted from database, but not from memory after updateChannelTooLong
set_dialog_last_database_message_id(d, MessageId(), "do_delete_message 1");
} else {
set_dialog_last_database_message_id(d, (*it)->get_message_id(), "do_delete_message 2");
@ -29382,7 +29382,7 @@ void MessagesManager::on_send_media_group_file_reference_error(DialogId dialog_i
CHECK(dialog_id.get_type() != DialogType::SecretChat);
if (message_ids.empty()) {
// all messages was deleted, nothing to do
// all messages were deleted, nothing to do
return;
}

4
td/telegram/NotificationManager.cpp
View File

@ -620,14 +620,14 @@ void NotificationManager::on_get_notifications_from_database(NotificationGroupId
auto first_notification_id = get_first_notification_id(group);
if (first_notification_id.is_valid()) {
while (!notifications.empty() && notifications.back().notification_id.get() >= first_notification_id.get()) {
// possible if notifications was added after the database request was sent
// possible if notifications were added after the database request was sent
notifications.pop_back();
}
}
auto first_object_id = get_first_object_id(group);
if (first_object_id.is_valid()) {
while (!notifications.empty() && notifications.back().type->get_object_id() >= first_object_id) {
// possible if notifications was added after the database request was sent
// possible if notifications were added after the database request was sent
notifications.pop_back();
}
}

2
td/telegram/PollManager.cpp
View File

@ -1012,7 +1012,7 @@ void PollManager::on_set_poll_answer_finished(PollId poll_id, Result<Unit> &&res
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
// no updates were 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";

2
tdtl/td/tl/tl_writer.cpp
View File

@ -70,7 +70,7 @@ bool TL_writer::is_combinator_supported(const tl_combinator *constructor) const
if (a.flags & FLAG_EXCL) {
assert(t->var_num >= 0);
if (is_function_result[t->var_num]) {
return false; // lazy to check that result of two function calls is the same
return false; // lazy to check that results of two function calls are the same
}
is_function_result[t->var_num] = true;
} else {

4
tdutils/td/utils/MpmcQueue.h
View File

@ -324,7 +324,7 @@ class MpmcQueueOld {
char pad2[TD_CONCURRENCY_PAD - sizeof(std::atomic<Node *>)];
size_t block_size_;
HazardPointers<Node, 1> hazard_pointers_;
// HazardPointers is already padded
// HazardPointers class is already padded
};
template <class T>
@ -454,7 +454,7 @@ class MpmcQueue {
std::atomic<Node *> read_pos_{nullptr};
char pad2[TD_CONCURRENCY_PAD - sizeof(std::atomic<Node *>)];
HazardPointers<Node, 1> hazard_pointers_;
// HazardPointers is already padded
// HazardPointers class is already padded
};
} // namespace td