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

Avoid usage of send_update_message_content with dialog_id.

Browse Source
This commit is contained in:
levlam 2022-09-19 00:29:31 +03:00
parent 91c54cc748
commit 51403c883c
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
td/telegram/MessagesManager.cpp
View File

@ -27376,7 +27376,9 @@ void MessagesManager::on_message_media_edited(DialogId dialog_id, MessageId mess
// must not run getDifference
CHECK(message_id.is_any_server());
auto m = get_message({dialog_id, message_id});
Dialog *d = get_dialog(dialog_id);
CHECK(d != nullptr);
auto m = get_message(d, message_id);
if (m == nullptr || m->edit_generation != generation) {
// message is already deleted or was edited again
return;
@ -27397,7 +27399,7 @@ void MessagesManager::on_message_media_edited(DialogId dialog_id, MessageId mess
bool need_merge_files = pts != 0 && pts == m->last_edit_pts;
bool need_send_update = update_message_content(dialog_id, m, std::move(m->edited_content), need_merge_files, true);
if (need_send_update && need_send_update_message_content) {
send_update_message_content(dialog_id, m, true, "on_message_media_edited");
send_update_message_content(d, m, true, "on_message_media_edited");
}
} else {
LOG(INFO) << "Failed to edit " << message_id << " in " << dialog_id << ": " << result.error();
@ -30787,14 +30789,6 @@ void MessagesManager::send_update_message_send_succeeded(Dialog *d, MessageId ol
get_message_object(d->dialog_id, m, "send_update_message_send_succeeded"), old_message_id.get()));
}
void MessagesManager::send_update_message_content(DialogId dialog_id, Message *m, bool is_message_in_dialog,
const char *source) {
Dialog *d = get_dialog(dialog_id);
LOG_CHECK(d != nullptr) << "Send updateMessageContent in unknown " << dialog_id << " from " << source
<< " with load count " << loaded_dialogs_.count(dialog_id);
send_update_message_content(d, m, is_message_in_dialog, source);
}
void MessagesManager::send_update_message_content(const Dialog *d, Message *m, bool is_message_in_dialog,
const char *source) {
CHECK(d != nullptr);

2
td/telegram/MessagesManager.h
View File

@ -2477,8 +2477,6 @@ class MessagesManager final : public Actor {
void send_update_message_send_succeeded(Dialog *d, MessageId old_message_id, const Message *m) const;
void send_update_message_content(DialogId dialog_id, Message *m, bool is_message_in_dialog, const char *source);
void send_update_message_content(const Dialog *d, Message *m, bool is_message_in_dialog, const char *source);
void send_update_message_content_impl(DialogId dialog_id, const Message *m, const char *source) const;