diff --git a/src/browse.rs b/src/browse.rs index b6165a4..937152b 100644 --- a/src/browse.rs +++ b/src/browse.rs @@ -4,11 +4,9 @@ use crate::{ images::ThumbnailImage, middleware::UserProfile, nav::NavState, - pagination::{ - submission::{browse_page, Cache}, - PageSource, - }, + pagination::PageSource, profiles::SubmissionPage, + submissions::pagination::{browse_page, Cache}, ActixLoader, State, }; use actix_web::{web, HttpRequest, HttpResponse}; diff --git a/src/comments/mod.rs b/src/comments/mod.rs index ed69472..2a22106 100644 --- a/src/comments/mod.rs +++ b/src/comments/mod.rs @@ -163,7 +163,7 @@ fn can_view_logged_out( None => return Ok(false), }; - if crate::pagination::submission::can_view( + if crate::submissions::pagination::can_view( None, &submission, &store.store, @@ -226,7 +226,7 @@ fn can_view( None => return Ok(false), }; - if crate::pagination::submission::can_view( + if crate::submissions::pagination::can_view( Some(profile.id()), &submission, &store.store, diff --git a/src/pagination/mod.rs b/src/pagination.rs similarity index 99% rename from src/pagination/mod.rs rename to src/pagination.rs index 9f06b86..1d41b57 100644 --- a/src/pagination/mod.rs +++ b/src/pagination.rs @@ -1,7 +1,5 @@ use uuid::Uuid; -pub mod submission; - #[derive(Debug)] pub(crate) enum PageSource { NewerThan(Uuid), diff --git a/src/profiles/state.rs b/src/profiles/state.rs index 8142cff..d4053dd 100644 --- a/src/profiles/state.rs +++ b/src/profiles/state.rs @@ -2,11 +2,9 @@ use crate::{ error::{Error, OptionExt}, extensions::{ProfileExt, SubmissionExt}, images::{BannerImage, IconImage}, - pagination::{ - submission::{draft_page, main_page, Cache}, - PageSource, - }, + pagination::PageSource, profiles::settings::Settings, + submissions::pagination::{draft_page, main_page, Cache}, views::ProfileView, ActixLoader, State, }; diff --git a/src/submissions.rs b/src/submissions/mod.rs similarity index 99% rename from src/submissions.rs rename to src/submissions/mod.rs index 4d7d89e..4bc8f83 100644 --- a/src/submissions.rs +++ b/src/submissions/mod.rs @@ -21,6 +21,8 @@ use i18n_embed_fl::fl; use std::collections::HashMap; use uuid::Uuid; +pub(crate) mod pagination; + pub(super) fn scope() -> Scope { web::scope("/submissions") .service( @@ -652,7 +654,7 @@ async fn can_view( let store = state.profiles.clone(); let submission = submission.clone(); let opt = web::block(move || { - Ok(crate::pagination::submission::can_view( + Ok(pagination::can_view( viewer, &submission, &store.store, @@ -773,7 +775,7 @@ async fn adjacent_submissions( .find_map(move |id| { let submission = inner_store.store.submissions.by_id(id).ok()??; - crate::pagination::submission::can_view( + pagination::can_view( viewer, &submission, &inner_store.store, @@ -792,7 +794,7 @@ async fn adjacent_submissions( .find_map(move |id| { let submission = store.store.submissions.by_id(id).ok()??; - crate::pagination::submission::can_view( + pagination::can_view( viewer, &submission, &store.store, @@ -814,7 +816,7 @@ async fn adjacent_submissions( .find_map(move |id| { let submission = inner_store.store.submissions.by_id(id).ok()??; - crate::pagination::submission::can_view( + pagination::can_view( viewer, &submission, &inner_store.store, @@ -833,7 +835,7 @@ async fn adjacent_submissions( .find_map(move |id| { let submission = store.store.submissions.by_id(id).ok()??; - crate::pagination::submission::can_view( + pagination::can_view( viewer, &submission, &store.store, diff --git a/src/pagination/submission.rs b/src/submissions/pagination.rs similarity index 100% rename from src/pagination/submission.rs rename to src/submissions/pagination.rs