Merge branch 'main' into wip/mobile

1 files changed, 29 insertions, 1 deletions

diff --git a/src/event/app.rs b/src/event/app.rs
index 951ce25..c754388 100644
--- a/src/event/app.rs
+++ b/src/event/app.rs
@@ -11,6 +11,7 @@ use crate::{
     channel::{self, repo::Provider as _},
     login::{self, repo::Provider as _},
     message::{self, repo::Provider as _},
+    name,
 };
 
 pub struct Events<'a> {
@@ -26,7 +27,7 @@ impl<'a> Events<'a> {
     pub async fn subscribe(
         &self,
         resume_at: impl Into<ResumePoint>,
-    ) -> Result<impl Stream<Item = Event> + std::fmt::Debug, sqlx::Error> {
+    ) -> Result<impl Stream<Item = Event> + std::fmt::Debug, Error> {
         let resume_at = resume_at.into();
         // Subscribe before retrieving, to catch messages broadcast while we're
         // querying the DB. We'll prune out duplicates later.
@@ -81,3 +82,30 @@ impl<'a> Events<'a> {
         move |event| future::ready(filter(event))
     }
 }
+
+#[derive(Debug, thiserror::Error)]
+#[error(transparent)]
+pub enum Error {
+    Database(#[from] sqlx::Error),
+    Name(#[from] name::Error),
+}
+
+impl From<login::repo::LoadError> for Error {
+    fn from(error: login::repo::LoadError) -> Self {
+        use login::repo::LoadError;
+        match error {
+            LoadError::Database(error) => error.into(),
+            LoadError::Name(error) => error.into(),
+        }
+    }
+}
+
+impl From<channel::repo::LoadError> for Error {
+    fn from(error: channel::repo::LoadError) -> Self {
+        use channel::repo::LoadError;
+        match error {
+            LoadError::Database(error) => error.into(),
+            LoadError::Name(error) => error.into(),
+        }
+    }
+}