use crate::{
- api::{claims::Claims, is_mod_or_admin, APIError, Oper, Perform},
+ api::{
+ check_community_ban,
+ get_user_from_jwt,
+ get_user_from_jwt_opt,
+ is_mod_or_admin,
+ APIError,
+ Oper,
+ Perform,
+ },
apub::{ApubLikeableType, ApubObjectType},
blocking,
websocket::{
use lemmy_db::{
comment::*,
comment_view::*,
- community_view::*,
moderator::*,
post::*,
site_view::*,
websocket_info: Option<WebsocketInfo>,
) -> Result<CommentResponse, LemmyError> {
let data: &CreateComment = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
let content_slurs_removed = remove_slurs(&data.content.to_owned());
content: content_slurs_removed,
parent_id: data.parent_id.to_owned(),
post_id: data.post_id,
- creator_id: user_id,
+ creator_id: user.id,
removed: None,
deleted: None,
read: None,
let post_id = data.post_id;
let post = blocking(pool, move |conn| Post::read(conn, post_id)).await??;
- let community_id = post.community_id;
- let is_banned =
- move |conn: &'_ _| CommunityUserBanView::get(conn, user_id, community_id).is_ok();
- if blocking(pool, is_banned).await? {
- return Err(APIError::err("community_ban").into());
- }
-
- // Check for a site ban
- let user = blocking(pool, move |conn| User_::read(&conn, user_id)).await??;
- if user.banned {
- return Err(APIError::err("site_ban").into());
- }
+ check_community_ban(user.id, post.community_id, pool).await?;
// Check if post is locked, no new comments
if post.locked {
let like_form = CommentLikeForm {
comment_id: inserted_comment.id,
post_id: data.post_id,
- user_id,
+ user_id: user.id,
score: 1,
};
updated_comment.send_like(&user, &self.client, pool).await?;
+ let user_id = user.id;
let comment_view = blocking(pool, move |conn| {
CommentView::read(&conn, inserted_comment.id, Some(user_id))
})
websocket_info: Option<WebsocketInfo>,
) -> Result<CommentResponse, LemmyError> {
let data: &EditComment = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
let edit_id = data.edit_id;
let orig_comment =
blocking(pool, move |conn| CommentView::read(&conn, edit_id, None)).await??;
- // Check for a site ban
- let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
- if user.banned {
- return Err(APIError::err("site_ban").into());
- }
-
- // Check for a community ban
- let community_id = orig_comment.community_id;
- let is_banned =
- move |conn: &'_ _| CommunityUserBanView::get(conn, user_id, community_id).is_ok();
- if blocking(pool, is_banned).await? {
- return Err(APIError::err("community_ban").into());
- }
+ check_community_ban(user.id, orig_comment.community_id, pool).await?;
// Verify that only the creator can edit
- if user_id != orig_comment.creator_id {
+ if user.id != orig_comment.creator_id {
return Err(APIError::err("no_comment_edit_allowed").into());
}
send_local_notifs(mentions, updated_comment, &user, post, pool, false).await?;
let edit_id = data.edit_id;
+ let user_id = user.id;
let comment_view = blocking(pool, move |conn| {
CommentView::read(conn, edit_id, Some(user_id))
})
websocket_info: Option<WebsocketInfo>,
) -> Result<CommentResponse, LemmyError> {
let data: &DeleteComment = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
let edit_id = data.edit_id;
let orig_comment =
blocking(pool, move |conn| CommentView::read(&conn, edit_id, None)).await??;
- // Check for a site ban
- let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
- if user.banned {
- return Err(APIError::err("site_ban").into());
- }
-
- // Check for a community ban
- let community_id = orig_comment.community_id;
- let is_banned =
- move |conn: &'_ _| CommunityUserBanView::get(conn, user_id, community_id).is_ok();
- if blocking(pool, is_banned).await? {
- return Err(APIError::err("community_ban").into());
- }
+ check_community_ban(user.id, orig_comment.community_id, pool).await?;
// Verify that only the creator can delete
- if user_id != orig_comment.creator_id {
+ if user.id != orig_comment.creator_id {
return Err(APIError::err("no_comment_edit_allowed").into());
}
// Refetch it
let edit_id = data.edit_id;
+ let user_id = user.id;
let comment_view = blocking(pool, move |conn| {
CommentView::read(conn, edit_id, Some(user_id))
})
websocket_info: Option<WebsocketInfo>,
) -> Result<CommentResponse, LemmyError> {
let data: &RemoveComment = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
let edit_id = data.edit_id;
let orig_comment =
blocking(pool, move |conn| CommentView::read(&conn, edit_id, None)).await??;
- // Check for a site ban
- let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
- if user.banned {
- return Err(APIError::err("site_ban").into());
- }
-
- // Check for a community ban
- let community_id = orig_comment.community_id;
- let is_banned =
- move |conn: &'_ _| CommunityUserBanView::get(conn, user_id, community_id).is_ok();
- if blocking(pool, is_banned).await? {
- return Err(APIError::err("community_ban").into());
- }
+ check_community_ban(user.id, orig_comment.community_id, pool).await?;
// Verify that only a mod or admin can remove
- is_mod_or_admin(pool, user_id, community_id).await?;
+ is_mod_or_admin(pool, user.id, orig_comment.community_id).await?;
// Do the remove
let removed = data.removed;
// Mod tables
let form = ModRemoveCommentForm {
- mod_user_id: user_id,
+ mod_user_id: user.id,
comment_id: data.edit_id,
removed: Some(removed),
reason: data.reason.to_owned(),
// Refetch it
let edit_id = data.edit_id;
+ let user_id = user.id;
let comment_view = blocking(pool, move |conn| {
CommentView::read(conn, edit_id, Some(user_id))
})
_websocket_info: Option<WebsocketInfo>,
) -> Result<CommentResponse, LemmyError> {
let data: &MarkCommentAsRead = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
let edit_id = data.edit_id;
let orig_comment =
blocking(pool, move |conn| CommentView::read(&conn, edit_id, None)).await??;
- // Check for a site ban
- let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
- if user.banned {
- return Err(APIError::err("site_ban").into());
- }
-
- // Check for a community ban
- let community_id = orig_comment.community_id;
- let is_banned =
- move |conn: &'_ _| CommunityUserBanView::get(conn, user_id, community_id).is_ok();
- if blocking(pool, is_banned).await? {
- return Err(APIError::err("community_ban").into());
- }
+ check_community_ban(user.id, orig_comment.community_id, pool).await?;
// Verify that only the recipient can mark as read
// Needs to fetch the parent comment / post to get the recipient
Some(pid) => {
let parent_comment =
blocking(pool, move |conn| CommentView::read(&conn, pid, None)).await??;
- if user_id != parent_comment.creator_id {
+ if user.id != parent_comment.creator_id {
return Err(APIError::err("no_comment_edit_allowed").into());
}
}
None => {
let parent_post_id = orig_comment.post_id;
let parent_post = blocking(pool, move |conn| Post::read(conn, parent_post_id)).await??;
- if user_id != parent_post.creator_id {
+ if user.id != parent_post.creator_id {
return Err(APIError::err("no_comment_edit_allowed").into());
}
}
// Refetch it
let edit_id = data.edit_id;
+ let user_id = user.id;
let comment_view = blocking(pool, move |conn| {
CommentView::read(conn, edit_id, Some(user_id))
})
_websocket_info: Option<WebsocketInfo>,
) -> Result<CommentResponse, LemmyError> {
let data: &SaveComment = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
let comment_saved_form = CommentSavedForm {
comment_id: data.comment_id,
- user_id,
+ user_id: user.id,
};
if data.save {
}
let comment_id = data.comment_id;
+ let user_id = user.id;
let comment_view = blocking(pool, move |conn| {
CommentView::read(conn, comment_id, Some(user_id))
})
websocket_info: Option<WebsocketInfo>,
) -> Result<CommentResponse, LemmyError> {
let data: &CreateCommentLike = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
let mut recipient_ids = Vec::new();
let orig_comment =
blocking(pool, move |conn| CommentView::read(&conn, comment_id, None)).await??;
- // Check for a community ban
let post_id = orig_comment.post_id;
let post = blocking(pool, move |conn| Post::read(conn, post_id)).await??;
- let community_id = post.community_id;
- let is_banned =
- move |conn: &'_ _| CommunityUserBanView::get(conn, user_id, community_id).is_ok();
- if blocking(pool, is_banned).await? {
- return Err(APIError::err("community_ban").into());
- }
-
- // Check for a site ban
- let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
- if user.banned {
- return Err(APIError::err("site_ban").into());
- }
+ check_community_ban(user.id, post.community_id, pool).await?;
let comment_id = data.comment_id;
let comment = blocking(pool, move |conn| Comment::read(conn, comment_id)).await??;
match comment.parent_id {
Some(parent_id) => {
let parent_comment = blocking(pool, move |conn| Comment::read(conn, parent_id)).await??;
- if parent_comment.creator_id != user_id {
+ if parent_comment.creator_id != user.id {
let parent_user = blocking(pool, move |conn| {
User_::read(conn, parent_comment.creator_id)
})
let like_form = CommentLikeForm {
comment_id: data.comment_id,
post_id,
- user_id,
+ user_id: user.id,
score: data.score,
};
// Have to refetch the comment to get the current state
let comment_id = data.comment_id;
+ let user_id = user.id;
let liked_comment = blocking(pool, move |conn| {
CommentView::read(conn, comment_id, Some(user_id))
})
websocket_info: Option<WebsocketInfo>,
) -> Result<GetCommentsResponse, LemmyError> {
let data: &GetComments = &self.data;
-
- let user_claims: Option<Claims> = match &data.auth {
- Some(auth) => match Claims::decode(&auth) {
- Ok(claims) => Some(claims.claims),
- Err(_e) => None,
- },
- None => None,
- };
-
- let user_id = match &user_claims {
- Some(claims) => Some(claims.id),
- None => None,
- };
+ let user = get_user_from_jwt_opt(&data.auth, pool).await?;
+ let user_id = user.map(|u| u.id);
let type_ = ListingType::from_str(&data.type_)?;
let sort = SortType::from_str(&data.sort)?;
use super::*;
use crate::{
- api::{claims::Claims, is_admin, is_mod_or_admin, APIError, Oper, Perform},
+ api::{is_admin, is_mod_or_admin, APIError, Oper, Perform},
apub::ActorType,
blocking,
websocket::{
is_valid_community_name,
make_apub_endpoint,
naive_from_unix,
- slur_check,
- slurs_vec_to_str,
EndpointType,
};
use serde::{Deserialize, Serialize};
websocket_info: Option<WebsocketInfo>,
) -> Result<GetCommunityResponse, LemmyError> {
let data: &GetCommunity = &self.data;
-
- let user_id: Option<i32> = match &data.auth {
- Some(auth) => match Claims::decode(&auth) {
- Ok(claims) => {
- let user_id = claims.claims.id;
- Some(user_id)
- }
- Err(_e) => None,
- },
- None => None,
- };
+ let user = get_user_from_jwt_opt(&data.auth, pool).await?;
+ let user_id = user.map(|u| u.id);
let name = data.name.to_owned().unwrap_or_else(|| "main".to_string());
let community = match data.id {
_websocket_info: Option<WebsocketInfo>,
) -> Result<CommunityResponse, LemmyError> {
let data: &CreateCommunity = &self.data;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- if let Err(slurs) = slur_check(&data.name) {
- return Err(APIError::err(&slurs_vec_to_str(slurs)).into());
- }
-
- if let Err(slurs) = slur_check(&data.title) {
- return Err(APIError::err(&slurs_vec_to_str(slurs)).into());
- }
-
- if let Some(description) = &data.description {
- if let Err(slurs) = slur_check(description) {
- return Err(APIError::err(&slurs_vec_to_str(slurs)).into());
- }
- }
+ check_slurs(&data.name)?;
+ check_slurs(&data.title)?;
+ check_slurs_opt(&data.description)?;
if !is_valid_community_name(&data.name) {
return Err(APIError::err("invalid_community_name").into());
}
- let user_id = claims.id;
-
- // Check for a site ban
- let user_view = blocking(pool, move |conn| UserView::read(conn, user_id)).await??;
- if user_view.banned {
- return Err(APIError::err("site_ban").into());
- }
-
// Double check for duplicate community actor_ids
let actor_id = make_apub_endpoint(EndpointType::Community, &data.name).to_string();
let actor_id_cloned = actor_id.to_owned();
title: data.title.to_owned(),
description: data.description.to_owned(),
category_id: data.category_id,
- creator_id: user_id,
+ creator_id: user.id,
removed: None,
deleted: None,
nsfw: data.nsfw,
let community_moderator_form = CommunityModeratorForm {
community_id: inserted_community.id,
- user_id,
+ user_id: user.id,
};
let join = move |conn: &'_ _| CommunityModerator::join(conn, &community_moderator_form);
let community_follower_form = CommunityFollowerForm {
community_id: inserted_community.id,
- user_id,
+ user_id: user.id,
};
let follow = move |conn: &'_ _| CommunityFollower::follow(conn, &community_follower_form);
return Err(APIError::err("community_follower_already_exists").into());
}
+ let user_id = user.id;
let community_view = blocking(pool, move |conn| {
CommunityView::read(conn, inserted_community.id, Some(user_id))
})
websocket_info: Option<WebsocketInfo>,
) -> Result<CommunityResponse, LemmyError> {
let data: &EditCommunity = &self.data;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
- if let Err(slurs) = slur_check(&data.title) {
- return Err(APIError::err(&slurs_vec_to_str(slurs)).into());
- }
-
- if let Some(description) = &data.description {
- if let Err(slurs) = slur_check(description) {
- return Err(APIError::err(&slurs_vec_to_str(slurs)).into());
- }
- }
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
-
- // Check for a site ban
- let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
- if user.banned {
- return Err(APIError::err("site_ban").into());
- }
+ check_slurs(&data.title)?;
+ check_slurs_opt(&data.description)?;
// Verify its a mod (only mods can edit it)
let edit_id = data.edit_id;
.map(|v| v.into_iter().map(|m| m.user_id).collect())
})
.await??;
- if !mods.contains(&user_id) {
+ if !mods.contains(&user.id) {
return Err(APIError::err("not_a_moderator").into());
}
// process for communities and users
let edit_id = data.edit_id;
+ let user_id = user.id;
let community_view = blocking(pool, move |conn| {
CommunityView::read(conn, edit_id, Some(user_id))
})
websocket_info: Option<WebsocketInfo>,
) -> Result<CommunityResponse, LemmyError> {
let data: &DeleteCommunity = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
-
- // Check for a site ban
- let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
- if user.banned {
- return Err(APIError::err("site_ban").into());
- }
+ let user = get_user_from_jwt(&data.auth, pool).await?;
// Verify its the creator (only a creator can delete the community)
let edit_id = data.edit_id;
let read_community = blocking(pool, move |conn| Community::read(conn, edit_id)).await??;
- if read_community.creator_id != user_id {
+ if read_community.creator_id != user.id {
return Err(APIError::err("no_community_edit_allowed").into());
}
}
let edit_id = data.edit_id;
+ let user_id = user.id;
let community_view = blocking(pool, move |conn| {
CommunityView::read(conn, edit_id, Some(user_id))
})
websocket_info: Option<WebsocketInfo>,
) -> Result<CommunityResponse, LemmyError> {
let data: &RemoveCommunity = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
-
- // Check for a site ban
- let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
- if user.banned {
- return Err(APIError::err("site_ban").into());
- }
+ let user = get_user_from_jwt(&data.auth, pool).await?;
// Verify its an admin (only an admin can remove a community)
- is_admin(pool, user_id).await?;
+ is_admin(pool, user.id).await?;
// Do the remove
let edit_id = data.edit_id;
None => None,
};
let form = ModRemoveCommunityForm {
- mod_user_id: user_id,
+ mod_user_id: user.id,
community_id: data.edit_id,
removed: Some(removed),
reason: data.reason.to_owned(),
}
let edit_id = data.edit_id;
+ let user_id = user.id;
let community_view = blocking(pool, move |conn| {
CommunityView::read(conn, edit_id, Some(user_id))
})
_websocket_info: Option<WebsocketInfo>,
) -> Result<ListCommunitiesResponse, LemmyError> {
let data: &ListCommunities = &self.data;
-
- // For logged in users, you need to get back subscribed, and settings
- let user: Option<User_> = match &data.auth {
- Some(auth) => match Claims::decode(&auth) {
- Ok(claims) => {
- let user_id = claims.claims.id;
- let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
- Some(user)
- }
- Err(_e) => None,
- },
- None => None,
- };
+ let user = get_user_from_jwt_opt(&data.auth, pool).await?;
let user_id = match &user {
Some(user) => Some(user.id),
_websocket_info: Option<WebsocketInfo>,
) -> Result<CommunityResponse, LemmyError> {
let data: &FollowCommunity = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
let community_id = data.community_id;
let community = blocking(pool, move |conn| Community::read(conn, community_id)).await??;
let community_follower_form = CommunityFollowerForm {
community_id: data.community_id,
- user_id,
+ user_id: user.id,
};
if community.local {
return Err(APIError::err("community_follower_already_exists").into());
}
}
+ } else if data.follow {
+ // Dont actually add to the community followers here, because you need
+ // to wait for the accept
+ user
+ .send_follow(&community.actor_id, &self.client, pool)
+ .await?;
} else {
- let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
-
- if data.follow {
- // Dont actually add to the community followers here, because you need
- // to wait for the accept
- user
- .send_follow(&community.actor_id, &self.client, pool)
- .await?;
- } else {
- user
- .send_unfollow(&community.actor_id, &self.client, pool)
- .await?;
- let unfollow =
- move |conn: &'_ _| CommunityFollower::unfollow(conn, &community_follower_form);
- if blocking(pool, unfollow).await?.is_err() {
- return Err(APIError::err("community_follower_already_exists").into());
- }
+ user
+ .send_unfollow(&community.actor_id, &self.client, pool)
+ .await?;
+ let unfollow = move |conn: &'_ _| CommunityFollower::unfollow(conn, &community_follower_form);
+ if blocking(pool, unfollow).await?.is_err() {
+ return Err(APIError::err("community_follower_already_exists").into());
}
- // TODO: this needs to return a "pending" state, until Accept is received from the remote server
}
+ // TODO: this needs to return a "pending" state, until Accept is received from the remote server
let community_id = data.community_id;
+ let user_id = user.id;
let community_view = blocking(pool, move |conn| {
CommunityView::read(conn, community_id, Some(user_id))
})
_websocket_info: Option<WebsocketInfo>,
) -> Result<GetFollowedCommunitiesResponse, LemmyError> {
let data: &GetFollowedCommunities = &self.data;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
-
+ let user_id = user.id;
let communities = match blocking(pool, move |conn| {
CommunityFollowerView::for_user(conn, user_id)
})
websocket_info: Option<WebsocketInfo>,
) -> Result<BanFromCommunityResponse, LemmyError> {
let data: &BanFromCommunity = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
let community_id = data.community_id;
// Verify that only mods or admins can ban
- is_mod_or_admin(pool, user_id, community_id).await?;
+ is_mod_or_admin(pool, user.id, community_id).await?;
let community_user_ban_form = CommunityUserBanForm {
community_id: data.community_id,
};
let form = ModBanFromCommunityForm {
- mod_user_id: user_id,
+ mod_user_id: user.id,
other_user_id: data.user_id,
community_id: data.community_id,
reason: data.reason.to_owned(),
websocket_info: Option<WebsocketInfo>,
) -> Result<AddModToCommunityResponse, LemmyError> {
let data: &AddModToCommunity = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
let community_moderator_form = CommunityModeratorForm {
community_id: data.community_id,
let community_id = data.community_id;
// Verify that only mods or admins can add mod
- is_mod_or_admin(pool, user_id, community_id).await?;
+ is_mod_or_admin(pool, user.id, community_id).await?;
if data.added {
let join = move |conn: &'_ _| CommunityModerator::join(conn, &community_moderator_form);
// Mod tables
let form = ModAddCommunityForm {
- mod_user_id: user_id,
+ mod_user_id: user.id,
other_user_id: data.user_id,
community_id: data.community_id,
removed: Some(!data.added),
_websocket_info: Option<WebsocketInfo>,
) -> Result<GetCommunityResponse, LemmyError> {
let data: &TransferCommunity = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
let community_id = data.community_id;
let read_community = blocking(pool, move |conn| Community::read(conn, community_id)).await??;
admins.insert(0, creator_user);
// Make sure user is the creator, or an admin
- if user_id != read_community.creator_id && !admins.iter().map(|a| a.id).any(|x| x == user_id) {
+ if user.id != read_community.creator_id && !admins.iter().map(|a| a.id).any(|x| x == user.id) {
return Err(APIError::err("not_an_admin").into());
}
// Mod tables
let form = ModAddCommunityForm {
- mod_user_id: user_id,
+ mod_user_id: user.id,
other_user_id: data.user_id,
community_id: data.community_id,
removed: Some(false),
blocking(pool, move |conn| ModAddCommunity::create(conn, &form)).await??;
let community_id = data.community_id;
+ let user_id = user.id;
let community_view = match blocking(pool, move |conn| {
CommunityView::read(conn, community_id, Some(user_id))
})
-use crate::{blocking, websocket::WebsocketInfo, DbPool, LemmyError};
+use crate::{api::claims::Claims, blocking, websocket::WebsocketInfo, DbPool, LemmyError};
use actix_web::client::Client;
use lemmy_db::{
community::*,
user_view::*,
Crud,
};
+use lemmy_utils::{slur_check, slurs_vec_to_str};
use thiserror::Error;
pub mod claims;
}
Ok(())
}
+
+pub(in crate::api) async fn get_user_from_jwt(
+ jwt: &str,
+ pool: &DbPool,
+) -> Result<User_, LemmyError> {
+ let claims = match Claims::decode(&jwt) {
+ Ok(claims) => claims.claims,
+ Err(_e) => return Err(APIError::err("not_logged_in").into()),
+ };
+ let user_id = claims.id;
+ let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
+ // Check for a site ban
+ if user.banned {
+ return Err(APIError::err("site_ban").into());
+ }
+ Ok(user)
+}
+
+pub(in crate::api) async fn get_user_from_jwt_opt(
+ jwt: &Option<String>,
+ pool: &DbPool,
+) -> Result<Option<User_>, LemmyError> {
+ match jwt {
+ Some(jwt) => Ok(Some(get_user_from_jwt(jwt, pool).await?)),
+ None => Ok(None),
+ }
+}
+
+pub(in crate::api) fn check_slurs(text: &str) -> Result<(), APIError> {
+ if let Err(slurs) = slur_check(text) {
+ Err(APIError::err(&slurs_vec_to_str(slurs)))
+ } else {
+ Ok(())
+ }
+}
+pub(in crate::api) fn check_slurs_opt(text: &Option<String>) -> Result<(), APIError> {
+ match text {
+ Some(t) => check_slurs(t),
+ None => Ok(()),
+ }
+}
+pub(in crate::api) async fn check_community_ban(
+ user_id: i32,
+ community_id: i32,
+ pool: &DbPool,
+) -> Result<(), LemmyError> {
+ let is_banned = move |conn: &'_ _| CommunityUserBanView::get(conn, user_id, community_id).is_ok();
+ if blocking(pool, is_banned).await? {
+ Err(APIError::err("community_ban").into())
+ } else {
+ Ok(())
+ }
+}
use crate::{
- api::{claims::Claims, is_mod_or_admin, APIError, Oper, Perform},
+ api::{
+ check_community_ban,
+ check_slurs,
+ check_slurs_opt,
+ get_user_from_jwt,
+ get_user_from_jwt_opt,
+ is_mod_or_admin,
+ APIError,
+ Oper,
+ Perform,
+ },
apub::{ApubLikeableType, ApubObjectType},
blocking,
fetch_iframely_and_pictrs_data,
post::*,
post_view::*,
site_view::*,
- user::*,
Crud,
Likeable,
ListingType,
Saveable,
SortType,
};
-use lemmy_utils::{
- is_valid_post_title,
- make_apub_endpoint,
- slur_check,
- slurs_vec_to_str,
- EndpointType,
-};
+use lemmy_utils::{is_valid_post_title, make_apub_endpoint, EndpointType};
use serde::{Deserialize, Serialize};
use std::str::FromStr;
use url::Url;
websocket_info: Option<WebsocketInfo>,
) -> Result<PostResponse, LemmyError> {
let data: &CreatePost = &self.data;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- if let Err(slurs) = slur_check(&data.name) {
- return Err(APIError::err(&slurs_vec_to_str(slurs)).into());
- }
-
- if let Some(body) = &data.body {
- if let Err(slurs) = slur_check(body) {
- return Err(APIError::err(&slurs_vec_to_str(slurs)).into());
- }
- }
+ check_slurs(&data.name)?;
+ check_slurs_opt(&data.body)?;
if !is_valid_post_title(&data.name) {
return Err(APIError::err("invalid_post_title").into());
}
- let user_id = claims.id;
-
- // Check for a community ban
- let community_id = data.community_id;
- let is_banned =
- move |conn: &'_ _| CommunityUserBanView::get(conn, user_id, community_id).is_ok();
- if blocking(pool, is_banned).await? {
- return Err(APIError::err("community_ban").into());
- }
-
- // Check for a site ban
- let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
- if user.banned {
- return Err(APIError::err("site_ban").into());
- }
+ check_community_ban(user.id, data.community_id, pool).await?;
if let Some(url) = data.url.as_ref() {
match Url::parse(url) {
url: data.url.to_owned(),
body: data.body.to_owned(),
community_id: data.community_id,
- creator_id: user_id,
+ creator_id: user.id,
removed: None,
deleted: None,
nsfw: data.nsfw,
// They like their own post by default
let like_form = PostLikeForm {
post_id: inserted_post.id,
- user_id,
+ user_id: user.id,
score: 1,
};
// Refetch the view
let inserted_post_id = inserted_post.id;
let post_view = match blocking(pool, move |conn| {
- PostView::read(conn, inserted_post_id, Some(user_id))
+ PostView::read(conn, inserted_post_id, Some(user.id))
})
.await?
{
websocket_info: Option<WebsocketInfo>,
) -> Result<GetPostResponse, LemmyError> {
let data: &GetPost = &self.data;
-
- let user_id: Option<i32> = match &data.auth {
- Some(auth) => match Claims::decode(&auth) {
- Ok(claims) => {
- let user_id = claims.claims.id;
- Some(user_id)
- }
- Err(_e) => None,
- },
- None => None,
- };
+ let user = get_user_from_jwt_opt(&data.auth, pool).await?;
+ let user_id = user.map(|u| u.id);
let id = data.id;
let post_view = match blocking(pool, move |conn| PostView::read(conn, id, user_id)).await? {
websocket_info: Option<WebsocketInfo>,
) -> Result<GetPostsResponse, LemmyError> {
let data: &GetPosts = &self.data;
-
- // For logged in users, you need to get back subscribed, and settings
- let user: Option<User_> = match &data.auth {
- Some(auth) => match Claims::decode(&auth) {
- Ok(claims) => {
- let user_id = claims.claims.id;
- let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
- Some(user)
- }
- Err(_e) => None,
- },
- None => None,
- };
+ let user = get_user_from_jwt_opt(&data.auth, pool).await?;
let user_id = match &user {
Some(user) => Some(user.id),
websocket_info: Option<WebsocketInfo>,
) -> Result<PostResponse, LemmyError> {
let data: &CreatePostLike = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
// Don't do a downvote if site has downvotes disabled
if data.score == -1 {
let post_id = data.post_id;
let post = blocking(pool, move |conn| Post::read(conn, post_id)).await??;
- let community_id = post.community_id;
- let is_banned =
- move |conn: &'_ _| CommunityUserBanView::get(conn, user_id, community_id).is_ok();
- if blocking(pool, is_banned).await? {
- return Err(APIError::err("community_ban").into());
- }
-
- // Check for a site ban
- let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
- if user.banned {
- return Err(APIError::err("site_ban").into());
- }
+ check_community_ban(user.id, post.community_id, pool).await?;
let like_form = PostLikeForm {
post_id: data.post_id,
- user_id,
+ user_id: user.id,
score: data.score,
};
}
let post_id = data.post_id;
+ let user_id = user.id;
let post_view = match blocking(pool, move |conn| {
PostView::read(conn, post_id, Some(user_id))
})
websocket_info: Option<WebsocketInfo>,
) -> Result<PostResponse, LemmyError> {
let data: &EditPost = &self.data;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
- if let Err(slurs) = slur_check(&data.name) {
- return Err(APIError::err(&slurs_vec_to_str(slurs)).into());
- }
-
- if let Some(body) = &data.body {
- if let Err(slurs) = slur_check(body) {
- return Err(APIError::err(&slurs_vec_to_str(slurs)).into());
- }
- }
+ check_slurs(&data.name)?;
+ check_slurs_opt(&data.body)?;
if !is_valid_post_title(&data.name) {
return Err(APIError::err("invalid_post_title").into());
}
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
-
let edit_id = data.edit_id;
let orig_post = blocking(pool, move |conn| Post::read(conn, edit_id)).await??;
- // Check for a community ban
- let community_id = orig_post.community_id;
- let is_banned =
- move |conn: &'_ _| CommunityUserBanView::get(conn, user_id, community_id).is_ok();
- if blocking(pool, is_banned).await? {
- return Err(APIError::err("community_ban").into());
- }
-
- // Check for a site ban
- let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
- if user.banned {
- return Err(APIError::err("site_ban").into());
- }
+ check_community_ban(user.id, orig_post.community_id, pool).await?;
// Verify that only the creator can edit
- if !Post::is_post_creator(user_id, orig_post.creator_id) {
+ if !Post::is_post_creator(user.id, orig_post.creator_id) {
return Err(APIError::err("no_post_edit_allowed").into());
}
let edit_id = data.edit_id;
let post_view = blocking(pool, move |conn| {
- PostView::read(conn, edit_id, Some(user_id))
+ PostView::read(conn, edit_id, Some(user.id))
})
.await??;
websocket_info: Option<WebsocketInfo>,
) -> Result<PostResponse, LemmyError> {
let data: &DeletePost = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
let edit_id = data.edit_id;
let orig_post = blocking(pool, move |conn| Post::read(conn, edit_id)).await??;
- // Check for a site ban
- let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
- if user.banned {
- return Err(APIError::err("site_ban").into());
- }
-
- // Check for a community ban
- let community_id = orig_post.community_id;
- let is_banned =
- move |conn: &'_ _| CommunityUserBanView::get(conn, user_id, community_id).is_ok();
- if blocking(pool, is_banned).await? {
- return Err(APIError::err("community_ban").into());
- }
+ check_community_ban(user.id, orig_post.community_id, pool).await?;
// Verify that only the creator can delete
- if !Post::is_post_creator(user_id, orig_post.creator_id) {
+ if !Post::is_post_creator(user.id, orig_post.creator_id) {
return Err(APIError::err("no_post_edit_allowed").into());
}
// Refetch the post
let edit_id = data.edit_id;
let post_view = blocking(pool, move |conn| {
- PostView::read(conn, edit_id, Some(user_id))
+ PostView::read(conn, edit_id, Some(user.id))
})
.await??;
websocket_info: Option<WebsocketInfo>,
) -> Result<PostResponse, LemmyError> {
let data: &RemovePost = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
let edit_id = data.edit_id;
let orig_post = blocking(pool, move |conn| Post::read(conn, edit_id)).await??;
- // Check for a site ban
- let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
- if user.banned {
- return Err(APIError::err("site_ban").into());
- }
-
- // Check for a community ban
- let community_id = orig_post.community_id;
- let is_banned =
- move |conn: &'_ _| CommunityUserBanView::get(conn, user_id, community_id).is_ok();
- if blocking(pool, is_banned).await? {
- return Err(APIError::err("community_ban").into());
- }
+ check_community_ban(user.id, orig_post.community_id, pool).await?;
// Verify that only the mods can remove
- is_mod_or_admin(pool, user_id, community_id).await?;
+ is_mod_or_admin(pool, user.id, orig_post.community_id).await?;
// Update the post
let edit_id = data.edit_id;
// Mod tables
let form = ModRemovePostForm {
- mod_user_id: user_id,
+ mod_user_id: user.id,
post_id: data.edit_id,
removed: Some(removed),
reason: data.reason.to_owned(),
// Refetch the post
let edit_id = data.edit_id;
+ let user_id = user.id;
let post_view = blocking(pool, move |conn| {
PostView::read(conn, edit_id, Some(user_id))
})
websocket_info: Option<WebsocketInfo>,
) -> Result<PostResponse, LemmyError> {
let data: &LockPost = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
let edit_id = data.edit_id;
let orig_post = blocking(pool, move |conn| Post::read(conn, edit_id)).await??;
- // Check for a site ban
- let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
- if user.banned {
- return Err(APIError::err("site_ban").into());
- }
-
- // Check for a community ban
- let community_id = orig_post.community_id;
- let is_banned =
- move |conn: &'_ _| CommunityUserBanView::get(conn, user_id, community_id).is_ok();
- if blocking(pool, is_banned).await? {
- return Err(APIError::err("community_ban").into());
- }
+ check_community_ban(user.id, orig_post.community_id, pool).await?;
// Verify that only the mods can lock
- is_mod_or_admin(pool, user_id, community_id).await?;
+ is_mod_or_admin(pool, user.id, orig_post.community_id).await?;
// Update the post
let edit_id = data.edit_id;
// Mod tables
let form = ModLockPostForm {
- mod_user_id: user_id,
+ mod_user_id: user.id,
post_id: data.edit_id,
locked: Some(locked),
};
// Refetch the post
let edit_id = data.edit_id;
let post_view = blocking(pool, move |conn| {
- PostView::read(conn, edit_id, Some(user_id))
+ PostView::read(conn, edit_id, Some(user.id))
})
.await??;
websocket_info: Option<WebsocketInfo>,
) -> Result<PostResponse, LemmyError> {
let data: &StickyPost = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
let edit_id = data.edit_id;
let orig_post = blocking(pool, move |conn| Post::read(conn, edit_id)).await??;
- // Check for a site ban
- let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
- if user.banned {
- return Err(APIError::err("site_ban").into());
- }
-
- // Check for a community ban
- let community_id = orig_post.community_id;
- let is_banned =
- move |conn: &'_ _| CommunityUserBanView::get(conn, user_id, community_id).is_ok();
- if blocking(pool, is_banned).await? {
- return Err(APIError::err("community_ban").into());
- }
+ check_community_ban(user.id, orig_post.community_id, pool).await?;
// Verify that only the mods can sticky
- is_mod_or_admin(pool, user_id, community_id).await?;
+ is_mod_or_admin(pool, user.id, orig_post.community_id).await?;
// Update the post
let edit_id = data.edit_id;
// Mod tables
let form = ModStickyPostForm {
- mod_user_id: user_id,
+ mod_user_id: user.id,
post_id: data.edit_id,
stickied: Some(stickied),
};
// Refetch the post
let edit_id = data.edit_id;
let post_view = blocking(pool, move |conn| {
- PostView::read(conn, edit_id, Some(user_id))
+ PostView::read(conn, edit_id, Some(user.id))
})
.await??;
_websocket_info: Option<WebsocketInfo>,
) -> Result<PostResponse, LemmyError> {
let data: &SavePost = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
let post_saved_form = PostSavedForm {
post_id: data.post_id,
- user_id,
+ user_id: user.id,
};
if data.save {
}
let post_id = data.post_id;
+ let user_id = user.id;
let post_view = blocking(pool, move |conn| {
PostView::read(conn, post_id, Some(user_id))
})
use super::user::Register;
use crate::{
- api::{claims::Claims, is_admin, APIError, Oper, Perform},
+ api::{
+ check_slurs,
+ check_slurs_opt,
+ get_user_from_jwt,
+ get_user_from_jwt_opt,
+ is_admin,
+ APIError,
+ Oper,
+ Perform,
+ },
apub::fetcher::search_by_apub_id,
blocking,
version,
SearchType,
SortType,
};
-use lemmy_utils::{settings::Settings, slur_check, slurs_vec_to_str};
+use lemmy_utils::settings::Settings;
use log::{debug, info};
use serde::{Deserialize, Serialize};
use std::str::FromStr;
) -> Result<SiteResponse, LemmyError> {
let data: &CreateSite = &self.data;
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- if let Err(slurs) = slur_check(&data.name) {
- return Err(APIError::err(&slurs_vec_to_str(slurs)).into());
- }
-
- if let Some(description) = &data.description {
- if let Err(slurs) = slur_check(description) {
- return Err(APIError::err(&slurs_vec_to_str(slurs)).into());
- }
- }
+ let user = get_user_from_jwt(&data.auth, pool).await?;
- let user_id = claims.id;
+ check_slurs(&data.name)?;
+ check_slurs_opt(&data.description)?;
// Make sure user is an admin
- is_admin(pool, user_id).await?;
+ is_admin(pool, user.id).await?;
let site_form = SiteForm {
name: data.name.to_owned(),
description: data.description.to_owned(),
- creator_id: user_id,
+ creator_id: user.id,
enable_downvotes: data.enable_downvotes,
open_registration: data.open_registration,
enable_nsfw: data.enable_nsfw,
websocket_info: Option<WebsocketInfo>,
) -> Result<SiteResponse, LemmyError> {
let data: &EditSite = &self.data;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- if let Err(slurs) = slur_check(&data.name) {
- return Err(APIError::err(&slurs_vec_to_str(slurs)).into());
- }
-
- if let Some(description) = &data.description {
- if let Err(slurs) = slur_check(description) {
- return Err(APIError::err(&slurs_vec_to_str(slurs)).into());
- }
- }
-
- let user_id = claims.id;
+ check_slurs(&data.name)?;
+ check_slurs_opt(&data.description)?;
// Make sure user is an admin
- is_admin(pool, user_id).await?;
+ is_admin(pool, user.id).await?;
let found_site = blocking(pool, move |conn| Site::read(conn, 1)).await??;
0
};
- // Giving back your user, if you're logged in
- let my_user: Option<User_> = match &data.auth {
- Some(auth) => match Claims::decode(&auth) {
- Ok(claims) => {
- let user_id = claims.claims.id;
- let mut user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
- user.password_encrypted = "".to_string();
- user.private_key = None;
- user.public_key = None;
- Some(user)
- }
- Err(_e) => None,
- },
- None => None,
- };
+ let my_user = get_user_from_jwt_opt(&data.auth, pool).await?.map(|mut u| {
+ u.password_encrypted = "".to_string();
+ u.private_key = None;
+ u.public_key = None;
+ u
+ });
Ok(GetSiteResponse {
site: site_view,
Err(e) => debug!("Failed to resolve search query as activitypub ID: {}", e),
}
- let user_id: Option<i32> = match &data.auth {
- Some(auth) => match Claims::decode(&auth) {
- Ok(claims) => {
- let user_id = claims.claims.id;
- Some(user_id)
- }
- Err(_e) => None,
- },
- None => None,
- };
+ let user = get_user_from_jwt_opt(&data.auth, pool).await?;
+ let user_id = user.map(|u| u.id);
let type_ = SearchType::from_str(&data.type_)?;
_websocket_info: Option<WebsocketInfo>,
) -> Result<GetSiteResponse, LemmyError> {
let data: &TransferSite = &self.data;
+ let mut user = get_user_from_jwt(&data.auth, pool).await?;
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
- let mut user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
// TODO add a User_::read_safe() for this.
user.password_encrypted = "".to_string();
user.private_key = None;
let read_site = blocking(pool, move |conn| Site::read(conn, 1)).await??;
// Make sure user is the creator
- if read_site.creator_id != user_id {
+ if read_site.creator_id != user.id {
return Err(APIError::err("not_an_admin").into());
}
// Mod tables
let form = ModAddForm {
- mod_user_id: user_id,
+ mod_user_id: user.id,
other_user_id: data.user_id,
removed: Some(false),
};
_websocket_info: Option<WebsocketInfo>,
) -> Result<GetSiteConfigResponse, LemmyError> {
let data: &GetSiteConfig = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
// Only let admins read this
- is_admin(pool, user_id).await?;
+ is_admin(pool, user.id).await?;
let config_hjson = Settings::read_config_file()?;
_websocket_info: Option<WebsocketInfo>,
) -> Result<GetSiteConfigResponse, LemmyError> {
let data: &SaveSiteConfig = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
// Only let admins read this
let admins = blocking(pool, move |conn| UserView::admins(conn)).await??;
let admin_ids: Vec<i32> = admins.into_iter().map(|m| m.id).collect();
- if !admin_ids.contains(&user_id) {
+ if !admin_ids.contains(&user.id) {
return Err(APIError::err("not_an_admin").into());
}
use crate::{
- api::{claims::Claims, is_admin, APIError, Oper, Perform},
+ api::{
+ check_slurs,
+ claims::Claims,
+ get_user_from_jwt,
+ get_user_from_jwt_opt,
+ is_admin,
+ APIError,
+ Oper,
+ Perform,
+ },
apub::ApubObjectType,
blocking,
captcha_espeak_wav_base64,
remove_slurs,
send_email,
settings::Settings,
- slur_check,
- slurs_vec_to_str,
EndpointType,
};
use log::error;
};
}
- if let Err(slurs) = slur_check(&data.username) {
- return Err(APIError::err(&slurs_vec_to_str(slurs)).into());
- }
+ check_slurs(&data.username)?;
// Make sure there are no admins
let any_admins = blocking(pool, move |conn| {
_websocket_info: Option<WebsocketInfo>,
) -> Result<LoginResponse, LemmyError> {
let data: &SaveUserSettings = &self.data;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
-
+ let user_id = user.id;
let read_user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
let email = match &data.email {
_websocket_info: Option<WebsocketInfo>,
) -> Result<GetUserDetailsResponse, LemmyError> {
let data: &GetUserDetails = &self.data;
-
- // For logged in users, you need to get back subscribed, and settings
- let user: Option<User_> = match &data.auth {
- Some(auth) => match Claims::decode(&auth) {
- Ok(claims) => {
- let user_id = claims.claims.id;
- let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
- Some(user)
- }
- Err(_e) => None,
- },
- None => None,
- };
-
- let user_id = match &user {
- Some(user) => Some(user.id),
- None => None,
- };
+ let user = get_user_from_jwt_opt(&data.auth, pool).await?;
let show_nsfw = match &user {
Some(user) => user.show_nsfw,
let limit = data.limit;
let saved_only = data.saved_only;
let community_id = data.community_id;
+ let user_id = user.map(|u| u.id);
let (posts, comments) = blocking(pool, move |conn| {
let mut posts_query = PostQueryBuilder::create(conn)
.sort(&sort)
websocket_info: Option<WebsocketInfo>,
) -> Result<AddAdminResponse, LemmyError> {
let data: &AddAdmin = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
// Make sure user is an admin
- is_admin(pool, user_id).await?;
+ is_admin(pool, user.id).await?;
let added = data.added;
let added_user_id = data.user_id;
// Mod tables
let form = ModAddForm {
- mod_user_id: user_id,
+ mod_user_id: user.id,
other_user_id: data.user_id,
removed: Some(!data.added),
};
websocket_info: Option<WebsocketInfo>,
) -> Result<BanUserResponse, LemmyError> {
let data: &BanUser = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
// Make sure user is an admin
- is_admin(pool, user_id).await?;
+ is_admin(pool, user.id).await?;
let ban = data.ban;
let banned_user_id = data.user_id;
};
let form = ModBanForm {
- mod_user_id: user_id,
+ mod_user_id: user.id,
other_user_id: data.user_id,
reason: data.reason.to_owned(),
banned: Some(data.ban),
_websocket_info: Option<WebsocketInfo>,
) -> Result<GetRepliesResponse, LemmyError> {
let data: &GetReplies = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
let sort = SortType::from_str(&data.sort)?;
let page = data.page;
let limit = data.limit;
let unread_only = data.unread_only;
+ let user_id = user.id;
let replies = blocking(pool, move |conn| {
ReplyQueryBuilder::create(conn, user_id)
.sort(&sort)
_websocket_info: Option<WebsocketInfo>,
) -> Result<GetUserMentionsResponse, LemmyError> {
let data: &GetUserMentions = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
let sort = SortType::from_str(&data.sort)?;
let page = data.page;
let limit = data.limit;
let unread_only = data.unread_only;
+ let user_id = user.id;
let mentions = blocking(pool, move |conn| {
UserMentionQueryBuilder::create(conn, user_id)
.sort(&sort)
_websocket_info: Option<WebsocketInfo>,
) -> Result<UserMentionResponse, LemmyError> {
let data: &MarkUserMentionAsRead = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
let user_mention_id = data.user_mention_id;
let read_user_mention =
blocking(pool, move |conn| UserMention::read(conn, user_mention_id)).await??;
- if user_id != read_user_mention.recipient_id {
+ if user.id != read_user_mention.recipient_id {
return Err(APIError::err("couldnt_update_comment").into());
}
};
let user_mention_id = read_user_mention.id;
+ let user_id = user.id;
let user_mention_view = blocking(pool, move |conn| {
UserMentionView::read(conn, user_mention_id, user_id)
})
_websocket_info: Option<WebsocketInfo>,
) -> Result<GetRepliesResponse, LemmyError> {
let data: &MarkAllAsRead = &self.data;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
-
+ let user_id = user.id;
let replies = blocking(pool, move |conn| {
ReplyQueryBuilder::create(conn, user_id)
.unread_only(true)
_websocket_info: Option<WebsocketInfo>,
) -> Result<LoginResponse, LemmyError> {
let data: &DeleteAccount = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
-
- let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
// Verify the password
let valid: bool = verify(&data.password, &user.password_encrypted).unwrap_or(false);
}
// Comments
+ let user_id = user.id;
let comments = blocking(pool, move |conn| {
CommentQueryBuilder::create(conn)
.for_creator_id(user_id)
websocket_info: Option<WebsocketInfo>,
) -> Result<PrivateMessageResponse, LemmyError> {
let data: &CreatePrivateMessage = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
let hostname = &format!("https://{}", Settings::get().hostname);
- // Check for a site ban
- let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
- if user.banned {
- return Err(APIError::err("site_ban").into());
- }
-
let content_slurs_removed = remove_slurs(&data.content.to_owned());
let private_message_form = PrivateMessageForm {
content: content_slurs_removed.to_owned(),
- creator_id: user_id,
+ creator_id: user.id,
recipient_id: data.recipient_id,
deleted: None,
read: None,
websocket_info: Option<WebsocketInfo>,
) -> Result<PrivateMessageResponse, LemmyError> {
let data: &EditPrivateMessage = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
-
- // Check for a site ban
- let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
- if user.banned {
- return Err(APIError::err("site_ban").into());
- }
+ let user = get_user_from_jwt(&data.auth, pool).await?;
// Checking permissions
let edit_id = data.edit_id;
let orig_private_message =
blocking(pool, move |conn| PrivateMessage::read(conn, edit_id)).await??;
- if user_id != orig_private_message.creator_id {
+ if user.id != orig_private_message.creator_id {
return Err(APIError::err("no_private_message_edit_allowed").into());
}
websocket_info: Option<WebsocketInfo>,
) -> Result<PrivateMessageResponse, LemmyError> {
let data: &DeletePrivateMessage = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
-
- // Check for a site ban
- let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
- if user.banned {
- return Err(APIError::err("site_ban").into());
- }
+ let user = get_user_from_jwt(&data.auth, pool).await?;
// Checking permissions
let edit_id = data.edit_id;
let orig_private_message =
blocking(pool, move |conn| PrivateMessage::read(conn, edit_id)).await??;
- if user_id != orig_private_message.creator_id {
+ if user.id != orig_private_message.creator_id {
return Err(APIError::err("no_private_message_edit_allowed").into());
}
websocket_info: Option<WebsocketInfo>,
) -> Result<PrivateMessageResponse, LemmyError> {
let data: &MarkPrivateMessageAsRead = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
-
- // Check for a site ban
- let user = blocking(pool, move |conn| User_::read(conn, user_id)).await??;
- if user.banned {
- return Err(APIError::err("site_ban").into());
- }
+ let user = get_user_from_jwt(&data.auth, pool).await?;
// Checking permissions
let edit_id = data.edit_id;
let orig_private_message =
blocking(pool, move |conn| PrivateMessage::read(conn, edit_id)).await??;
- if user_id != orig_private_message.recipient_id {
+ if user.id != orig_private_message.recipient_id {
return Err(APIError::err("couldnt_update_private_message").into());
}
_websocket_info: Option<WebsocketInfo>,
) -> Result<PrivateMessagesResponse, LemmyError> {
let data: &GetPrivateMessages = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
+ let user_id = user.id;
let page = data.page;
let limit = data.limit;
async fn perform(
&self,
- _pool: &DbPool,
+ pool: &DbPool,
websocket_info: Option<WebsocketInfo>,
) -> Result<UserJoinResponse, LemmyError> {
let data: &UserJoin = &self.data;
-
- let claims = match Claims::decode(&data.auth) {
- Ok(claims) => claims.claims,
- Err(_e) => return Err(APIError::err("not_logged_in").into()),
- };
-
- let user_id = claims.id;
+ let user = get_user_from_jwt(&data.auth, pool).await?;
if let Some(ws) = websocket_info {
if let Some(id) = ws.id {
- ws.chatserver.do_send(JoinUserRoom { user_id, id });
+ ws.chatserver.do_send(JoinUserRoom {
+ user_id: user.id,
+ id,
+ });
}
}
- Ok(UserJoinResponse { user_id })
+ Ok(UserJoinResponse { user_id: user.id })
}
}
use crate::{
apub::{
+ check_is_apub_id_valid,
community::do_announce,
extensions::signatures::sign,
insert_activity,
- is_apub_id_valid,
ActorType,
},
request::retry_custom,
for t in to {
let to_url = Url::parse(&t)?;
- if !is_apub_id_valid(&to_url) {
- debug!("Not sending activity to {} (invalid or blocklisted)", t);
- continue;
- }
+ check_is_apub_id_valid(&to_url)?;
let res = retry_custom(|| async {
let request = client.post(&t).header("Content-Type", "application/json");
use crate::{
api::site::SearchResponse,
apub::{
- is_apub_id_valid,
+ check_is_apub_id_valid,
ActorType,
FromApub,
GroupExt,
where
Response: for<'de> Deserialize<'de>,
{
- if !is_apub_id_valid(&url) {
- return Err(anyhow!("Activitypub uri invalid or blocked: {}", url).into());
- }
+ check_is_apub_id_valid(&url)?;
let timeout = Duration::from_secs(60);
chat_server: ChatServerParam,
) -> Result<HttpResponse, LemmyError> {
let create = Create::from_any_base(activity)?.unwrap();
- dbg!(create.object().as_single_kind_str());
match create.object().as_single_kind_str() {
Some("Page") => receive_create_post(create, client, pool, chat_server).await,
Some("Note") => receive_create_comment(create, client, pool, chat_server).await,
use crate::{
apub::{
+ check_is_apub_id_valid,
extensions::signatures::verify,
- fetcher::{get_or_fetch_and_upsert_community, get_or_fetch_and_upsert_user},
+ fetcher::get_or_fetch_and_upsert_user,
insert_activity,
ActorType,
},
LemmyError,
};
use activitystreams::{
- activity::{Follow, Undo},
+ activity::{ActorAndObject, Follow, Undo},
+ base::AnyBase,
prelude::*,
};
use actix_web::{client::Client, web, HttpRequest, HttpResponse};
Followable,
};
use log::debug;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
use std::fmt::Debug;
-#[serde(untagged)]
-#[derive(Deserialize, Debug)]
-pub enum CommunityAcceptedObjects {
- Follow(Follow),
- Undo(Undo),
+#[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd, Deserialize, Serialize)]
+#[serde(rename_all = "PascalCase")]
+pub enum ValidTypes {
+ Follow,
+ Undo,
}
-impl CommunityAcceptedObjects {
- fn follow(&self) -> Result<Follow, LemmyError> {
- match self {
- CommunityAcceptedObjects::Follow(f) => Ok(f.to_owned()),
- CommunityAcceptedObjects::Undo(u) => {
- Ok(Follow::from_any_base(u.object().as_one().unwrap().to_owned())?.unwrap())
- }
- }
- }
-}
+pub type AcceptedActivities = ActorAndObject<ValidTypes>;
/// Handler for all incoming activities to community inboxes.
pub async fn community_inbox(
request: HttpRequest,
- input: web::Json<CommunityAcceptedObjects>,
+ input: web::Json<AcceptedActivities>,
path: web::Path<String>,
db: DbPoolParam,
client: web::Data<Client>,
_chat_server: ChatServerParam,
) -> Result<HttpResponse, LemmyError> {
- let input = input.into_inner();
+ let activity = input.into_inner();
let path = path.into_inner();
let community = blocking(&db, move |conn| Community::read_from_name(&conn, &path)).await??;
}
debug!(
"Community {} received activity {:?}",
- &community.name, &input
+ &community.name, &activity
);
- let follow = input.follow()?;
- let user_uri = follow.actor()?.as_single_xsd_any_uri().unwrap();
- let community_uri = follow.object().as_single_xsd_any_uri().unwrap();
+ let user_uri = activity.actor()?.as_single_xsd_any_uri().unwrap();
+ check_is_apub_id_valid(user_uri)?;
let user = get_or_fetch_and_upsert_user(&user_uri, &client, &db).await?;
- let community = get_or_fetch_and_upsert_community(community_uri, &client, &db).await?;
verify(&request, &user)?;
- match input {
- CommunityAcceptedObjects::Follow(f) => handle_follow(f, user, community, &client, db).await,
- CommunityAcceptedObjects::Undo(u) => handle_undo_follow(u, user, community, db).await,
+ insert_activity(user.id, activity.clone(), false, &db).await?;
+
+ let any_base = activity.clone().into_any_base()?;
+ let kind = activity.kind().unwrap();
+ match kind {
+ ValidTypes::Follow => handle_follow(any_base, user, community, &client, db).await,
+ ValidTypes::Undo => handle_undo_follow(any_base, user, community, db).await,
}
}
/// Handle a follow request from a remote user, adding it to the local database and returning an
/// Accept activity.
async fn handle_follow(
- follow: Follow,
+ activity: AnyBase,
user: User_,
community: Community,
client: &Client,
db: DbPoolParam,
) -> Result<HttpResponse, LemmyError> {
- insert_activity(user.id, follow.clone(), false, &db).await?;
-
+ let follow = Follow::from_any_base(activity)?.unwrap();
let community_follower_form = CommunityFollowerForm {
community_id: community.id,
user_id: user.id,
}
async fn handle_undo_follow(
- undo: Undo,
+ activity: AnyBase,
user: User_,
community: Community,
db: DbPoolParam,
) -> Result<HttpResponse, LemmyError> {
- insert_activity(user.id, undo, false, &db).await?;
+ let _undo = Undo::from_any_base(activity)?.unwrap();
let community_follower_form = CommunityFollowerForm {
community_id: community.id,
use crate::{
apub::{
+ check_is_apub_id_valid,
community::do_announce,
extensions::signatures::verify,
fetcher::{
use actix_web::{client::Client, web, HttpRequest, HttpResponse};
use lemmy_db::user::User_;
use log::debug;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
use std::fmt::Debug;
use url::Url;
-#[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd, Deserialize, Serialize)]
#[serde(rename_all = "PascalCase")]
pub enum ValidTypes {
Create,
debug!("Shared inbox received activity: {}", json);
let sender = &activity.actor()?.to_owned().single_xsd_any_uri().unwrap();
-
// TODO: pass this actor in instead of using get_user_from_activity()
let actor = get_or_fetch_and_upsert_actor(sender, &client, &pool).await?;
+
+ let community = get_community_id_from_activity(&activity).await;
+
+ check_is_apub_id_valid(sender)?;
+ check_is_apub_id_valid(&community)?;
verify(&request, actor.as_ref())?;
insert_activity(actor.user_id(), activity.clone(), false, &pool).await?;
let any_base = activity.clone().into_any_base()?;
let kind = activity.kind().unwrap();
- dbg!(kind);
match kind {
ValidTypes::Announce => receive_announce(any_base, &client, &pool, chat_server).await,
ValidTypes::Create => receive_create(any_base, &client, &pool, chat_server).await,
get_or_fetch_and_upsert_user(&user_uri, client, pool).await
}
+pub(in crate::apub::inbox) async fn get_community_id_from_activity<T, A>(activity: &T) -> Url
+where
+ T: AsBase<A> + ActorAndObjectRef + AsObject<A>,
+{
+ let cc = activity.cc().unwrap();
+ let cc = cc.as_many().unwrap();
+ cc.first().unwrap().as_xsd_any_uri().unwrap().to_owned()
+}
+
pub(in crate::apub::inbox) async fn announce_if_community_is_local<T, Kind>(
activity: T,
user: &User_,
use crate::{
api::user::PrivateMessageResponse,
apub::{
+ check_is_apub_id_valid,
extensions::signatures::verify,
- fetcher::{get_or_fetch_and_upsert_community, get_or_fetch_and_upsert_user},
+ fetcher::{get_or_fetch_and_upsert_actor, get_or_fetch_and_upsert_community},
insert_activity,
FromApub,
},
LemmyError,
};
use activitystreams::{
- activity::{Accept, Create, Delete, Undo, Update},
+ activity::{Accept, ActorAndObject, Create, Delete, Undo, Update},
+ base::AnyBase,
object::Note,
prelude::*,
};
Followable,
};
use log::debug;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
use std::fmt::Debug;
-#[serde(untagged)]
-#[derive(Deserialize, Debug)]
-pub enum UserAcceptedObjects {
- Accept(Box<Accept>),
- Create(Box<Create>),
- Update(Box<Update>),
- Delete(Box<Delete>),
- Undo(Box<Undo>),
+#[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd, Deserialize, Serialize)]
+#[serde(rename_all = "PascalCase")]
+pub enum ValidTypes {
+ Accept,
+ Create,
+ Update,
+ Delete,
+ Undo,
}
+pub type AcceptedActivities = ActorAndObject<ValidTypes>;
+
/// Handler for all incoming activities to user inboxes.
pub async fn user_inbox(
request: HttpRequest,
- input: web::Json<UserAcceptedObjects>,
+ input: web::Json<AcceptedActivities>,
path: web::Path<String>,
client: web::Data<Client>,
- db: DbPoolParam,
+ pool: DbPoolParam,
chat_server: ChatServerParam,
) -> Result<HttpResponse, LemmyError> {
- // TODO: would be nice if we could do the signature check here, but we cant access the actor property
- let input = input.into_inner();
+ let activity = input.into_inner();
let username = path.into_inner();
- debug!("User {} received activity: {:?}", &username, &input);
+ debug!("User {} received activity: {:?}", &username, &activity);
+
+ let actor_uri = activity.actor()?.as_single_xsd_any_uri().unwrap();
+
+ check_is_apub_id_valid(actor_uri)?;
+
+ let actor = get_or_fetch_and_upsert_actor(actor_uri, &client, &pool).await?;
+ verify(&request, actor.as_ref())?;
- match input {
- UserAcceptedObjects::Accept(a) => receive_accept(*a, &request, &username, &client, &db).await,
- UserAcceptedObjects::Create(c) => {
- receive_create_private_message(*c, &request, &client, &db, chat_server).await
+ insert_activity(actor.user_id(), activity.clone(), false, &pool).await?;
+
+ let any_base = activity.clone().into_any_base()?;
+ let kind = activity.kind().unwrap();
+ match kind {
+ ValidTypes::Accept => receive_accept(any_base, username, &client, &pool).await,
+ ValidTypes::Create => {
+ receive_create_private_message(any_base, &client, &pool, chat_server).await
}
- UserAcceptedObjects::Update(u) => {
- receive_update_private_message(*u, &request, &client, &db, chat_server).await
+ ValidTypes::Update => {
+ receive_update_private_message(any_base, &client, &pool, chat_server).await
}
- UserAcceptedObjects::Delete(d) => {
- receive_delete_private_message(*d, &request, &client, &db, chat_server).await
+ ValidTypes::Delete => {
+ receive_delete_private_message(any_base, &client, &pool, chat_server).await
}
- UserAcceptedObjects::Undo(u) => {
- receive_undo_delete_private_message(*u, &request, &client, &db, chat_server).await
+ ValidTypes::Undo => {
+ receive_undo_delete_private_message(any_base, &client, &pool, chat_server).await
}
}
}
/// Handle accepted follows.
async fn receive_accept(
- accept: Accept,
- request: &HttpRequest,
- username: &str,
+ activity: AnyBase,
+ username: String,
client: &Client,
pool: &DbPool,
) -> Result<HttpResponse, LemmyError> {
+ let accept = Accept::from_any_base(activity)?.unwrap();
let community_uri = accept.actor()?.to_owned().single_xsd_any_uri().unwrap();
let community = get_or_fetch_and_upsert_community(&community_uri, client, pool).await?;
- verify(request, &community)?;
- let username = username.to_owned();
let user = blocking(pool, move |conn| User_::read_from_name(conn, &username)).await??;
- insert_activity(community.creator_id, accept, false, pool).await?;
-
// Now you need to add this to the community follower
let community_follower_form = CommunityFollowerForm {
community_id: community.id,
}
async fn receive_create_private_message(
- create: Create,
- request: &HttpRequest,
+ activity: AnyBase,
client: &Client,
pool: &DbPool,
chat_server: ChatServerParam,
) -> Result<HttpResponse, LemmyError> {
- let user_uri = &create.actor()?.to_owned().single_xsd_any_uri().unwrap();
+ let create = Create::from_any_base(activity)?.unwrap();
let note = Note::from_any_base(create.object().as_one().unwrap().to_owned())?.unwrap();
- let user = get_or_fetch_and_upsert_user(user_uri, client, pool).await?;
- verify(request, &user)?;
-
- insert_activity(user.id, create, false, pool).await?;
-
let private_message = PrivateMessageForm::from_apub(¬e, client, pool).await?;
let inserted_private_message = blocking(pool, move |conn| {
}
async fn receive_update_private_message(
- update: Update,
- request: &HttpRequest,
+ activity: AnyBase,
client: &Client,
pool: &DbPool,
chat_server: ChatServerParam,
) -> Result<HttpResponse, LemmyError> {
- let user_uri = &update.actor()?.to_owned().single_xsd_any_uri().unwrap();
+ let update = Update::from_any_base(activity)?.unwrap();
let note = Note::from_any_base(update.object().as_one().unwrap().to_owned())?.unwrap();
- let user = get_or_fetch_and_upsert_user(&user_uri, client, pool).await?;
- verify(request, &user)?;
-
- insert_activity(user.id, update, false, pool).await?;
-
let private_message_form = PrivateMessageForm::from_apub(¬e, client, pool).await?;
let private_message_ap_id = private_message_form.ap_id.clone();
}
async fn receive_delete_private_message(
- delete: Delete,
- request: &HttpRequest,
+ activity: AnyBase,
client: &Client,
pool: &DbPool,
chat_server: ChatServerParam,
) -> Result<HttpResponse, LemmyError> {
- let user_uri = &delete.actor()?.to_owned().single_xsd_any_uri().unwrap();
+ let delete = Delete::from_any_base(activity)?.unwrap();
let note = Note::from_any_base(delete.object().as_one().unwrap().to_owned())?.unwrap();
- let user = get_or_fetch_and_upsert_user(&user_uri, client, pool).await?;
- verify(request, &user)?;
-
- insert_activity(user.id, delete, false, pool).await?;
-
let private_message_form = PrivateMessageForm::from_apub(¬e, client, pool).await?;
let private_message_ap_id = private_message_form.ap_id;
}
async fn receive_undo_delete_private_message(
- undo: Undo,
- request: &HttpRequest,
+ activity: AnyBase,
client: &Client,
pool: &DbPool,
chat_server: ChatServerParam,
) -> Result<HttpResponse, LemmyError> {
+ let undo = Undo::from_any_base(activity)?.unwrap();
let delete = Delete::from_any_base(undo.object().as_one().unwrap().to_owned())?.unwrap();
let note = Note::from_any_base(delete.object().as_one().unwrap().to_owned())?.unwrap();
- let user_uri = &delete.actor()?.to_owned().single_xsd_any_uri().unwrap();
-
- let user = get_or_fetch_and_upsert_user(&user_uri, client, pool).await?;
- verify(request, &user)?;
-
- insert_activity(user.id, delete, false, pool).await?;
let private_message = PrivateMessageForm::from_apub(¬e, client, pool).await?;
}
// Checks if the ID has a valid format, correct scheme, and is in the allowed instance list.
-fn is_apub_id_valid(apub_id: &Url) -> bool {
- debug!("Checking {}", apub_id);
+fn check_is_apub_id_valid(apub_id: &Url) -> Result<(), LemmyError> {
if apub_id.scheme() != get_apub_protocol_string() {
- debug!("invalid scheme: {:?}", apub_id.scheme());
- return false;
+ return Err(anyhow!("invalid apub id scheme: {:?}", apub_id.scheme()).into());
}
- let allowed_instances: Vec<String> = Settings::get()
+ let mut allowed_instances: Vec<String> = Settings::get()
.federation
.allowed_instances
.split(',')
.map(|d| d.to_string())
.collect();
+ // need to allow this explicitly because apub activities might contain objects from our local
+ // instance. replace is needed to remove the port in our federation test setup.
+ let settings = Settings::get();
+ let local_instance = settings.hostname.split(':').collect::<Vec<&str>>();
+ allowed_instances.push(local_instance.first().unwrap().to_string());
+
match apub_id.domain() {
Some(d) => {
let contains = allowed_instances.contains(&d.to_owned());
if !contains {
- debug!("{} not in {:?}", d, allowed_instances);
+ return Err(anyhow!("{} not in federation allowlist", d).into());
}
- contains
- }
- None => {
- debug!("missing domain");
- false
+ Ok(())
}
+ None => Err(anyhow!("federation allowlist is empty").into()),
}
}
projects / lemmy.git / commitdiff