3 files changed, 7 insertions, 6 deletions
diff --git a/src/index/app.rs b/src/index/app.rs
index fabf35c..41b12fa 100644
--- a/src/index/app.rs
+++ b/src/index/app.rs
@@ -1,8 +1,8 @@
 use sqlx::sqlite::SqlitePool;
 
 use crate::{
-    channel::repo::channels::{Channel, Id as ChannelId, Provider as _},
     error::BoxedError,
+    repo::channel::{self, Channel, Provider as _},
 };
 
 pub struct Index<'a> {
@@ -14,7 +14,7 @@ impl<'a> Index<'a> {
         Self { db }
     }
 
-    pub async fn channel(&self, channel: ChannelId) -> Result<Channel, BoxedError> {
+    pub async fn channel(&self, channel: channel::Id) -> Result<Channel, BoxedError> {
         let mut tx = self.db.begin().await?;
         let channel = tx.channels().by_id(channel).await?;
         tx.commit().await?;
diff --git a/src/index/routes.rs b/src/index/routes.rs
index 2d77e5b..ef46cc1 100644
--- a/src/index/routes.rs
+++ b/src/index/routes.rs
@@ -9,8 +9,9 @@ use maud::Markup;
 
 use super::templates;
 use crate::{
-    app::App, channel::repo::channels::Id as ChannelId, error::InternalError,
-    login::repo::logins::Login,
+    app::App,
+    error::InternalError,
+    repo::{channel, login::Login},
 };
 
 async fn index(State(app): State<App>, login: Option<Login>) -> Result<Markup, InternalError> {
@@ -47,7 +48,7 @@ async fn js(Path(path): Path<String>) -> impl IntoResponse {
 async fn channel(
     State(app): State<App>,
     _: Login,
-    Path(channel): Path<ChannelId>,
+    Path(channel): Path<channel::Id>,
 ) -> Result<Markup, InternalError> {
     let channel = app.index().channel(channel).await?;
     Ok(templates::channel(&channel))
diff --git a/src/index/templates.rs b/src/index/templates.rs
index a69c19a..d56972c 100644
--- a/src/index/templates.rs
+++ b/src/index/templates.rs
@@ -1,6 +1,6 @@
 use maud::{html, Markup, DOCTYPE};
 
-use crate::{channel::repo::channels::Channel, login::repo::logins::Login};
+use crate::repo::{channel::Channel, login::Login};
 
 pub fn authenticated<'c>(login: Login, channels: impl IntoIterator<Item = &'c Channel>) -> Markup {
     html! {