Merge branch 'house-of-failed'

1 files changed, 6 insertions, 4 deletions

diff --git a/src/event/handlers/stream/mod.rs b/src/event/handlers/stream/mod.rs
index 8b89c31..dde4fae 100644
--- a/src/event/handlers/stream/mod.rs
+++ b/src/event/handlers/stream/mod.rs
@@ -10,8 +10,8 @@ use futures::stream::{Stream, StreamExt as _};
 
 use crate::{
     app::App,
-    error::{Internal, Unauthorized},
-    event::{Event, Heartbeat::Heartbeat, Sequence, Sequenced as _, app, extract::LastEventId},
+    error::{Internal, Unauthorized, failed::Failed},
+    event::{Event, Heartbeat::Heartbeat, Sequence, Sequenced as _, extract::LastEventId},
     token::{app::ValidateError, extract::Identity},
 };
 
@@ -71,7 +71,7 @@ impl TryFrom<Event> for sse::Event {
 #[derive(Debug, thiserror::Error)]
 #[error(transparent)]
 pub enum Error {
-    Subscribe(#[from] app::Error),
+    Subscribe(#[from] Failed),
     Validate(#[from] ValidateError),
 }
 
@@ -79,7 +79,9 @@ impl IntoResponse for Error {
     fn into_response(self) -> response::Response {
         match self {
             Self::Validate(ValidateError::InvalidToken) => Unauthorized.into_response(),
-            other => Internal::from(other).into_response(),
+            Self::Validate(ValidateError::Failed(_)) | Self::Subscribe(_) => {
+                Internal::from(self).into_response()
+            }
         }
     }
 }