@@ -191,7 +191,7 @@ class MessagesDbImpl final : public MessagesDbSyncInterface {
191191 db_.get_statement (" DELETE FROM messages WHERE dialog_id = ?1 AND message_id = ?2" ));
192192 TRY_RESULT_ASSIGN (delete_all_dialog_messages_stmt_,
193193 db_.get_statement (" DELETE FROM messages WHERE dialog_id = ?1 AND message_id <= ?2" ));
194- TRY_RESULT_ASSIGN (delete_dialog_messages_from_user_stmt_ ,
194+ TRY_RESULT_ASSIGN (delete_dialog_messages_by_sender_stmt_ ,
195195 db_.get_statement (" DELETE FROM messages WHERE dialog_id = ?1 AND sender_user_id == ?2" ));
196196
197197 TRY_RESULT_ASSIGN (
@@ -292,7 +292,7 @@ class MessagesDbImpl final : public MessagesDbSyncInterface {
292292 return Status::OK ();
293293 }
294294
295- Status add_message (FullMessageId full_message_id, ServerMessageId unique_message_id, UserId sender_user_id ,
295+ Status add_message (FullMessageId full_message_id, ServerMessageId unique_message_id, DialogId sender_dialog_id ,
296296 int64 random_id, int32 ttl_expires_at, int32 index_mask, int64 search_id, string text,
297297 NotificationId notification_id, MessageId top_thread_message_id, BufferSlice data) final {
298298 LOG (INFO ) << " Add " << full_message_id << " to database" ;
@@ -312,8 +312,8 @@ class MessagesDbImpl final : public MessagesDbSyncInterface {
312312 add_message_stmt_.bind_null (3 ).ensure ();
313313 }
314314
315- if (sender_user_id .is_valid ()) {
316- add_message_stmt_.bind_int64 (4 , sender_user_id .get ()).ensure ();
315+ if (sender_dialog_id .is_valid ()) {
316+ add_message_stmt_.bind_int64 (4 , sender_dialog_id .get ()).ensure ();
317317 } else {
318318 add_message_stmt_.bind_null (4 ).ensure ();
319319 }
@@ -438,16 +438,16 @@ class MessagesDbImpl final : public MessagesDbSyncInterface {
438438 return status;
439439 }
440440
441- Status delete_dialog_messages_from_user (DialogId dialog_id, UserId sender_user_id ) final {
442- LOG (INFO ) << " Delete all messages in " << dialog_id << " sent by " << sender_user_id << " from database" ;
441+ Status delete_dialog_messages_by_sender (DialogId dialog_id, DialogId sender_dialog_id ) final {
442+ LOG (INFO ) << " Delete all messages in " << dialog_id << " sent by " << sender_dialog_id << " from database" ;
443443 CHECK (dialog_id.is_valid ());
444- CHECK (sender_user_id .is_valid ());
444+ CHECK (sender_dialog_id .is_valid ());
445445 SCOPE_EXIT {
446- delete_dialog_messages_from_user_stmt_ .reset ();
446+ delete_dialog_messages_by_sender_stmt_ .reset ();
447447 };
448- delete_dialog_messages_from_user_stmt_ .bind_int64 (1 , dialog_id.get ()).ensure ();
449- delete_dialog_messages_from_user_stmt_ .bind_int64 (2 , sender_user_id .get ()).ensure ();
450- delete_dialog_messages_from_user_stmt_ .step ().ensure ();
448+ delete_dialog_messages_by_sender_stmt_ .bind_int64 (1 , dialog_id.get ()).ensure ();
449+ delete_dialog_messages_by_sender_stmt_ .bind_int64 (2 , sender_dialog_id .get ()).ensure ();
450+ delete_dialog_messages_by_sender_stmt_ .step ().ensure ();
451451 return Status::OK ();
452452 }
453453
@@ -857,7 +857,7 @@ class MessagesDbImpl final : public MessagesDbSyncInterface {
857857
858858 SqliteStatement delete_message_stmt_;
859859 SqliteStatement delete_all_dialog_messages_stmt_;
860- SqliteStatement delete_dialog_messages_from_user_stmt_ ;
860+ SqliteStatement delete_dialog_messages_by_sender_stmt_ ;
861861
862862 SqliteStatement get_message_stmt_;
863863 SqliteStatement get_message_by_random_id_stmt_;
@@ -1017,11 +1017,11 @@ class MessagesDbAsync final : public MessagesDbAsyncInterface {
10171017 impl_ = create_actor_on_scheduler<Impl>(" MessagesDbActor" , scheduler_id, std::move (sync_db));
10181018 }
10191019
1020- void add_message (FullMessageId full_message_id, ServerMessageId unique_message_id, UserId sender_user_id ,
1020+ void add_message (FullMessageId full_message_id, ServerMessageId unique_message_id, DialogId sender_dialog_id ,
10211021 int64 random_id, int32 ttl_expires_at, int32 index_mask, int64 search_id, string text,
10221022 NotificationId notification_id, MessageId top_thread_message_id, BufferSlice data,
10231023 Promise<> promise) final {
1024- send_closure_later (impl_, &Impl::add_message, full_message_id, unique_message_id, sender_user_id , random_id,
1024+ send_closure_later (impl_, &Impl::add_message, full_message_id, unique_message_id, sender_dialog_id , random_id,
10251025 ttl_expires_at, index_mask, search_id, std::move (text), notification_id, top_thread_message_id,
10261026 std::move (data), std::move (promise));
10271027 }
@@ -1035,8 +1035,8 @@ class MessagesDbAsync final : public MessagesDbAsyncInterface {
10351035 void delete_all_dialog_messages (DialogId dialog_id, MessageId from_message_id, Promise<> promise) final {
10361036 send_closure_later (impl_, &Impl::delete_all_dialog_messages, dialog_id, from_message_id, std::move (promise));
10371037 }
1038- void delete_dialog_messages_from_user (DialogId dialog_id, UserId sender_user_id , Promise<> promise) final {
1039- send_closure_later (impl_, &Impl::delete_dialog_messages_from_user , dialog_id, sender_user_id , std::move (promise));
1038+ void delete_dialog_messages_by_sender (DialogId dialog_id, DialogId sender_dialog_id , Promise<> promise) final {
1039+ send_closure_later (impl_, &Impl::delete_dialog_messages_by_sender , dialog_id, sender_dialog_id , std::move (promise));
10401040 }
10411041
10421042 void get_message (FullMessageId full_message_id, Promise<MessagesDbDialogMessage> promise) final {
@@ -1098,15 +1098,15 @@ class MessagesDbAsync final : public MessagesDbAsyncInterface {
10981098 public:
10991099 explicit Impl (std::shared_ptr<MessagesDbSyncSafeInterface> sync_db_safe) : sync_db_safe_(std::move(sync_db_safe)) {
11001100 }
1101- void add_message (FullMessageId full_message_id, ServerMessageId unique_message_id, UserId sender_user_id ,
1101+ void add_message (FullMessageId full_message_id, ServerMessageId unique_message_id, DialogId sender_dialog_id ,
11021102 int64 random_id, int32 ttl_expires_at, int32 index_mask, int64 search_id, string text,
11031103 NotificationId notification_id, MessageId top_thread_message_id, BufferSlice data,
11041104 Promise<> promise) {
1105- add_write_query ([this , full_message_id, unique_message_id, sender_user_id , random_id, ttl_expires_at, index_mask ,
1106- search_id, text = std::move (text), notification_id, top_thread_message_id,
1105+ add_write_query ([this , full_message_id, unique_message_id, sender_dialog_id , random_id, ttl_expires_at,
1106+ index_mask, search_id, text = std::move (text), notification_id, top_thread_message_id,
11071107 data = std::move (data), promise = std::move (promise)](Unit) mutable {
11081108 on_write_result (std::move (promise),
1109- sync_db_->add_message (full_message_id, unique_message_id, sender_user_id , random_id,
1109+ sync_db_->add_message (full_message_id, unique_message_id, sender_dialog_id , random_id,
11101110 ttl_expires_at, index_mask, search_id, std::move (text), notification_id,
11111111 top_thread_message_id, std::move (data)));
11121112 });
@@ -1131,9 +1131,9 @@ class MessagesDbAsync final : public MessagesDbAsyncInterface {
11311131 add_read_query ();
11321132 promise.set_result (sync_db_->delete_all_dialog_messages (dialog_id, from_message_id));
11331133 }
1134- void delete_dialog_messages_from_user (DialogId dialog_id, UserId sender_user_id , Promise<> promise) {
1134+ void delete_dialog_messages_by_sender (DialogId dialog_id, DialogId sender_dialog_id , Promise<> promise) {
11351135 add_read_query ();
1136- promise.set_result (sync_db_->delete_dialog_messages_from_user (dialog_id, sender_user_id ));
1136+ promise.set_result (sync_db_->delete_dialog_messages_by_sender (dialog_id, sender_dialog_id ));
11371137 }
11381138
11391139 void get_message (FullMessageId full_message_id, Promise<MessagesDbDialogMessage> promise) {
0 commit comments