|
|
|
@ -1,12 +1,6 @@
|
|
|
|
|
use crate::PerformCrud;
|
|
|
|
|
use actix_web::web::Data;
|
|
|
|
|
use lemmy_api_common::{
|
|
|
|
|
blocking,
|
|
|
|
|
get_local_user_view_from_jwt_opt,
|
|
|
|
|
post::*,
|
|
|
|
|
user_show_bot_accounts,
|
|
|
|
|
user_show_nsfw,
|
|
|
|
|
};
|
|
|
|
|
use lemmy_api_common::{blocking, get_local_user_view_from_jwt_opt, mark_post_as_read, post::*};
|
|
|
|
|
use lemmy_db_queries::{from_opt_str_to_opt_enum, ListingType, SortType};
|
|
|
|
|
use lemmy_db_views::{
|
|
|
|
|
comment_view::CommentQueryBuilder,
|
|
|
|
@ -31,8 +25,9 @@ impl PerformCrud for GetPost {
|
|
|
|
|
let data: &GetPost = &self;
|
|
|
|
|
let local_user_view = get_local_user_view_from_jwt_opt(&data.auth, context.pool()).await?;
|
|
|
|
|
|
|
|
|
|
let show_bot_accounts = user_show_bot_accounts(&local_user_view);
|
|
|
|
|
|
|
|
|
|
let show_bot_accounts = local_user_view
|
|
|
|
|
.as_ref()
|
|
|
|
|
.map(|t| t.local_user.show_bot_accounts);
|
|
|
|
|
let person_id = local_user_view.map(|u| u.person.id);
|
|
|
|
|
|
|
|
|
|
let id = data.id;
|
|
|
|
@ -42,6 +37,11 @@ impl PerformCrud for GetPost {
|
|
|
|
|
.await?
|
|
|
|
|
.map_err(|_| ApiError::err("couldnt_find_post"))?;
|
|
|
|
|
|
|
|
|
|
// Mark the post as read
|
|
|
|
|
if let Some(person_id) = person_id {
|
|
|
|
|
mark_post_as_read(person_id, id, context.pool()).await?;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let id = data.id;
|
|
|
|
|
let comments = blocking(context.pool(), move |conn| {
|
|
|
|
|
CommentQueryBuilder::create(conn)
|
|
|
|
@ -97,8 +97,13 @@ impl PerformCrud for GetPosts {
|
|
|
|
|
|
|
|
|
|
let person_id = local_user_view.to_owned().map(|l| l.person.id);
|
|
|
|
|
|
|
|
|
|
let show_nsfw = user_show_nsfw(&local_user_view);
|
|
|
|
|
let show_bot_accounts = user_show_bot_accounts(&local_user_view);
|
|
|
|
|
let show_nsfw = local_user_view.as_ref().map(|t| t.local_user.show_nsfw);
|
|
|
|
|
let show_bot_accounts = local_user_view
|
|
|
|
|
.as_ref()
|
|
|
|
|
.map(|t| t.local_user.show_bot_accounts);
|
|
|
|
|
let show_read_posts = local_user_view
|
|
|
|
|
.as_ref()
|
|
|
|
|
.map(|t| t.local_user.show_read_posts);
|
|
|
|
|
|
|
|
|
|
let sort: Option<SortType> = from_opt_str_to_opt_enum(&data.sort);
|
|
|
|
|
let listing_type: Option<ListingType> = from_opt_str_to_opt_enum(&data.type_);
|
|
|
|
@ -115,6 +120,7 @@ impl PerformCrud for GetPosts {
|
|
|
|
|
.sort(sort)
|
|
|
|
|
.show_nsfw(show_nsfw)
|
|
|
|
|
.show_bot_accounts(show_bot_accounts)
|
|
|
|
|
.show_read_posts(show_read_posts)
|
|
|
|
|
.community_id(community_id)
|
|
|
|
|
.community_name(community_name)
|
|
|
|
|
.saved_only(saved_only)
|
|
|
|
|