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

Remove now unneeded parameters from MessageReactions::remove_reaction.

Browse Source
This commit is contained in:
levlam 2023-04-27 16:42:38 +03:00
parent 89cd51b461
commit e528c85550
3 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
td/telegram/MessageReaction.cpp
View File

@ -449,24 +449,25 @@ void MessageReaction::update_recent_chooser_dialog_ids(const MessageReaction &ol
recent_chooser_min_channels_ = old_reaction.recent_chooser_min_channels_; recent_chooser_min_channels_ = old_reaction.recent_chooser_min_channels_;
} }
void MessageReaction::set_is_chosen(bool is_chosen, DialogId chooser_dialog_id, bool have_recent_choosers) { void MessageReaction::set_as_chosen(DialogId chooser_dialog_id, bool have_recent_choosers) {
if (is_chosen_ == is_chosen) { CHECK(!is_chosen_);
return;
}
is_chosen_ = is_chosen; is_chosen_ = true;
choose_count_++;
if (chooser_dialog_id.is_valid()) { if (have_recent_choosers) {
choose_count_ += is_chosen_ ? 1 : -1; remove_recent_chooser_dialog_id();
if (have_recent_choosers) { add_recent_chooser_dialog_id(chooser_dialog_id);
remove_recent_chooser_dialog_id();
if (is_chosen_) {
add_recent_chooser_dialog_id(chooser_dialog_id);
}
}
} }
} }
void MessageReaction::unset_as_chosen() {
CHECK(is_chosen_);
is_chosen_ = false;
choose_count_--;
remove_recent_chooser_dialog_id();
}
td_api::object_ptr<td_api::messageReaction> MessageReaction::get_message_reaction_object(Td *td, UserId my_user_id, td_api::object_ptr<td_api::messageReaction> MessageReaction::get_message_reaction_object(Td *td, UserId my_user_id,
UserId peer_user_id) const { UserId peer_user_id) const {
CHECK(!is_empty()); CHECK(!is_empty());
@ -684,7 +685,7 @@ bool MessageReactions::add_reaction(const string &reaction, bool is_big, DialogI
reactions_.push_back({reaction, 1, true, chooser_dialog_id, std::move(recent_chooser_dialog_ids), Auto()}); reactions_.push_back({reaction, 1, true, chooser_dialog_id, std::move(recent_chooser_dialog_ids), Auto()});
new_chosen_reaction_order.emplace_back(reaction); new_chosen_reaction_order.emplace_back(reaction);
} else if (!added_reaction->is_chosen()) { } else if (!added_reaction->is_chosen()) {
added_reaction->set_is_chosen(true, chooser_dialog_id, have_recent_choosers); added_reaction->set_as_chosen(chooser_dialog_id, have_recent_choosers);
new_chosen_reaction_order.emplace_back(reaction); new_chosen_reaction_order.emplace_back(reaction);
} else if (!is_big) { } else if (!is_big) {
return false; return false;
@ -694,7 +695,7 @@ bool MessageReactions::add_reaction(const string &reaction, bool is_big, DialogI
while (new_chosen_reaction_order.size() > max_reaction_count) { while (new_chosen_reaction_order.size() > max_reaction_count) {
auto index = new_chosen_reaction_order[0] == reaction ? 1 : 0; auto index = new_chosen_reaction_order[0] == reaction ? 1 : 0;
CHECK(static_cast<size_t>(index) < new_chosen_reaction_order.size()); CHECK(static_cast<size_t>(index) < new_chosen_reaction_order.size());
bool is_removed = do_remove_reaction(new_chosen_reaction_order[index], chooser_dialog_id, have_recent_choosers); bool is_removed = do_remove_reaction(new_chosen_reaction_order[index]);
CHECK(is_removed); CHECK(is_removed);
new_chosen_reaction_order.erase(new_chosen_reaction_order.begin() + index); new_chosen_reaction_order.erase(new_chosen_reaction_order.begin() + index);
} }
@ -706,15 +707,16 @@ bool MessageReactions::add_reaction(const string &reaction, bool is_big, DialogI
return true; return true;
} }
bool MessageReactions::remove_reaction(const string &reaction, DialogId chooser_dialog_id, bool have_recent_choosers) { bool MessageReactions::remove_reaction(const string &reaction) {
if (do_remove_reaction(reaction, chooser_dialog_id, have_recent_choosers)) { if (do_remove_reaction(reaction)) {
if (!chosen_reaction_order_.empty()) { if (!chosen_reaction_order_.empty()) {
bool is_removed = td::remove(chosen_reaction_order_, reaction); bool is_removed = td::remove(chosen_reaction_order_, reaction);
CHECK(is_removed); CHECK(is_removed);
// if the user isn't a Premium user, then max_reaction_count could be reduced from 3 to 1
auto max_reaction_count = get_max_reaction_count(); auto max_reaction_count = get_max_reaction_count();
while (chosen_reaction_order_.size() > max_reaction_count) { while (chosen_reaction_order_.size() > max_reaction_count) {
is_removed = do_remove_reaction(chosen_reaction_order_[0], chooser_dialog_id, have_recent_choosers); is_removed = do_remove_reaction(chosen_reaction_order_[0]);
CHECK(is_removed); CHECK(is_removed);
chosen_reaction_order_.erase(chosen_reaction_order_.begin()); chosen_reaction_order_.erase(chosen_reaction_order_.begin());
} }
@ -729,13 +731,12 @@ bool MessageReactions::remove_reaction(const string &reaction, DialogId chooser_
return false; return false;
} }
bool MessageReactions::do_remove_reaction(const string &reaction, DialogId chooser_dialog_id, bool MessageReactions::do_remove_reaction(const string &reaction) {
bool have_recent_choosers) {
for (auto it = reactions_.begin(); it != reactions_.end(); ++it) { for (auto it = reactions_.begin(); it != reactions_.end(); ++it) {
auto &message_reaction = *it; auto &message_reaction = *it;
if (message_reaction.get_reaction() == reaction) { if (message_reaction.get_reaction() == reaction) {
if (message_reaction.is_chosen()) { if (message_reaction.is_chosen()) {
message_reaction.set_is_chosen(false, chooser_dialog_id, have_recent_choosers); message_reaction.unset_as_chosen();
if (message_reaction.is_empty()) { if (message_reaction.is_empty()) {
it = reactions_.erase(it); it = reactions_.erase(it);
} }

8
td/telegram/MessageReaction.h
View File

@ -65,7 +65,9 @@ class MessageReaction {
return is_chosen_; return is_chosen_;
} }
void set_is_chosen(bool is_chosen, DialogId chooser_dialog_id, bool have_recent_choosers); void set_as_chosen(DialogId chooser_dialog_id, bool have_recent_choosers);
void unset_as_chosen();
void add_recent_chooser_dialog_id(DialogId dialog_id); void add_recent_chooser_dialog_id(DialogId dialog_id);
@ -171,7 +173,7 @@ struct MessageReactions {
bool add_reaction(const string &reaction, bool is_big, DialogId chooser_dialog_id, bool have_recent_choosers); bool add_reaction(const string &reaction, bool is_big, DialogId chooser_dialog_id, bool have_recent_choosers);
bool remove_reaction(const string &reaction, DialogId chooser_dialog_id, bool have_recent_choosers); bool remove_reaction(const string &reaction);
void sort_reactions(const FlatHashMap<string, size_t> &active_reaction_pos); void sort_reactions(const FlatHashMap<string, size_t> &active_reaction_pos);
@ -204,7 +206,7 @@ struct MessageReactions {
void parse(ParserT &parser); void parse(ParserT &parser);
private: private:
bool do_remove_reaction(const string &reaction, DialogId chooser_dialog_id, bool have_recent_choosers); bool do_remove_reaction(const string &reaction);
}; };
StringBuilder &operator<<(StringBuilder &string_builder, const MessageReactions &reactions); StringBuilder &operator<<(StringBuilder &string_builder, const MessageReactions &reactions);

3
td/telegram/MessagesManager.cpp
View File

@ -23783,8 +23783,7 @@ void MessagesManager::remove_message_reaction(FullMessageId full_message_id, str
return promise.set_error(Status::Error(400, "Invalid reaction specified")); return promise.set_error(Status::Error(400, "Invalid reaction specified"));
} }
bool have_recent_choosers = !is_broadcast_channel(dialog_id) && !is_discussion_message(dialog_id, m); if (m->reactions == nullptr || !m->reactions->remove_reaction(reaction)) {
if (m->reactions == nullptr || !m->reactions->remove_reaction(reaction, get_my_dialog_id(), have_recent_choosers)) {
return promise.set_value(Unit()); return promise.set_value(Unit());
} }