Server: Move submission pagination to submissions mod
This commit is contained in:
parent
08e6ffe806
commit
8fb89c2f88
|
@ -4,11 +4,9 @@ use crate::{
|
||||||
images::ThumbnailImage,
|
images::ThumbnailImage,
|
||||||
middleware::UserProfile,
|
middleware::UserProfile,
|
||||||
nav::NavState,
|
nav::NavState,
|
||||||
pagination::{
|
pagination::PageSource,
|
||||||
submission::{browse_page, Cache},
|
|
||||||
PageSource,
|
|
||||||
},
|
|
||||||
profiles::SubmissionPage,
|
profiles::SubmissionPage,
|
||||||
|
submissions::pagination::{browse_page, Cache},
|
||||||
ActixLoader, State,
|
ActixLoader, State,
|
||||||
};
|
};
|
||||||
use actix_web::{web, HttpRequest, HttpResponse};
|
use actix_web::{web, HttpRequest, HttpResponse};
|
||||||
|
|
|
@ -163,7 +163,7 @@ fn can_view_logged_out(
|
||||||
None => return Ok(false),
|
None => return Ok(false),
|
||||||
};
|
};
|
||||||
|
|
||||||
if crate::pagination::submission::can_view(
|
if crate::submissions::pagination::can_view(
|
||||||
None,
|
None,
|
||||||
&submission,
|
&submission,
|
||||||
&store.store,
|
&store.store,
|
||||||
|
@ -226,7 +226,7 @@ fn can_view(
|
||||||
None => return Ok(false),
|
None => return Ok(false),
|
||||||
};
|
};
|
||||||
|
|
||||||
if crate::pagination::submission::can_view(
|
if crate::submissions::pagination::can_view(
|
||||||
Some(profile.id()),
|
Some(profile.id()),
|
||||||
&submission,
|
&submission,
|
||||||
&store.store,
|
&store.store,
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
|
|
||||||
pub mod submission;
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub(crate) enum PageSource {
|
pub(crate) enum PageSource {
|
||||||
NewerThan(Uuid),
|
NewerThan(Uuid),
|
|
@ -2,11 +2,9 @@ use crate::{
|
||||||
error::{Error, OptionExt},
|
error::{Error, OptionExt},
|
||||||
extensions::{ProfileExt, SubmissionExt},
|
extensions::{ProfileExt, SubmissionExt},
|
||||||
images::{BannerImage, IconImage},
|
images::{BannerImage, IconImage},
|
||||||
pagination::{
|
pagination::PageSource,
|
||||||
submission::{draft_page, main_page, Cache},
|
|
||||||
PageSource,
|
|
||||||
},
|
|
||||||
profiles::settings::Settings,
|
profiles::settings::Settings,
|
||||||
|
submissions::pagination::{draft_page, main_page, Cache},
|
||||||
views::ProfileView,
|
views::ProfileView,
|
||||||
ActixLoader, State,
|
ActixLoader, State,
|
||||||
};
|
};
|
||||||
|
|
|
@ -21,6 +21,8 @@ use i18n_embed_fl::fl;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
pub(crate) mod pagination;
|
||||||
|
|
||||||
pub(super) fn scope() -> Scope {
|
pub(super) fn scope() -> Scope {
|
||||||
web::scope("/submissions")
|
web::scope("/submissions")
|
||||||
.service(
|
.service(
|
||||||
|
@ -652,7 +654,7 @@ async fn can_view(
|
||||||
let store = state.profiles.clone();
|
let store = state.profiles.clone();
|
||||||
let submission = submission.clone();
|
let submission = submission.clone();
|
||||||
let opt = web::block(move || {
|
let opt = web::block(move || {
|
||||||
Ok(crate::pagination::submission::can_view(
|
Ok(pagination::can_view(
|
||||||
viewer,
|
viewer,
|
||||||
&submission,
|
&submission,
|
||||||
&store.store,
|
&store.store,
|
||||||
|
@ -773,7 +775,7 @@ async fn adjacent_submissions(
|
||||||
.find_map(move |id| {
|
.find_map(move |id| {
|
||||||
let submission = inner_store.store.submissions.by_id(id).ok()??;
|
let submission = inner_store.store.submissions.by_id(id).ok()??;
|
||||||
|
|
||||||
crate::pagination::submission::can_view(
|
pagination::can_view(
|
||||||
viewer,
|
viewer,
|
||||||
&submission,
|
&submission,
|
||||||
&inner_store.store,
|
&inner_store.store,
|
||||||
|
@ -792,7 +794,7 @@ async fn adjacent_submissions(
|
||||||
.find_map(move |id| {
|
.find_map(move |id| {
|
||||||
let submission = store.store.submissions.by_id(id).ok()??;
|
let submission = store.store.submissions.by_id(id).ok()??;
|
||||||
|
|
||||||
crate::pagination::submission::can_view(
|
pagination::can_view(
|
||||||
viewer,
|
viewer,
|
||||||
&submission,
|
&submission,
|
||||||
&store.store,
|
&store.store,
|
||||||
|
@ -814,7 +816,7 @@ async fn adjacent_submissions(
|
||||||
.find_map(move |id| {
|
.find_map(move |id| {
|
||||||
let submission = inner_store.store.submissions.by_id(id).ok()??;
|
let submission = inner_store.store.submissions.by_id(id).ok()??;
|
||||||
|
|
||||||
crate::pagination::submission::can_view(
|
pagination::can_view(
|
||||||
viewer,
|
viewer,
|
||||||
&submission,
|
&submission,
|
||||||
&inner_store.store,
|
&inner_store.store,
|
||||||
|
@ -833,7 +835,7 @@ async fn adjacent_submissions(
|
||||||
.find_map(move |id| {
|
.find_map(move |id| {
|
||||||
let submission = store.store.submissions.by_id(id).ok()??;
|
let submission = store.store.submissions.by_id(id).ok()??;
|
||||||
|
|
||||||
crate::pagination::submission::can_view(
|
pagination::can_view(
|
||||||
viewer,
|
viewer,
|
||||||
&submission,
|
&submission,
|
||||||
&store.store,
|
&store.store,
|
Loading…
Reference in a new issue