diff --git a/src/common/instance.rs b/src/common/instance.rs index 9f0f080..577d086 100644 --- a/src/common/instance.rs +++ b/src/common/instance.rs @@ -250,12 +250,14 @@ impl NeoInstance { loop { match source_watch .wait_for(|i| { - i.as_ref() - .is_some_and(|i| i.message.contains(&format!("\"{uid}\""))) + fwatch_tx.borrow().as_ref() != i.as_ref() + && i.as_ref() + .is_some_and(|i| i.message.contains(&format!("\"{uid}\""))) }) .await { Ok(pn) => { + log::debug!("Sending push notification: {:?} about {}", *pn, uid); let _ = fwatch_tx.send_replace(pn.clone()); } Err(e) => { diff --git a/src/common/pushnoti.rs b/src/common/pushnoti.rs index 9ba18fc..67265ca 100644 --- a/src/common/pushnoti.rs +++ b/src/common/pushnoti.rs @@ -23,7 +23,7 @@ pub(crate) struct PushNotiThread { } // The push notification -#[derive(Clone, Eq, PartialEq)] +#[derive(Clone, Eq, PartialEq, Debug)] pub(crate) struct PushNoti { pub(crate) message: String, pub(crate) id: Option,