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

Delete received empty channel messages.

Browse Source 
GitOrigin-RevId: f6754fb7381c2e72983874033ac1e2bbc2293c89
This commit is contained in:
levlam 2020-09-14 02:23:02 +03:00
parent d940b86113
commit a6463970b1
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
td/telegram/MessagesManager.cpp
View File

@ -454,6 +454,16 @@ class GetChannelMessagesQuery : public Td::ResultHandler {
auto info = td->messages_manager_->on_get_messages(result_ptr.move_as_ok(), "GetChannelMessagesQuery"); auto info = td->messages_manager_->on_get_messages(result_ptr.move_as_ok(), "GetChannelMessagesQuery");
LOG_IF(ERROR, !info.is_channel_messages) << "Receive ordinary messages in GetChannelMessagesQuery"; LOG_IF(ERROR, !info.is_channel_messages) << "Receive ordinary messages in GetChannelMessagesQuery";
vector<MessageId> empty_message_ids;
for (auto &message : info.messages) {
if (message->get_id() == telegram_api::messageEmpty::ID) {
auto message_id = MessagesManager::get_message_id(message, false);
if (message_id.is_valid()) {
empty_message_ids.push_back(message_id);
}
}
}
td->messages_manager_->on_get_empty_messages(DialogId(channel_id_), std::move(empty_message_ids));
td->messages_manager_->on_get_messages(std::move(info.messages), info.is_channel_messages, false, td->messages_manager_->on_get_messages(std::move(info.messages), info.is_channel_messages, false,
"GetChannelMessagesQuery"); "GetChannelMessagesQuery");
@ -6838,7 +6848,7 @@ void MessagesManager::process_channel_update(tl_object_ptr<telegram_api::Update>
} }
auto dialog_id = DialogId(channel_id); auto dialog_id = DialogId(channel_id);
delete_dialog_messages_from_updates(dialog_id, message_ids); delete_dialog_messages_from_updates(dialog_id, message_ids, false);
break; break;
} }
case telegram_api::updateEditChannelMessage::ID: { case telegram_api::updateEditChannelMessage::ID: {
@ -8332,6 +8342,12 @@ void MessagesManager::after_get_difference() {
} }
} }
void MessagesManager::on_get_empty_messages(DialogId dialog_id, vector<MessageId> empty_message_ids) {
if (!empty_message_ids.empty()) {
delete_dialog_messages_from_updates(dialog_id, std::move(empty_message_ids), true);
}
}
MessagesManager::MessagesInfo MessagesManager::on_get_messages( MessagesManager::MessagesInfo MessagesManager::on_get_messages(
tl_object_ptr<telegram_api::messages_Messages> &&messages_ptr, const char *source) { tl_object_ptr<telegram_api::messages_Messages> &&messages_ptr, const char *source) {
CHECK(messages_ptr != nullptr); CHECK(messages_ptr != nullptr);
@ -9087,7 +9103,8 @@ void MessagesManager::delete_messages_from_updates(const vector<MessageId> &mess
} }
} }
void MessagesManager::delete_dialog_messages_from_updates(DialogId dialog_id, const vector<MessageId> &message_ids) { void MessagesManager::delete_dialog_messages_from_updates(DialogId dialog_id, const vector<MessageId> &message_ids,
bool skip_update_for_not_found_messages) {
CHECK(dialog_id.get_type() == DialogType::Channel || dialog_id.get_type() == DialogType::SecretChat); CHECK(dialog_id.get_type() == DialogType::Channel || dialog_id.get_type() == DialogType::SecretChat);
Dialog *d = get_dialog_force(dialog_id); Dialog *d = get_dialog_force(dialog_id);
if (d == nullptr) { if (d == nullptr) {
@ -9105,7 +9122,13 @@ void MessagesManager::delete_dialog_messages_from_updates(DialogId dialog_id, co
} }
auto message = delete_message(d, message_id, true, &need_update_dialog_pos, "updates"); auto message = delete_message(d, message_id, true, &need_update_dialog_pos, "updates");
deleted_message_ids.push_back(message == nullptr ? message_id.get() : message->message_id.get()); if (message == nullptr) {
if (!skip_update_for_not_found_messages) {
deleted_message_ids.push_back(message_id.get());
}
} else {
deleted_message_ids.push_back(message->message_id.get());
}
} }
if (need_update_dialog_pos) { if (need_update_dialog_pos) {
send_update_chat_last_message(d, "delete_dialog_messages_from_updates"); send_update_chat_last_message(d, "delete_dialog_messages_from_updates");
@ -11030,7 +11053,7 @@ void MessagesManager::ttl_loop(double now) {
} }
} }
for (auto &it : to_delete) { for (auto &it : to_delete) {
delete_dialog_messages_from_updates(it.first, it.second); delete_dialog_messages_from_updates(it.first, it.second, false);
} }
ttl_update_timeout(now); ttl_update_timeout(now);
} }
@ -11733,7 +11756,7 @@ void MessagesManager::finish_delete_secret_messages(DialogId dialog_id, std::vec
LOG(INFO) << "Skip deletion of service " << message_id; LOG(INFO) << "Skip deletion of service " << message_id;
} }
} }
delete_dialog_messages_from_updates(dialog_id, to_delete_message_ids); delete_dialog_messages_from_updates(dialog_id, to_delete_message_ids, false);
} }
void MessagesManager::delete_secret_chat_history(SecretChatId secret_chat_id, MessageId last_message_id, void MessagesManager::delete_secret_chat_history(SecretChatId secret_chat_id, MessageId last_message_id,

9
td/telegram/MessagesManager.h
View File

@ -194,6 +194,8 @@ class MessagesManager : public Actor {
static vector<int32> get_scheduled_server_message_ids(const vector<MessageId> &message_ids); static vector<int32> get_scheduled_server_message_ids(const vector<MessageId> &message_ids);
static MessageId get_message_id(const tl_object_ptr<telegram_api::Message> &message_ptr, bool is_scheduled);
DialogId get_message_dialog_id(const tl_object_ptr<telegram_api::Message> &message_ptr) const; DialogId get_message_dialog_id(const tl_object_ptr<telegram_api::Message> &message_ptr) const;
tl_object_ptr<telegram_api::InputPeer> get_input_peer(DialogId dialog_id, AccessRights access_rights) const; tl_object_ptr<telegram_api::InputPeer> get_input_peer(DialogId dialog_id, AccessRights access_rights) const;
@ -214,6 +216,8 @@ class MessagesManager : public Actor {
bool have_input_peer(DialogId dialog_id, AccessRights access_rights) const; bool have_input_peer(DialogId dialog_id, AccessRights access_rights) const;
void on_get_empty_messages(DialogId dialog_id, vector<MessageId> empty_message_ids);
struct MessagesInfo { struct MessagesInfo {
vector<tl_object_ptr<telegram_api::Message>> messages; vector<tl_object_ptr<telegram_api::Message>> messages;
int32 total_count = 0; int32 total_count = 0;
@ -1634,8 +1638,6 @@ class MessagesManager : public Actor {
static constexpr bool DROP_UPDATES = false; static constexpr bool DROP_UPDATES = false;
static MessageId get_message_id(const tl_object_ptr<telegram_api::Message> &message_ptr, bool is_scheduled);
FullMessageId get_full_message_id(const tl_object_ptr<telegram_api::Message> &message_ptr, bool is_scheduled) const; FullMessageId get_full_message_id(const tl_object_ptr<telegram_api::Message> &message_ptr, bool is_scheduled) const;
static int32 get_message_date(const tl_object_ptr<telegram_api::Message> &message_ptr); static int32 get_message_date(const tl_object_ptr<telegram_api::Message> &message_ptr);
@ -1741,7 +1743,8 @@ class MessagesManager : public Actor {
void delete_messages_from_updates(const vector<MessageId> &message_ids); void delete_messages_from_updates(const vector<MessageId> &message_ids);
void delete_dialog_messages_from_updates(DialogId dialog_id, const vector<MessageId> &message_ids); void delete_dialog_messages_from_updates(DialogId dialog_id, const vector<MessageId> &message_ids,
bool skip_update_for_not_found_messages);
void do_forward_messages(DialogId to_dialog_id, DialogId from_dialog_id, const vector<Message *> &messages, void do_forward_messages(DialogId to_dialog_id, DialogId from_dialog_id, const vector<Message *> &messages,
const vector<MessageId> &message_ids, uint64 logevent_id); const vector<MessageId> &message_ids, uint64 logevent_id);