Server: Move submission pagination to submissions mod

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};

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,

src/pagination.rs

@@ -1,7 +1,5 @@
 use uuid::Uuid;
 
-pub mod submission;
-
 #[derive(Debug)]
 pub(crate) enum PageSource {
     NewerThan(Uuid),

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,
 };

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,