Fix merge mistakes and make the `Vapid` component freestanding.

In 4a91792e023a5877f8ac9b8a352e99c4486d698f, I merged in the app component struct changes, but neglected to notice that the `app.vapid()` method had ended up attached to the wrong impl block during the merge. This fixes that.

I've also carried the change to component structs through, so `Vapid` is now a freestanding component, rather than a view of the `App` struct's internals.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/vapid/app.rs b/src/vapid/app.rs
index b6e1bc5..61523d5 100644
--- a/src/vapid/app.rs
+++ b/src/vapid/app.rs
@@ -8,13 +8,13 @@ use crate::{
     event::{Broadcaster, Sequence, repo::Provider},
 };
 
-pub struct Vapid<'a> {
-    db: &'a SqlitePool,
-    events: &'a Broadcaster,
+pub struct Vapid {
+    db: SqlitePool,
+    events: Broadcaster,
 }
 
-impl<'a> Vapid<'a> {
-    pub const fn new(db: &'a SqlitePool, events: &'a Broadcaster) -> Self {
+impl Vapid {
+    pub const fn new(db: SqlitePool, events: Broadcaster) -> Self {
         Self { db, events }
     }