summaryrefslogtreecommitdiff
path: root/src/index
diff options
context:
space:
mode:
authorOwen Jacobson <owen@grimoire.ca>2024-09-15 23:50:41 -0400
committerOwen Jacobson <owen@grimoire.ca>2024-09-16 11:03:22 -0400
commit491cb3eb34d20140aed80dbb9edc39c4db5335d2 (patch)
treee1e2e009f064dc6dfc8c98d2bf97d8d1f7b45615 /src/index
parent99b33023332393e46f5a661901b980b78e6fb133 (diff)
Consolidate most repository types into a repo module.
Having them contained in the individual endpoint groups conveyed an unintended sense that their intended scope was _only_ that endpoint group. It also made most repo-related import paths _quite_ long. This splits up the repos as follows: * "General applicability" repos - those that are only loosely connected to a single task, and are likely to be shared between tasks - go in crate::repo. * Specialized repos - those tightly connected to a specific task - go in the module for that task, under crate::PATH::repo. In both cases, each repo goes in its own submodule, to make it easier to use the module name as a namespace. Which category a repo goes in is a judgment call. `crate::channel::repo::broadcast` (formerly `channel::repo::messages`) is used outside of `crate::channel`, for example, but its main purpose is to support channel message broadcasts. It could arguably live under `crate::event::repo::channel`, but the resulting namespace is less legible to me.
Diffstat (limited to 'src/index')
-rw-r--r--src/index/app.rs4
-rw-r--r--src/index/routes.rs7
-rw-r--r--src/index/templates.rs2
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! {