diff options
Diffstat (limited to 'src/events.rs')
| -rw-r--r-- | src/events.rs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/events.rs b/src/events.rs index 51f06b4..38d53fc 100644 --- a/src/events.rs +++ b/src/events.rs @@ -17,10 +17,9 @@ use futures::{ use crate::{ app::App, - channel::repo::{channels::Id as ChannelId, messages::BroadcastMessage}, - error::BoxedError, - error::InternalError, - login::repo::logins::Login, + channel::repo::broadcast, + error::{BoxedError, InternalError}, + repo::{channel, login::Login}, }; pub fn router() -> Router<App> { @@ -30,7 +29,7 @@ pub fn router() -> Router<App> { #[derive(serde::Deserialize)] struct EventsQuery { #[serde(default, rename = "channel")] - channels: Vec<ChannelId>, + channels: Vec<channel::Id>, } async fn on_events( @@ -71,7 +70,7 @@ async fn on_events( Ok(sse) } -fn to_sse_event(event: ChannelEvent<BroadcastMessage>) -> Result<sse::Event, BoxedError> { +fn to_sse_event(event: ChannelEvent<broadcast::Message>) -> Result<sse::Event, BoxedError> { let data = serde_json::to_string(&event)?; let event = sse::Event::default() .id(event @@ -85,7 +84,7 @@ fn to_sse_event(event: ChannelEvent<BroadcastMessage>) -> Result<sse::Event, Box #[derive(serde::Serialize)] struct ChannelEvent<M> { - channel: ChannelId, + channel: channel::Id, #[serde(flatten)] message: M, } |