More reorganizing.

4 files changed, 8 insertions, 13 deletions

diff --git a/src/events/app/events.rs b/src/events/app.rs
index 8b76994..7229551 100644
--- a/src/events/app/events.rs
+++ b/src/events/app.rs
@@ -6,13 +6,12 @@ use futures::{
 };
 use sqlx::sqlite::SqlitePool;
 
-use super::Broadcaster;
+use super::{
+    broadcaster::Broadcaster,
+    repo::broadcast::{self, Provider as _},
+};
 use crate::{
     clock::DateTime,
-    events::{
-        app::EventsError,
-        repo::broadcast::{self, Provider as _},
-    },
     repo::{
         channel::{self, Provider as _},
         error::NotFound as _,
@@ -36,7 +35,7 @@ impl<'a> Events<'a> {
         channel: &channel::Id,
         body: &str,
         sent_at: &DateTime,
-    ) -> Result<broadcast::Message, Error> {
+    ) -> Result<broadcast::Message, EventsError> {
         let mut tx = self.db.begin().await?;
         let channel = tx
             .channels()
@@ -58,7 +57,7 @@ impl<'a> Events<'a> {
         channel: &channel::Id,
         subscribed_at: &DateTime,
         resume_at: Option<broadcast::Sequence>,
-    ) -> Result<impl Stream<Item = broadcast::Message> + std::fmt::Debug, Error> {
+    ) -> Result<impl Stream<Item = broadcast::Message> + std::fmt::Debug, EventsError> {
         // Somewhat arbitrarily, expire after 90 days.
         let expire_at = subscribed_at.to_owned() - TimeDelta::days(90);
 
@@ -133,7 +132,7 @@ impl<'a> Events<'a> {
 }
 
 #[derive(Debug, thiserror::Error)]
-pub enum Error {
+pub enum EventsError {
     #[error("channel {0} not found")]
     ChannelNotFound(channel::Id),
     #[error(transparent)]
diff --git a/src/events/app/mod.rs b/src/events/app/mod.rs
deleted file mode 100644
index f364e00..0000000
--- a/src/events/app/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-mod broadcaster;
-mod events;
-
-pub use self::broadcaster::Broadcaster;
-pub use self::events::{Error as EventsError, Events};
diff --git a/src/events/app/broadcaster.rs b/src/events/broadcaster.rs
index 6a1219a..6a1219a 100644
--- a/src/events/app/broadcaster.rs
+++ b/src/events/broadcaster.rs
diff --git a/src/events/mod.rs b/src/events/mod.rs
index e76d67c..b9f3f5b 100644
--- a/src/events/mod.rs
+++ b/src/events/mod.rs
@@ -1,4 +1,5 @@
 pub mod app;
+pub mod broadcaster;
 mod extract;
 pub mod repo;
 mod routes;