Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-01 20:36:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: accept unknown viewtype in ephemeral loop

Browse Source
This commit is contained in:
B. Petersen
2025-10-13 12:59:26 +02:00
committed by bjoern
parent ab9fd3d5ed
commit bee8295daa
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ephemeral.rs
View File

@@ -376,6 +376,10 @@ pub(crate) async fn start_chat_ephemeral_timers(context: &Context, chat_id: Chat
/// `delete_device_after` setting or `ephemeral_timestamp` column. /// `delete_device_after` setting or `ephemeral_timestamp` column.
/// ///
/// For each message a row ID, chat id, viewtype and location ID is returned. /// For each message a row ID, chat id, viewtype and location ID is returned.
///
/// Unknown viewtypes are returned as `Viewtype::Unknown`
/// and not as errors bubbled up, easily resulting in infinite loop or leaving messages undeleted.
/// (Happens when viewtypes are removed or added on another device which was backup/add-second-device source)
async fn select_expired_messages( async fn select_expired_messages(
context: &Context, context: &Context,
now: i64, now: i64,
@@ -395,7 +399,11 @@ WHERE
|row| { |row| {
let id: MsgId = row.get("id")?; let id: MsgId = row.get("id")?;
let chat_id: ChatId = row.get("chat_id")?; let chat_id: ChatId = row.get("chat_id")?;
let viewtype: Viewtype = row.get("type")?; let viewtype: Viewtype = row
.get("type")
.context("Using default viewtype for ephemeral handling.")
.log_err(context)
.unwrap_or_default();
let location_id: u32 = row.get("location_id")?; let location_id: u32 = row.get("location_id")?;
Ok((id, chat_id, viewtype, location_id)) Ok((id, chat_id, viewtype, location_id))
}, },