Fix read marker to calculate on all non-internal messages

squidowl · Sep 23, 2024 · 9208f1d · 9208f1d
1 parent e38c9e2
commit 9208f1d
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/data/src/history/metadata.rs b/data/src/history/metadata.rs
@@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize};
 use tokio::fs;
 
 use crate::history::{dir_path, Error, Kind};
-use crate::{server, Message};
+use crate::{message, server, Message};
 
 #[derive(Debug, Clone, Copy, Default, Deserialize, Serialize)]
 pub struct Metadata {
@@ -20,7 +20,12 @@ pub struct ReadMarker(DateTime<Utc>);
 
 impl ReadMarker {
     pub fn latest(messages: &[Message]) -> Option<Self> {
-        latest_triggers_unread(messages).map(Self)
+        messages
+            .iter()
+            .rev()
+            .find(|message| !matches!(message.target.source(), message::Source::Internal(_)))
+            .map(|message| message.server_time)
+            .map(Self)
     }
 
     pub fn date_time(self) -> DateTime<Utc> {