use crate::PerformCrud;
use actix_web::web::Data;
-use lemmy_api_common::{blocking, get_local_user_view_from_jwt_opt, mark_post_as_read, post::*};
-use lemmy_apub::{build_actor_id_from_shortname, EndpointType};
-use lemmy_db_queries::{from_opt_str_to_opt_enum, DeleteableOrRemoveable, ListingType, SortType};
+use lemmy_api_common::{
+ blocking,
+ check_private_instance,
+ get_local_user_view_from_jwt_opt,
+ mark_post_as_read,
+ post::*,
+};
+use lemmy_apub::{
+ fetcher::webfinger::webfinger_resolve,
+ objects::community::ApubCommunity,
+ EndpointType,
+};
+use lemmy_db_schema::{
+ from_opt_str_to_opt_enum,
+ traits::DeleteableOrRemoveable,
+ ListingType,
+ SortType,
+};
use lemmy_db_views::{
comment_view::CommentQueryBuilder,
post_view::{PostQueryBuilder, PostView},
community_moderator_view::CommunityModeratorView,
community_view::CommunityView,
};
-use lemmy_utils::{ApiError, ConnectionId, LemmyError};
+use lemmy_utils::{ConnectionId, LemmyError};
use lemmy_websocket::{messages::GetPostUsersOnline, LemmyContext};
#[async_trait::async_trait(?Send)]
impl PerformCrud for GetPost {
type Response = GetPostResponse;
+ #[tracing::instrument(skip(context, _websocket_id))]
async fn perform(
&self,
context: &Data<LemmyContext>,
_websocket_id: Option<ConnectionId>,
) -> Result<GetPostResponse, LemmyError> {
let data: &GetPost = self;
- let local_user_view = get_local_user_view_from_jwt_opt(&data.auth, context.pool()).await?;
+ let local_user_view =
+ get_local_user_view_from_jwt_opt(data.auth.as_ref(), context.pool(), context.secret())
+ .await?;
+
+ check_private_instance(&local_user_view, context.pool()).await?;
let show_bot_accounts = local_user_view
.as_ref()
PostView::read(conn, id, person_id)
})
.await?
- .map_err(|_| ApiError::err("couldnt_find_post"))?;
-
- // Blank out deleted info
- if post_view.post.deleted || post_view.post.removed {
- post_view.post = post_view.post.blank_out_deleted_or_removed_info();
- }
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("couldnt_find_post"))?;
// Mark the post as read
if let Some(person_id) = person_id {
})
.await??;
- // Blank out deleted or removed info
- for cv in comments
- .iter_mut()
- .filter(|cv| cv.comment.deleted || cv.comment.removed)
- {
- cv.comment = cv.to_owned().comment.blank_out_deleted_or_removed_info();
- }
-
- let community_id = post_view.community.id;
- let moderators = blocking(context.pool(), move |conn| {
- CommunityModeratorView::for_community(conn, community_id)
- })
- .await??;
-
// Necessary for the sidebar
+ let community_id = post_view.community.id;
let mut community_view = blocking(context.pool(), move |conn| {
CommunityView::read(conn, community_id, person_id)
})
.await?
- .map_err(|_| ApiError::err("couldnt_find_community"))?;
-
- // Blank out deleted or removed info
- if community_view.community.deleted || community_view.community.removed {
- community_view.community = community_view.community.blank_out_deleted_or_removed_info();
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("couldnt_find_community"))?;
+
+ // Blank out deleted or removed info for non-logged in users
+ if person_id.is_none() {
+ if post_view.post.deleted || post_view.post.removed {
+ post_view.post = post_view.post.blank_out_deleted_or_removed_info();
+ }
+
+ for cv in comments
+ .iter_mut()
+ .filter(|cv| cv.comment.deleted || cv.comment.removed)
+ {
+ cv.comment = cv.to_owned().comment.blank_out_deleted_or_removed_info();
+ }
+ if community_view.community.deleted || community_view.community.removed {
+ community_view.community = community_view.community.blank_out_deleted_or_removed_info();
+ }
}
+ let moderators = blocking(context.pool(), move |conn| {
+ CommunityModeratorView::for_community(conn, community_id)
+ })
+ .await??;
+
let online = context
.chat_server()
.send(GetPostUsersOnline { post_id: data.id })
impl PerformCrud for GetPosts {
type Response = GetPostsResponse;
+ #[tracing::instrument(skip(context, _websocket_id))]
async fn perform(
&self,
context: &Data<LemmyContext>,
_websocket_id: Option<ConnectionId>,
) -> Result<GetPostsResponse, LemmyError> {
let data: &GetPosts = self;
- let local_user_view = get_local_user_view_from_jwt_opt(&data.auth, context.pool()).await?;
+ let local_user_view =
+ get_local_user_view_from_jwt_opt(data.auth.as_ref(), context.pool(), context.secret())
+ .await?;
+
+ check_private_instance(&local_user_view, context.pool()).await?;
let person_id = local_user_view.to_owned().map(|l| l.person.id);
let page = data.page;
let limit = data.limit;
let community_id = data.community_id;
- let community_actor_id = data
- .community_name
- .as_ref()
- .map(|t| build_actor_id_from_shortname(EndpointType::Community, t).ok())
- .unwrap_or(None);
+ let community_actor_id = if let Some(name) = &data.community_name {
+ webfinger_resolve::<ApubCommunity>(name, EndpointType::Community, context, &mut 0)
+ .await
+ .ok()
+ } else {
+ None
+ };
let saved_only = data.saved_only;
let mut posts = blocking(context.pool(), move |conn| {
.list()
})
.await?
- .map_err(|_| ApiError::err("couldnt_get_posts"))?;
-
- // Blank out deleted or removed info
- for pv in posts
- .iter_mut()
- .filter(|p| p.post.deleted || p.post.removed)
- {
- pv.post = pv.to_owned().post.blank_out_deleted_or_removed_info();
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("couldnt_get_posts"))?;
+
+ // Blank out deleted or removed info for non-logged in users
+ if person_id.is_none() {
+ for pv in posts
+ .iter_mut()
+ .filter(|p| p.post.deleted || p.post.removed)
+ {
+ pv.post = pv.to_owned().post.blank_out_deleted_or_removed_info();
+ }
+
+ for pv in posts
+ .iter_mut()
+ .filter(|p| p.community.deleted || p.community.removed)
+ {
+ pv.community = pv.to_owned().community.blank_out_deleted_or_removed_info();
+ }
}
Ok(GetPostsResponse { posts })
projects / lemmy.git / blobdiff