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

Support scheduled messages in MessagesDb::get_message.

Browse Source 
GitOrigin-RevId: 77f428b6b0012a41b2766b98ccf076d18b5eb513
This commit is contained in:
levlam 2019-12-02 17:27:28 +03:00
parent 7ab7925767
commit 16f29863cd
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
td/telegram/MessagesDb.cpp
View File

@ -245,6 +245,9 @@ class MessagesDbImpl : public MessagesDbSyncInterface {
TRY_RESULT_ASSIGN(add_scheduled_message_stmt_,
db_.get_statement("INSERT OR REPLACE INTO scheduled_messages VALUES(?1, ?2, ?3, ?4)"));
TRY_RESULT_ASSIGN(
get_scheduled_message_stmt_,
db_.get_statement("SELECT data FROM scheduled_messages WHERE dialog_id = ?1 AND message_id = ?2"));
TRY_RESULT_ASSIGN(delete_scheduled_message_stmt_,
db_.get_statement("DELETE FROM scheduled_messages WHERE dialog_id = ?1 AND message_id = ?2"));
@ -408,18 +411,19 @@ class MessagesDbImpl : public MessagesDbSyncInterface {
auto dialog_id = full_message_id.get_dialog_id();
auto message_id = full_message_id.get_message_id();
CHECK(dialog_id.is_valid());
CHECK(message_id.is_valid());
CHECK(message_id.is_valid() || message_id.is_valid_scheduled());
auto &stmt = message_id.is_scheduled() ? get_scheduled_message_stmt_ : get_message_stmt_;
SCOPE_EXIT {
get_message_stmt_.reset();
stmt.reset();
};
get_message_stmt_.bind_int64(1, dialog_id.get()).ensure();
get_message_stmt_.bind_int64(2, message_id.get()).ensure();
get_message_stmt_.step().ensure();
if (!get_message_stmt_.has_row()) {
stmt.bind_int64(1, dialog_id.get()).ensure();
stmt.bind_int64(2, message_id.get()).ensure();
stmt.step().ensure();
if (!stmt.has_row()) {
return Status::Error("Not found");
}
return BufferSlice(get_message_stmt_.view_blob(0));
return BufferSlice(stmt.view_blob(0));
}
Result<std::pair<DialogId, BufferSlice>> get_message_by_unique_message_id(
@ -778,6 +782,7 @@ class MessagesDbImpl : public MessagesDbSyncInterface {
SqliteStatement get_messages_fts_stmt_;
SqliteStatement add_scheduled_message_stmt_;
SqliteStatement get_scheduled_message_stmt_;
SqliteStatement delete_scheduled_message_stmt_;
Result<std::vector<BufferSlice>> get_messages_impl(GetMessagesStmt &stmt, DialogId dialog_id,

17
td/telegram/MessagesManager.cpp
View File

@ -24569,16 +24569,15 @@ MessagesManager::Message *MessagesManager::get_message_force(Dialog *d, MessageI
LOG(INFO) << "Trying to load " << FullMessageId{d->dialog_id, message_id} << " from database from " << source;
if (message_id.is_scheduled()) {
// TODO load scheduled message
return nullptr;
} else {
auto r_value = G()->td_db()->get_messages_db_sync()->get_message({d->dialog_id, message_id});
if (r_value.is_error()) {
return nullptr;
}
return on_get_message_from_database(d->dialog_id, d, r_value.ok(), false, source);
if (message_id.is_scheduled_server()) {
// TODO load scheduled message by server message_id
}
auto r_value = G()->td_db()->get_messages_db_sync()->get_message({d->dialog_id, message_id});
if (r_value.is_error()) {
return nullptr;
}
return on_get_message_from_database(d->dialog_id, d, r_value.ok(), message_id.is_scheduled(), source);
}
MessagesManager::Message *MessagesManager::on_get_message_from_database(DialogId dialog_id, Dialog *d,