From b41a51f2ec121963b306c018bcb3793b6aabc893 Mon Sep 17 00:00:00 2001 From: levlam Date: Wed, 4 Oct 2023 16:18:20 +0300 Subject: [PATCH] Use add_to_top if possible. --- td/telegram/EmojiStatus.cpp | 6 +----- td/telegram/MessageReaction.cpp | 6 +----- td/telegram/MessageReplyInfo.cpp | 7 ++----- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/td/telegram/EmojiStatus.cpp b/td/telegram/EmojiStatus.cpp index db202c224..5d451f2b2 100644 --- a/td/telegram/EmojiStatus.cpp +++ b/td/telegram/EmojiStatus.cpp @@ -312,12 +312,8 @@ void add_recent_emoji_status(Td *td, EmojiStatus emoji_status) { } statuses.hash_ = 0; - td::remove(statuses.emoji_statuses_, emoji_status); - statuses.emoji_statuses_.insert(statuses.emoji_statuses_.begin(), emoji_status); constexpr size_t MAX_RECENT_EMOJI_STATUSES = 50; // server-side limit - if (statuses.emoji_statuses_.size() > MAX_RECENT_EMOJI_STATUSES) { - statuses.emoji_statuses_.resize(MAX_RECENT_EMOJI_STATUSES); - } + add_to_top(statuses.emoji_statuses_, MAX_RECENT_EMOJI_STATUSES, emoji_status); save_emoji_statuses(get_recent_emoji_statuses_database_key(), statuses); } diff --git a/td/telegram/MessageReaction.cpp b/td/telegram/MessageReaction.cpp index f31487b01..7d678228b 100644 --- a/td/telegram/MessageReaction.cpp +++ b/td/telegram/MessageReaction.cpp @@ -300,11 +300,7 @@ MessageReaction::MessageReaction(ReactionType reaction_type, int32 choose_count, void MessageReaction::add_recent_chooser_dialog_id(DialogId dialog_id) { CHECK(!my_recent_chooser_dialog_id_.is_valid()); my_recent_chooser_dialog_id_ = dialog_id; - recent_chooser_dialog_ids_.insert(recent_chooser_dialog_ids_.begin(), dialog_id); - if (recent_chooser_dialog_ids_.size() > MAX_RECENT_CHOOSERS + 1) { - LOG(ERROR) << "Have " << recent_chooser_dialog_ids_.size() << " recent reaction choosers"; - recent_chooser_dialog_ids_.resize(MAX_RECENT_CHOOSERS + 1); - } + add_to_top(recent_chooser_dialog_ids_, MAX_RECENT_CHOOSERS + 1, dialog_id); } bool MessageReaction::remove_recent_chooser_dialog_id() { diff --git a/td/telegram/MessageReplyInfo.cpp b/td/telegram/MessageReplyInfo.cpp index 865b58ee6..b38e69420 100644 --- a/td/telegram/MessageReplyInfo.cpp +++ b/td/telegram/MessageReplyInfo.cpp @@ -166,13 +166,10 @@ bool MessageReplyInfo::add_reply(DialogId replier_dialog_id, MessageId reply_mes } } - td::remove(recent_replier_dialog_ids_, replier_dialog_id); if (diff > 0) { - recent_replier_dialog_ids_.insert(recent_replier_dialog_ids_.begin(), replier_dialog_id); - if (recent_replier_dialog_ids_.size() > MAX_RECENT_REPLIERS) { - recent_replier_dialog_ids_.pop_back(); - } + add_to_top(recent_replier_dialog_ids_, MAX_RECENT_REPLIERS, replier_dialog_id); } else { + td::remove(recent_replier_dialog_ids_, replier_dialog_id); auto max_repliers = static_cast(reply_count_); if (recent_replier_dialog_ids_.size() > max_repliers) { recent_replier_dialog_ids_.resize(max_repliers);