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

Merge remote-tracking branch 'td/master'

Browse Source
This commit is contained in:
Andrea Cavalli 2021-10-04 15:50:37 +02:00
commit 4e9b159ba4
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
td/telegram/MessagesDb.cpp
View File

@ -34,7 +34,7 @@
#include <array> #include <array>
#include <iterator> #include <iterator>
#include <limits> #include <limits>
#include <tuple> #include <utility>
namespace td { namespace td {
@ -194,8 +194,9 @@ class MessagesDbImpl final : public MessagesDbSyncInterface {
TRY_RESULT_ASSIGN(delete_dialog_messages_from_user_stmt_, TRY_RESULT_ASSIGN(delete_dialog_messages_from_user_stmt_,
db_.get_statement("DELETE FROM messages WHERE dialog_id = ?1 AND sender_user_id == ?2")); db_.get_statement("DELETE FROM messages WHERE dialog_id = ?1 AND sender_user_id == ?2"));
TRY_RESULT_ASSIGN(get_message_stmt_, TRY_RESULT_ASSIGN(
db_.get_statement("SELECT data FROM messages WHERE dialog_id = ?1 AND message_id = ?2")); get_message_stmt_,
db_.get_statement("SELECT message_id, data FROM messages WHERE dialog_id = ?1 AND message_id = ?2"));
TRY_RESULT_ASSIGN( TRY_RESULT_ASSIGN(
get_message_by_random_id_stmt_, get_message_by_random_id_stmt_,
db_.get_statement("SELECT message_id, data FROM messages WHERE dialog_id = ?1 AND random_id = ?2")); db_.get_statement("SELECT message_id, data FROM messages WHERE dialog_id = ?1 AND random_id = ?2"));
@ -257,10 +258,11 @@ class MessagesDbImpl final : public MessagesDbSyncInterface {
db_.get_statement("INSERT OR REPLACE INTO scheduled_messages VALUES(?1, ?2, ?3, ?4)")); db_.get_statement("INSERT OR REPLACE INTO scheduled_messages VALUES(?1, ?2, ?3, ?4)"));
TRY_RESULT_ASSIGN( TRY_RESULT_ASSIGN(
get_scheduled_message_stmt_, get_scheduled_message_stmt_,
db_.get_statement("SELECT data FROM scheduled_messages WHERE dialog_id = ?1 AND message_id = ?2")); db_.get_statement("SELECT message_id, data FROM scheduled_messages WHERE dialog_id = ?1 AND message_id = ?2"));
TRY_RESULT_ASSIGN( TRY_RESULT_ASSIGN(
get_scheduled_server_message_stmt_, get_scheduled_server_message_stmt_,
db_.get_statement("SELECT data FROM scheduled_messages WHERE dialog_id = ?1 AND server_message_id = ?2")); db_.get_statement(
"SELECT message_id, data FROM scheduled_messages WHERE dialog_id = ?1 AND server_message_id = ?2"));
TRY_RESULT_ASSIGN(delete_scheduled_message_stmt_, TRY_RESULT_ASSIGN(delete_scheduled_message_stmt_,
db_.get_statement("DELETE FROM scheduled_messages WHERE dialog_id = ?1 AND message_id = ?2")); db_.get_statement("DELETE FROM scheduled_messages WHERE dialog_id = ?1 AND message_id = ?2"));
TRY_RESULT_ASSIGN( TRY_RESULT_ASSIGN(
@ -462,7 +464,17 @@ class MessagesDbImpl final : public MessagesDbSyncInterface {
if (!stmt.has_row()) { if (!stmt.has_row()) {
return Status::Error("Not found"); return Status::Error("Not found");
} }
return MessagesDbDialogMessage{message_id, BufferSlice(stmt.view_blob(0))}; MessageId received_message_id(stmt.view_int64(0));
MessagesDbDialogMessage result{received_message_id, BufferSlice(stmt.view_blob(1))};
if (is_scheduled_server) {
CHECK(received_message_id.is_scheduled());
CHECK(received_message_id.is_scheduled_server());
CHECK(received_message_id.get_scheduled_server_message_id() == message_id.get_scheduled_server_message_id());
} else {
LOG_CHECK(received_message_id == message_id)
<< received_message_id << ' ' << message_id << ' ' << get_message_info(result, true).first;
}
return std::move(result);
} }
Result<MessagesDbMessage> get_message_by_unique_message_id(ServerMessageId unique_message_id) final { Result<MessagesDbMessage> get_message_by_unique_message_id(ServerMessageId unique_message_id) final {
@ -909,7 +921,7 @@ class MessagesDbImpl final : public MessagesDbSyncInterface {
return std::move(result); return std::move(result);
} }
static std::tuple<MessageId, int32> get_message_info(const MessagesDbDialogMessage &message) { static std::pair<MessageId, int32> get_message_info(const MessagesDbDialogMessage &message, bool from_data = false) {
LogEventParser message_date_parser(message.data.as_slice()); LogEventParser message_date_parser(message.data.as_slice());
int32 flags; int32 flags;
int32 flags2 = 0; int32 flags2 = 0;
@ -932,7 +944,7 @@ class MessagesDbImpl final : public MessagesDbSyncInterface {
td::parse(date, message_date_parser); td::parse(date, message_date_parser);
LOG(INFO) << "Loaded " << message.message_id << "(aka " << message_id << ") sent at " << date << " by " LOG(INFO) << "Loaded " << message.message_id << "(aka " << message_id << ") sent at " << date << " by "
<< sender_user_id; << sender_user_id;
return std::make_tuple(message.message_id, date); return {from_data ? message_id : message.message_id, date};
} }
}; };

2
td/telegram/MessagesManager.cpp
View File

@ -32643,6 +32643,8 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
Message *m = message->from_database ? get_message(d, message_id) Message *m = message->from_database ? get_message(d, message_id)
: get_message_force(d, message_id, "add_message_to_dialog 2"); : get_message_force(d, message_id, "add_message_to_dialog 2");
if (m != nullptr) { if (m != nullptr) {
CHECK(m->message_id == message_id);
CHECK(message->message_id == message_id);
LOG(INFO) << "Adding already existing " << message_id << " in " << dialog_id << " from " << source; LOG(INFO) << "Adding already existing " << message_id << " in " << dialog_id << " from " << source;
if (*need_update) { if (*need_update) {
*need_update = false; *need_update = false;