1 files changed, 26 insertions, 0 deletions
diff --git a/src/event/app.rs b/src/event/app.rs
index 8fa760a..e422de9 100644
--- a/src/event/app.rs
+++ b/src/event/app.rs
@@ -8,9 +8,12 @@ use sqlx::sqlite::SqlitePool;
 use super::{Event, Sequence, Sequenced, broadcaster::Broadcaster};
 use crate::{
     conversation::{self, repo::Provider as _},
+    db::NotFound,
     message::{self, repo::Provider as _},
     name,
     user::{self, repo::Provider as _},
+    vapid,
+    vapid::repo::Provider as _,
 };
 
 pub struct Events {
@@ -57,9 +60,17 @@ impl Events {
             .filter(Sequence::after(resume_at))
             .map(Event::from);
 
+        let vapid = tx.vapid().current().await.optional()?;
+        let vapid_events = vapid
+            .iter()
+            .flat_map(vapid::History::events)
+            .filter(Sequence::after(resume_at))
+            .map(Event::from);
+
         let replay_events = user_events
             .merge_by(conversation_events, Sequence::merge)
             .merge_by(message_events, Sequence::merge)
+            .merge_by(vapid_events, Sequence::merge)
             .collect::<Vec<_>>();
         let resume_live_at = replay_events.last().map_or(resume_at, Sequenced::sequence);
 
@@ -86,6 +97,9 @@ impl Events {
 pub enum Error {
     Database(#[from] sqlx::Error),
     Name(#[from] name::Error),
+    Ecdsa(#[from] p256::ecdsa::Error),
+    Pkcs8(#[from] p256::pkcs8::Error),
+    WebPush(#[from] web_push::WebPushError),
 }
 
 impl From<user::repo::LoadError> for Error {
@@ -107,3 +121,15 @@ impl From<conversation::repo::LoadError> for Error {
         }
     }
 }
+
+impl From<vapid::repo::Error> for Error {
+    fn from(error: vapid::repo::Error) -> Self {
+        use vapid::repo::Error;
+        match error {
+            Error::Database(error) => error.into(),
+            Error::Ecdsa(error) => error.into(),
+            Error::Pkcs8(error) => error.into(),
+            Error::WebPush(error) => error.into(),
+        }
+    }
+}