grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove unused db view options (#3787)

Browse source 
* Remove unused db view options

* fix tests

* ci
This commit is contained in:
Nutomic 2023-08-04 17:36:36 +02:00 committed by GitHub
parent 2bb24c2859
commit 66ac8100d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
crates/apub/src/api/read_person.rs
View file

@ -65,7 +65,7 @@ pub async fn read_person(
saved_only, saved_only,
local_user: local_user_view.as_ref(), local_user: local_user_view.as_ref(),
community_id, community_id,
is_profile_view: Some(true), is_profile_view: true,
page, page,
limit, limit,
creator_id, creator_id,
@ -75,14 +75,13 @@ pub async fn read_person(
.await?; .await?;
let comments = CommentQuery { let comments = CommentQuery {
local_user: (local_user_view.as_ref()), local_user: local_user_view.as_ref(),
sort: (sort.map(post_to_comment_sort_type)), sort: sort.map(post_to_comment_sort_type),
saved_only: (saved_only), saved_only,
show_deleted_and_removed: (Some(false)), community_id,
community_id: (community_id), is_profile_view: true,
is_profile_view: Some(true), page,
page: (page), limit,
limit: (limit),
creator_id, creator_id,
..Default::default() ..Default::default()
} }

6
crates/db_views/src/comment_view.rs
View file

@ -195,7 +195,6 @@ fn queries<'a>() -> Queries<
query = query.filter(comment_saved::comment_id.is_not_null()); query = query.filter(comment_saved::comment_id.is_not_null());
} }
let is_profile_view = options.is_profile_view.unwrap_or(false);
let is_creator = options.creator_id == options.local_user.map(|l| l.person.id); let is_creator = options.creator_id == options.local_user.map(|l| l.person.id);
// only show deleted comments to creator // only show deleted comments to creator
if !is_creator { if !is_creator {
@ -204,7 +203,7 @@ fn queries<'a>() -> Queries<
let is_admin = options.local_user.map(|l| l.person.admin).unwrap_or(false); let is_admin = options.local_user.map(|l| l.person.admin).unwrap_or(false);
// only show removed comments to admin when viewing user profile // only show removed comments to admin when viewing user profile
if !(is_profile_view && is_admin) { if !(options.is_profile_view && is_admin) {
query = query.filter(comment::removed.eq(false)); query = query.filter(comment::removed.eq(false));
} }
@ -310,8 +309,7 @@ pub struct CommentQuery<'a> {
pub local_user: Option<&'a LocalUserView>, pub local_user: Option<&'a LocalUserView>,
pub search_term: Option<String>, pub search_term: Option<String>,
pub saved_only: Option<bool>, pub saved_only: Option<bool>,
pub is_profile_view: Option<bool>, pub is_profile_view: bool,
pub show_deleted_and_removed: Option<bool>,
pub page: Option<i64>, pub page: Option<i64>,
pub limit: Option<i64>, pub limit: Option<i64>,
pub max_depth: Option<i32>, pub max_depth: Option<i32>,

7
crates/db_views/src/post_view.rs
View file

@ -212,7 +212,6 @@ fn queries<'a>() -> Queries<
) )
.select(selection); .select(selection);
let is_profile_view = options.is_profile_view.unwrap_or(false);
let is_creator = options.creator_id == options.local_user.map(|l| l.person.id); let is_creator = options.creator_id == options.local_user.map(|l| l.person.id);
// only show deleted posts to creator // only show deleted posts to creator
if is_creator { if is_creator {
@ -223,7 +222,7 @@ fn queries<'a>() -> Queries<
let is_admin = options.local_user.map(|l| l.person.admin).unwrap_or(false); let is_admin = options.local_user.map(|l| l.person.admin).unwrap_or(false);
// only show removed posts to admin when viewing user profile // only show removed posts to admin when viewing user profile
if !(is_profile_view && is_admin) { if !(options.is_profile_view && is_admin) {
query = query query = query
.filter(community::removed.eq(false)) .filter(community::removed.eq(false))
.filter(post::removed.eq(false)); .filter(post::removed.eq(false));
@ -428,7 +427,7 @@ pub struct PostQuery<'a> {
pub url_search: Option<String>, pub url_search: Option<String>,
pub saved_only: Option<bool>, pub saved_only: Option<bool>,
pub moderator_view: Option<bool>, pub moderator_view: Option<bool>,
pub is_profile_view: Option<bool>, pub is_profile_view: bool,
pub page: Option<i64>, pub page: Option<i64>,
pub limit: Option<i64>, pub limit: Option<i64>,
} }
@ -919,7 +918,7 @@ mod tests {
let post_listings_is_admin = PostQuery { let post_listings_is_admin = PostQuery {
sort: Some(SortType::New), sort: Some(SortType::New),
local_user: Some(&data.local_user_view), local_user: Some(&data.local_user_view),
is_profile_view: Some(true), is_profile_view: true,
..Default::default() ..Default::default()
} }
.list(pool) .list(pool)