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

if possible, set chat_id in DC_EVENT_MSGS_NOTICED even emitted by dc_markseen_msgs()

Browse Source
This commit is contained in:
B. Petersen
2020-09-24 00:27:40 +02:00
parent 12bc364e42
commit 5c1b69c3c5
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/message.rs
View File

@@ -1226,6 +1226,7 @@ pub async fn markseen_msgs(context: &Context, msg_ids: Vec<MsgId>) -> bool {
.with_conn(move |conn| { .with_conn(move |conn| {
let mut stmt = conn.prepare_cached(concat!( let mut stmt = conn.prepare_cached(concat!(
"SELECT", "SELECT",
" m.chat_id AS chat_id,",
" m.state AS state,", " m.state AS state,",
" c.blocked AS blocked", " c.blocked AS blocked",
" FROM msgs m LEFT JOIN chats c ON c.id=m.chat_id", " FROM msgs m LEFT JOIN chats c ON c.id=m.chat_id",
@@ -1236,6 +1237,7 @@ pub async fn markseen_msgs(context: &Context, msg_ids: Vec<MsgId>) -> bool {
for id in msg_ids.into_iter() { for id in msg_ids.into_iter() {
let query_res = stmt.query_row(paramsv![id], |row| { let query_res = stmt.query_row(paramsv![id], |row| {
Ok(( Ok((
row.get::<_, ChatId>("chat_id")?,
row.get::<_, MessageState>("state")?, row.get::<_, MessageState>("state")?,
row.get::<_, Option<Blocked>>("blocked")? row.get::<_, Option<Blocked>>("blocked")?
.unwrap_or_default(), .unwrap_or_default(),
@@ -1244,8 +1246,8 @@ pub async fn markseen_msgs(context: &Context, msg_ids: Vec<MsgId>) -> bool {
if let Err(rusqlite::Error::QueryReturnedNoRows) = query_res { if let Err(rusqlite::Error::QueryReturnedNoRows) = query_res {
continue; continue;
} }
let (state, blocked) = query_res.map_err(Into::<anyhow::Error>::into)?; let (chat_id, state, blocked) = query_res.map_err(Into::<anyhow::Error>::into)?;
msgs.push((id, state, blocked)); msgs.push((id, chat_id, state, blocked));
} }
Ok(msgs) Ok(msgs)
@@ -1254,8 +1256,10 @@ pub async fn markseen_msgs(context: &Context, msg_ids: Vec<MsgId>) -> bool {
.unwrap_or_default(); .unwrap_or_default();
let mut send_event = false; let mut send_event = false;
let mut last_chat_id = ChatId::new(0);
let mut chat_ids_are_unique = true;
for (id, curr_state, curr_blocked) in msgs.into_iter() { for (id, curr_chat_id, curr_state, curr_blocked) in msgs.into_iter() {
if let Err(err) = id.start_ephemeral_timer(context).await { if let Err(err) = id.start_ephemeral_timer(context).await {
error!( error!(
context, context,
@@ -1280,10 +1284,22 @@ pub async fn markseen_msgs(context: &Context, msg_ids: Vec<MsgId>) -> bool {
update_msg_state(context, id, MessageState::InNoticed).await; update_msg_state(context, id, MessageState::InNoticed).await;
send_event = true; send_event = true;
} }
if last_chat_id.is_unset() {
last_chat_id = curr_chat_id;
} else if last_chat_id != curr_chat_id {
chat_ids_are_unique = false;
}
} }
if send_event { if send_event {
context.emit_event(EventType::MsgsNoticed(ChatId::new(0))); context.emit_event(EventType::MsgsNoticed(
if chat_ids_are_unique && !last_chat_id.is_unset() {
last_chat_id
} else {
ChatId::new(0)
},
));
} }
true true