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

Drop chat message sender when chat become private.

Browse Source
This commit is contained in:
levlam 2022-11-21 17:19:23 +03:00
parent 3ae4a8d702
commit c7f7abb6e7
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
td/telegram/ContactsManager.cpp
View File

@ -11126,6 +11126,11 @@ void ContactsManager::update_channel(Channel *c, ChannelId channel_id, bool from
} }
} }
if (!is_channel_public(c) && !c->has_linked_channel) {
send_closure_later(G()->messages_manager(), &MessagesManager::on_update_dialog_default_send_message_as_dialog_id,
DialogId(channel_id), DialogId(), false);
}
if (need_update_channel_full) { if (need_update_channel_full) {
auto channel_full = get_channel_full(channel_id, true, "update_channel"); auto channel_full = get_channel_full(channel_id, true, "update_channel");
CHECK(channel_full != nullptr); CHECK(channel_full != nullptr);

35
td/telegram/MessagesManager.cpp
View File

@ -33562,18 +33562,20 @@ void MessagesManager::on_dialog_linked_channel_updated(DialogId dialog_id, Chann
return; return;
} }
auto d = get_dialog(dialog_id); // no need to create the dialog auto d = get_dialog(dialog_id); // no need to create the dialog
if (d != nullptr && d->is_update_new_chat_sent) { if (d == nullptr || !d->is_update_new_chat_sent) {
vector<MessageId> message_ids; return;
find_messages(d->messages.get(), message_ids, [old_linked_channel_id, new_linked_channel_id](const Message *m) { }
return !m->reply_info.is_empty() && m->reply_info.channel_id.is_valid() &&
(m->reply_info.channel_id == old_linked_channel_id || m->reply_info.channel_id == new_linked_channel_id); vector<MessageId> message_ids;
}); find_messages(d->messages.get(), message_ids, [old_linked_channel_id, new_linked_channel_id](const Message *m) {
LOG(INFO) << "Found discussion messages " << message_ids; return !m->reply_info.is_empty() && m->reply_info.channel_id.is_valid() &&
for (auto message_id : message_ids) { (m->reply_info.channel_id == old_linked_channel_id || m->reply_info.channel_id == new_linked_channel_id);
send_update_message_interaction_info(dialog_id, get_message(d, message_id)); });
if (message_id == d->last_message_id) { LOG(INFO) << "Found discussion messages " << message_ids;
send_update_chat_last_message_impl(d, "on_dialog_linked_channel_updated"); for (auto message_id : message_ids) {
} send_update_message_interaction_info(dialog_id, get_message(d, message_id));
if (message_id == d->last_message_id) {
send_update_chat_last_message_impl(d, "on_dialog_linked_channel_updated");
} }
} }
} }
@ -38504,7 +38506,8 @@ unique_ptr<MessagesManager::Dialog> MessagesManager::parse_dialog(DialogId dialo
send_get_dialog_query(dialog_id, Auto(), 0, source); send_get_dialog_query(dialog_id, Auto(), 0, source);
} }
switch (d->dialog_id.get_type()) { auto dialog_type = d->dialog_id.get_type();
switch (dialog_type) {
case DialogType::Chat: case DialogType::Chat:
case DialogType::Channel: case DialogType::Channel:
if (get_active_reactions(d->available_reactions).empty() != ((d->available_reactions_generation & 1) == 1)) { if (get_active_reactions(d->available_reactions).empty() != ((d->available_reactions_generation & 1) == 1)) {
@ -38516,6 +38519,12 @@ unique_ptr<MessagesManager::Dialog> MessagesManager::parse_dialog(DialogId dialo
default: default:
break; break;
} }
if (!d->need_drop_default_send_message_as_dialog_id && d->default_send_message_as_dialog_id.is_valid() &&
dialog_type == DialogType::Channel && !td_->contacts_manager_->is_channel_public(dialog_id.get_channel_id()) &&
!td_->contacts_manager_->get_channel_has_linked_channel(dialog_id.get_channel_id())) {
LOG(INFO) << "Drop message sender in " << dialog_id;
d->need_drop_default_send_message_as_dialog_id = true;
}
return dialog; return dialog;
} }