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

Simplify update_used_hashtags usage.

Browse Source 
GitOrigin-RevId: 998789ff1c53eaaac86a61728449ac6524e43326
This commit is contained in:
levlam 2019-11-30 18:27:08 +03:00
parent 8d8c3cacd4
commit a75e53cdf3
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
td/telegram/MessagesManager.cpp
View File

@ -6110,11 +6110,8 @@ void MessagesManager::on_message_edited(FullMessageId full_message_id) {
CHECK(m != nullptr); CHECK(m != nullptr);
if (td_->auth_manager_->is_bot()) { if (td_->auth_manager_->is_bot()) {
send_update_message_edited(dialog_id, m); send_update_message_edited(dialog_id, m);
} else {
if (m->forward_info == nullptr && !m->had_forward_info && (m->is_outgoing || dialog_id == get_my_dialog_id())) {
update_used_hashtags(dialog_id, m);
}
} }
update_used_hashtags(dialog_id, m);
} }
void MessagesManager::process_pending_updates() { void MessagesManager::process_pending_updates() {
@ -25216,10 +25213,11 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
on_update_dialog_pinned_message_id(dialog_id, pinned_message_id); on_update_dialog_pinned_message_id(dialog_id, pinned_message_id);
} }
if (!td_->auth_manager_->is_bot() && from_update && m->forward_info == nullptr && !m->had_forward_info && if (!td_->auth_manager_->is_bot() && from_update && m->forward_info == nullptr && !m->had_forward_info &&
(m->is_outgoing || dialog_id == my_dialog_id)) { (m->is_outgoing || dialog_id == my_dialog_id) && dialog_id.get_type() != DialogType::SecretChat &&
if (dialog_id.get_type() != DialogType::SecretChat && !message_id.is_local()) { !message_id.is_local()) {
on_sent_message_content(td_, m->content.get()); on_sent_message_content(td_, m->content.get());
} }
if (from_update) {
update_used_hashtags(dialog_id, m); update_used_hashtags(dialog_id, m);
} }
if (!td_->auth_manager_->is_bot() && from_update && message_id.is_server() && if (!td_->auth_manager_->is_bot() && from_update && message_id.is_server() &&
@ -25414,10 +25412,10 @@ MessagesManager::Message *MessagesManager::add_scheduled_message_to_dialog(Dialo
DialogId my_dialog_id = get_my_dialog_id(); DialogId my_dialog_id = get_my_dialog_id();
if (from_update && m->forward_info == nullptr && !m->had_forward_info && if (from_update && m->forward_info == nullptr && !m->had_forward_info &&
(m->is_outgoing || dialog_id == my_dialog_id)) { (m->is_outgoing || dialog_id == my_dialog_id) && !message_id.is_local()) {
if (!message_id.is_local()) { on_sent_message_content(td_, m->content.get());
on_sent_message_content(td_, m->content.get()); }
} if (from_update) {
update_used_hashtags(dialog_id, m); update_used_hashtags(dialog_id, m);
} }
@ -27835,7 +27833,8 @@ void MessagesManager::after_get_channel_difference(DialogId dialog_id, bool succ
void MessagesManager::update_used_hashtags(DialogId dialog_id, const Message *m) { void MessagesManager::update_used_hashtags(DialogId dialog_id, const Message *m) {
CHECK(m != nullptr); CHECK(m != nullptr);
if (m->via_bot_user_id.is_valid() || m->hide_via_bot) { if (td_->auth_manager_->is_bot() || m->via_bot_user_id.is_valid() || m->hide_via_bot || m->forward_info != nullptr ||
m->had_forward_info || (!m->is_outgoing && dialog_id != get_my_dialog_id())) {
return; return;
} }
const FormattedText *text = get_message_content_text(m->content.get()); const FormattedText *text = get_message_content_text(m->content.get());