use diesel_async::RunQueryDsl;
use lemmy_db_schema::{
aggregates::structs::PostAggregates,
- newtypes::{CommunityId, DbUrl, LocalUserId, PersonId, PostId},
+ newtypes::{CommunityId, LocalUserId, PersonId, PostId},
schema::{
community,
community_block,
post_saved,
},
source::{
- community::{Community, CommunityFollower, CommunityPersonBan, CommunitySafe},
+ community::{Community, CommunityFollower, CommunityPersonBan},
local_user::LocalUser,
- person::{Person, PersonSafe},
+ person::Person,
person_block::PersonBlock,
post::{Post, PostRead, PostSaved},
},
- traits::{ToSafe, ViewToVec},
+ traits::JoinView,
utils::{functions::hot_rank, fuzzy_search, get_conn, limit_and_offset, DbPool},
ListingType,
SortType,
type PostViewTuple = (
Post,
- PersonSafe,
- CommunitySafe,
+ Person,
+ Community,
Option<CommunityPersonBan>,
PostAggregates,
Option<CommunityFollower>,
pool: &DbPool,
post_id: PostId,
my_person_id: Option<PersonId>,
+ is_mod_or_admin: Option<bool>,
) -> Result<Self, Error> {
let conn = &mut get_conn(pool).await?;
// The left join below will return None in this case
let person_id_join = my_person_id.unwrap_or(PersonId(-1));
- let (
- post,
- creator,
- community,
- creator_banned_from_community,
- counts,
- follower,
- saved,
- read,
- creator_blocked,
- post_like,
- unread_comments,
- ) = post::table
+ let mut query = post::table
.find(post_id)
.inner_join(person::table)
.inner_join(community::table)
community_person_ban::table.on(
post::community_id
.eq(community_person_ban::community_id)
- .and(community_person_ban::person_id.eq(post::creator_id))
- .and(
- community_person_ban::expires
- .is_null()
- .or(community_person_ban::expires.gt(now)),
- ),
+ .and(community_person_ban::person_id.eq(post::creator_id)),
),
)
.inner_join(post_aggregates::table)
)
.select((
post::all_columns,
- Person::safe_columns_tuple(),
- Community::safe_columns_tuple(),
+ person::all_columns,
+ community::all_columns,
community_person_ban::all_columns.nullable(),
post_aggregates::all_columns,
community_follower::all_columns.nullable(),
post_aggregates::comments,
),
))
- .first::<PostViewTuple>(conn)
- .await?;
+ .into_boxed();
+
+ // Hide deleted and removed for non-admins or mods
+ if !is_mod_or_admin.unwrap_or(true) {
+ query = query
+ .filter(community::removed.eq(false))
+ .filter(community::deleted.eq(false));
+ }
+
+ let (
+ post,
+ creator,
+ community,
+ creator_banned_from_community,
+ counts,
+ follower,
+ saved,
+ read,
+ creator_blocked,
+ post_like,
+ unread_comments,
+ ) = query.first::<PostViewTuple>(conn).await?;
// If a person is given, then my_vote, if None, should be 0, not null
// Necessary to differentiate between other person's votes
sort: Option<SortType>,
creator_id: Option<PersonId>,
community_id: Option<CommunityId>,
- community_actor_id: Option<DbUrl>,
local_user: Option<&'a LocalUser>,
search_term: Option<String>,
url_search: Option<String>,
saved_only: Option<bool>,
+ /// Used to show deleted or removed posts for admins
+ is_mod_or_admin: Option<bool>,
page: Option<i64>,
limit: Option<i64>,
}
community_person_ban::table.on(
post::community_id
.eq(community_person_ban::community_id)
- .and(community_person_ban::person_id.eq(post::creator_id))
- .and(
- community_person_ban::expires
- .is_null()
- .or(community_person_ban::expires.gt(now)),
- ),
+ .and(community_person_ban::person_id.eq(post::creator_id)),
),
)
.inner_join(post_aggregates::table)
)
.left_join(
community_block::table.on(
- community::id
+ post::community_id
.eq(community_block::community_id)
.and(community_block::person_id.eq(person_id_join)),
),
)
.select((
post::all_columns,
- Person::safe_columns_tuple(),
- Community::safe_columns_tuple(),
+ person::all_columns,
+ community::all_columns,
community_person_ban::all_columns.nullable(),
post_aggregates::all_columns,
community_follower::all_columns.nullable(),
))
.into_boxed();
+ // Hide deleted and removed for non-admins or mods
+ // TODO This eventually needs to show posts where you are the creator
+ if !self.is_mod_or_admin.unwrap_or(true) {
+ query = query
+ .filter(community::removed.eq(false))
+ .filter(community::deleted.eq(false));
+ }
+
+ if self.community_id.is_none() {
+ query = query.then_order_by(post_aggregates::featured_local.desc());
+ } else if let Some(community_id) = self.community_id {
+ query = query
+ .filter(post::community_id.eq(community_id))
+ .then_order_by(post_aggregates::featured_community.desc());
+ }
+
+ if let Some(creator_id) = self.creator_id {
+ query = query.filter(post::creator_id.eq(creator_id));
+ }
+
if let Some(listing_type) = self.listing_type {
match listing_type {
ListingType::Subscribed => {
}
}
}
- if self.community_id.is_none() && self.community_actor_id.is_none() {
- query = query.then_order_by(post_aggregates::featured_local.desc());
- } else if let Some(community_id) = self.community_id {
- query = query
- .filter(post::community_id.eq(community_id))
- .then_order_by(post_aggregates::featured_community.desc());
- } else if let Some(community_actor_id) = self.community_actor_id {
- query = query
- .filter(community::actor_id.eq(community_actor_id))
- .then_order_by(post_aggregates::featured_community.desc());
- }
if let Some(url_search) = self.url_search {
query = query.filter(post::url.eq(url_search));
);
}
- // If its for a specific person, show the removed / deleted
- if let Some(creator_id) = self.creator_id {
- query = query.filter(post::creator_id.eq(creator_id));
- }
-
if !self.local_user.map(|l| l.show_nsfw).unwrap_or(false) {
query = query
.filter(post::nsfw.eq(false))
let (limit, offset) = limit_and_offset(self.page, self.limit)?;
- query = query
- .limit(limit)
- .offset(offset)
- .filter(post::removed.eq(false))
- .filter(post::deleted.eq(false))
- .filter(community::removed.eq(false))
- .filter(community::deleted.eq(false));
+ query = query.limit(limit).offset(offset);
debug!("Post View Query: {:?}", debug_query::<Pg, _>(&query));
let res = query.load::<PostViewTuple>(conn).await?;
- Ok(PostView::from_tuple_to_vec(res))
+ Ok(res.into_iter().map(PostView::from_tuple).collect())
}
}
-impl ViewToVec for PostView {
- type DbTuple = PostViewTuple;
- fn from_tuple_to_vec(items: Vec<Self::DbTuple>) -> Vec<Self> {
- items
- .into_iter()
- .map(|a| Self {
- post: a.0,
- creator: a.1,
- community: a.2,
- creator_banned_from_community: a.3.is_some(),
- counts: a.4,
- subscribed: CommunityFollower::to_subscribed_type(&a.5),
- saved: a.6.is_some(),
- read: a.7.is_some(),
- creator_blocked: a.8.is_some(),
- my_vote: a.9,
- unread_comments: a.10,
- })
- .collect::<Vec<Self>>()
+impl JoinView for PostView {
+ type JoinTuple = PostViewTuple;
+ fn from_tuple(a: Self::JoinTuple) -> Self {
+ Self {
+ post: a.0,
+ creator: a.1,
+ community: a.2,
+ creator_banned_from_community: a.3.is_some(),
+ counts: a.4,
+ subscribed: CommunityFollower::to_subscribed_type(&a.5),
+ saved: a.6.is_some(),
+ read: a.7.is_some(),
+ creator_blocked: a.8.is_some(),
+ my_vote: a.9,
+ unread_comments: a.10,
+ }
}
}
use crate::post_view::{PostQuery, PostView};
use lemmy_db_schema::{
aggregates::structs::PostAggregates,
+ impls::actor_language::UNDETERMINED_ID,
newtypes::LanguageId,
source::{
actor_language::LocalUserLanguage,
- community::{Community, CommunityInsertForm, CommunitySafe},
+ community::{Community, CommunityInsertForm},
community_block::{CommunityBlock, CommunityBlockForm},
instance::Instance,
language::Language,
local_user::{LocalUser, LocalUserInsertForm, LocalUserUpdateForm},
- person::{Person, PersonInsertForm, PersonSafe},
+ person::{Person, PersonInsertForm},
person_block::{PersonBlock, PersonBlockForm},
post::{Post, PostInsertForm, PostLike, PostLikeForm},
},
}
async fn init_data(pool: &DbPool) -> Data {
- let inserted_instance = Instance::create(pool, "my_domain.tld").await.unwrap();
+ let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string())
+ .await
+ .unwrap();
let person_name = "tegan".to_string();
.await
.unwrap();
- let post_listing_single_with_person =
- PostView::read(pool, data.inserted_post.id, Some(data.inserted_person.id))
- .await
- .unwrap();
+ let post_listing_single_with_person = PostView::read(
+ pool,
+ data.inserted_post.id,
+ Some(data.inserted_person.id),
+ None,
+ )
+ .await
+ .unwrap();
let mut expected_post_listing_with_user = expected_post_view(&data, pool).await;
.await
.unwrap();
- let read_post_listing_single_no_person = PostView::read(pool, data.inserted_post.id, None)
- .await
- .unwrap();
+ let read_post_listing_single_no_person =
+ PostView::read(pool, data.inserted_post.id, None, None)
+ .await
+ .unwrap();
let expected_post_listing_no_person = expected_post_view(&data, pool).await;
.await
.unwrap();
- // only one french language post should be returned
- assert_eq!(1, post_listing_french.len());
- assert_eq!(french_id, post_listing_french[0].post.language_id);
+ // only one post in french and one undetermined should be returned
+ assert_eq!(2, post_listing_french.len());
+ assert!(post_listing_french
+ .iter()
+ .any(|p| p.post.language_id == french_id));
- let undetermined_id = Language::read_id_from_code(pool, Some("und"))
- .await
- .unwrap()
- .unwrap();
LocalUserLanguage::update(
pool,
- vec![french_id, undetermined_id],
+ vec![french_id, UNDETERMINED_ID],
data.inserted_local_user.id,
)
.await
// french post and undetermined language post should be returned
assert_eq!(2, post_listings_french_und.len());
assert_eq!(
- undetermined_id,
+ UNDETERMINED_ID,
post_listings_french_und[0].post.language_id
);
assert_eq!(french_id, post_listings_french_und[1].post.language_id);
},
my_vote: None,
unread_comments: 0,
- creator: PersonSafe {
+ creator: Person {
id: inserted_person.id,
name: inserted_person.name.clone(),
display_name: None,
matrix_user_id: None,
ban_expires: None,
instance_id: data.inserted_instance.id,
+ private_key: inserted_person.private_key.clone(),
+ public_key: inserted_person.public_key.clone(),
+ last_refreshed_at: inserted_person.last_refreshed_at,
},
creator_banned_from_community: false,
- community: CommunitySafe {
+ community: Community {
id: inserted_community.id,
name: inserted_community.name.clone(),
icon: None,
posting_restricted_to_mods: false,
published: inserted_community.published,
instance_id: data.inserted_instance.id,
+ private_key: inserted_community.private_key.clone(),
+ public_key: inserted_community.public_key.clone(),
+ last_refreshed_at: inserted_community.last_refreshed_at,
+ followers_url: inserted_community.followers_url.clone(),
+ inbox_url: inserted_community.inbox_url.clone(),
+ shared_inbox_url: inserted_community.shared_inbox_url.clone(),
+ moderators_url: inserted_community.moderators_url.clone(),
+ featured_url: inserted_community.featured_url.clone(),
},
counts: PostAggregates {
id: agg.id,