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

Do not fail old messages sent to chat with self.

Browse Source 
GitOrigin-RevId: eb88cd12fb29a32c6088c6284babe73a3ad71e01
This commit is contained in:
levlam 2018-10-08 17:28:06 +03:00
parent 2540555ae5
commit 286c5040c1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
td/telegram/MessagesManager.cpp
View File

@ -22135,7 +22135,7 @@ MessagesManager::Message *MessagesManager::continue_send_message(DialogId dialog
} }
auto can_send_status = can_send_message(dialog_id); auto can_send_status = can_send_message(dialog_id);
if (can_send_status.is_ok() && result_message->send_date < now - MAX_RESEND_DELAY) { if (can_send_status.is_ok() && result_message->send_date < now - MAX_RESEND_DELAY && dialog_id != get_my_dialog_id()) {
can_send_status = Status::Error(400, "Message is too old to be re-sent automatically"); can_send_status = Status::Error(400, "Message is too old to be re-sent automatically");
} }
if (can_send_status.is_error()) { if (can_send_status.is_error()) {
@ -22318,7 +22318,7 @@ void MessagesManager::on_binlog_events(vector<BinlogEvent> &&events) {
} }
if (!have_input_peer(from_dialog_id, AccessRights::Read) || can_send_message(to_dialog_id).is_error() || if (!have_input_peer(from_dialog_id, AccessRights::Read) || can_send_message(to_dialog_id).is_error() ||
messages.empty() || messages[0]->send_date < now - MAX_RESEND_DELAY) { messages.empty() || (messages[0]->send_date < now - MAX_RESEND_DELAY && to_dialog_id != get_my_dialog_id())) {
LOG(WARNING) << "Can't continue forwarding " << messages.size() << " message(s) to " << to_dialog_id; LOG(WARNING) << "Can't continue forwarding " << messages.size() << " message(s) to " << to_dialog_id;
binlog_erase(G()->td_db()->get_binlog(), event.id_); binlog_erase(G()->td_db()->get_binlog(), event.id_);
break; break;