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

fix: delete POI location when disappearing message expires

Browse Source
This commit is contained in:
link2xt
2024-04-29 14:12:27 +00:00
parent adb2e4ea32
commit 13802bab42
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/ephemeral.rs
View File

@@ -349,16 +349,16 @@ pub(crate) async fn start_ephemeral_timers_msgids(
/// Selects messages which are expired according to /// Selects messages which are expired according to
/// `delete_device_after` setting or `ephemeral_timestamp` column. /// `delete_device_after` setting or `ephemeral_timestamp` column.
/// ///
/// For each message a row ID, chat id and viewtype is returned. /// For each message a row ID, chat id, viewtype and location ID is returned.
async fn select_expired_messages( async fn select_expired_messages(
context: &Context, context: &Context,
now: i64, now: i64,
) -> Result<Vec<(MsgId, ChatId, Viewtype)>> { ) -> Result<Vec<(MsgId, ChatId, Viewtype, u32)>> {
let mut rows = context let mut rows = context
.sql .sql
.query_map( .query_map(
r#" r#"
SELECT id, chat_id, type SELECT id, chat_id, type, location_id
FROM msgs FROM msgs
WHERE WHERE
ephemeral_timestamp != 0 ephemeral_timestamp != 0
@@ -370,7 +370,8 @@ WHERE
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")?;
Ok((id, chat_id, viewtype)) let location_id: u32 = row.get("location_id")?;
Ok((id, chat_id, viewtype, location_id))
}, },
|rows| rows.collect::<Result<Vec<_>, _>>().map_err(Into::into), |rows| rows.collect::<Result<Vec<_>, _>>().map_err(Into::into),
) )
@@ -390,7 +391,7 @@ WHERE
.sql .sql
.query_map( .query_map(
r#" r#"
SELECT id, chat_id, type SELECT id, chat_id, type, location_id
FROM msgs FROM msgs
WHERE WHERE
timestamp < ?1 timestamp < ?1
@@ -409,7 +410,8 @@ WHERE
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")?;
Ok((id, chat_id, viewtype)) let location_id: u32 = row.get("location_id")?;
Ok((id, chat_id, viewtype, location_id))
}, },
|rows| rows.collect::<Result<Vec<_>, _>>().map_err(Into::into), |rows| rows.collect::<Result<Vec<_>, _>>().map_err(Into::into),
) )
@@ -440,7 +442,7 @@ pub(crate) async fn delete_expired_messages(context: &Context, now: i64) -> Resu
// If you change which information is removed here, also change MsgId::trash() and // If you change which information is removed here, also change MsgId::trash() and
// which information receive_imf::add_parts() still adds to the db if the chat_id is TRASH // which information receive_imf::add_parts() still adds to the db if the chat_id is TRASH
for (msg_id, chat_id, viewtype) in rows { for (msg_id, chat_id, viewtype, location_id) in rows {
transaction.execute( transaction.execute(
"UPDATE msgs "UPDATE msgs
SET chat_id=?, txt='', subject='', txt_raw='', SET chat_id=?, txt='', subject='', txt_raw='',
@@ -449,6 +451,13 @@ pub(crate) async fn delete_expired_messages(context: &Context, now: i64) -> Resu
(DC_CHAT_ID_TRASH, msg_id), (DC_CHAT_ID_TRASH, msg_id),
)?; )?;
if location_id > 0 {
transaction.execute(
"DELETE FROM locations WHERE independent=1 AND id=?",
(location_id,),
)?;
}
msgs_changed.push((chat_id, msg_id)); msgs_changed.push((chat_id, msg_id));
if viewtype == Viewtype::Webxdc { if viewtype == Viewtype::Webxdc {
webxdc_deleted.push(msg_id) webxdc_deleted.push(msg_id)