From f878f0b5eaa44e8ee8d67cbfd706926ff2119113 Mon Sep 17 00:00:00 2001
From: Owen Jacobson <owen@grimoire.ca>
Date: Tue, 1 Oct 2024 23:57:22 -0400
Subject: Organize IDs into top-level namespaces.

(This is part of a larger reorganization.)
---
 src/events/app.rs          |  3 ++-
 src/events/repo/message.rs | 11 ++++-------
 src/events/types.rs        | 11 ++++-------
 3 files changed, 10 insertions(+), 15 deletions(-)

(limited to 'src/events')

diff --git a/src/events/app.rs b/src/events/app.rs
index c15f11e..1fa2f70 100644
--- a/src/events/app.rs
+++ b/src/events/app.rs
@@ -12,9 +12,10 @@ use super::{
     types::{self, ChannelEvent},
 };
 use crate::{
+    channel,
     clock::DateTime,
     repo::{
-        channel::{self, Provider as _},
+        channel::Provider as _,
         error::NotFound as _,
         login::Login,
         sequence::{Provider as _, Sequence},
diff --git a/src/events/repo/message.rs b/src/events/repo/message.rs
index 3237553..00c24b1 100644
--- a/src/events/repo/message.rs
+++ b/src/events/repo/message.rs
@@ -1,14 +1,11 @@
 use sqlx::{sqlite::Sqlite, SqliteConnection, Transaction};
 
 use crate::{
+    channel,
     clock::DateTime,
     events::types,
-    repo::{
-        channel::{self, Channel},
-        login::{self, Login},
-        message::{self, Message},
-        sequence::Sequence,
-    },
+    login, message,
+    repo::{channel::Channel, login::Login, message::Message, sequence::Sequence},
 };
 
 pub trait Provider {
@@ -172,7 +169,7 @@ impl<'c> Events<'c> {
                     created_at: row.channel_created_at,
                     created_sequence: row.channel_created_sequence,
                 },
-                sender: login::Login {
+                sender: Login {
                     id: row.sender_id,
                     name: row.sender_name,
                 },
diff --git a/src/events/types.rs b/src/events/types.rs
index aca3af4..762b6e5 100644
--- a/src/events/types.rs
+++ b/src/events/types.rs
@@ -1,11 +1,8 @@
 use crate::{
+    channel,
     clock::DateTime,
-    repo::{
-        channel::{self, Channel},
-        login::Login,
-        message,
-        sequence::Sequence,
-    },
+    message,
+    repo::{channel::Channel, login::Login, message::Message, sequence::Sequence},
 };
 
 #[derive(Clone, Debug, Eq, PartialEq, serde::Serialize)]
@@ -66,7 +63,7 @@ impl From<CreatedEvent> for ChannelEventData {
 pub struct MessageEvent {
     pub channel: Channel,
     pub sender: Login,
-    pub message: message::Message,
+    pub message: Message,
 }
 
 impl From<MessageEvent> for ChannelEventData {
-- 
cgit v1.2.3