Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-10-02 03:00:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: turn DC_CHAT_ID_* into ChatId::* associated constants

Browse Source 
We already have it done for ContactId.
This commit is contained in:
link2xt
2026-08-22 20:21:20 +00:00
committed by l
parent 0b2ff5d0e2
commit fe25e93d6c
19 changed files with 98 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ephemeral.rs
+5 -6
View File
@@ -74,7 +74,6 @@ use tokio::time::timeout;
use crate::chat::{ChatId, ChatIdBlocked, send_msg};
use crate::config::Config;
use crate::constants::{DC_CHAT_ID_LAST_SPECIAL, DC_CHAT_ID_TRASH};
use crate::contact::ContactId;
use crate::context::Context;
use crate::download::DownloadState;
@@ -384,7 +383,7 @@ WHERE
AND ephemeral_timestamp <= ?
AND chat_id != ?
"#,
(now, DC_CHAT_ID_TRASH),
(now, ChatId::TRASH),
|row| {
let id: MsgId = row.get("id")?;
let chat_id: ChatId = row.get("chat_id")?;
@@ -426,7 +425,7 @@ WHERE
"#,
(
threshold_timestamp,
DC_CHAT_ID_LAST_SPECIAL,
ChatId::LAST_SPECIAL,
self_chat_id,
device_chat_id,
),
@@ -480,7 +479,7 @@ SELECT ?1, rfc724_mid, pre_rfc724_mid, timestamp, ? FROM msgs WHERE id=?1
let mut del_location_stmt =
transaction.prepare("DELETE FROM locations WHERE independent=1 AND id=?")?;
for (msg_id, chat_id, viewtype, location_id) in rows {
del_msg_stmt.execute((msg_id, DC_CHAT_ID_TRASH))?;
del_msg_stmt.execute((msg_id, ChatId::TRASH))?;
if location_id > 0 {
del_location_stmt.execute((location_id,))?;
}
@@ -537,7 +536,7 @@ async fn next_delete_device_after_timestamp(context: &Context) -> Result<Option<
AND chat_id != ?
HAVING count(*) > 0
"#,
(DC_CHAT_ID_TRASH, self_chat_id, device_chat_id),
(ChatId::TRASH, self_chat_id, device_chat_id),
)
.await?;
@@ -562,7 +561,7 @@ async fn next_expiration_timestamp(context: &Context) -> Option<i64> {
AND chat_id != ?
HAVING count(*) > 0
"#,
(DC_CHAT_ID_TRASH,), // Trash contains already deleted messages, skip them
(ChatId::TRASH,), // Trash contains already deleted messages, skip them
)
.await
{