community::*,
get_local_user_view_from_jwt,
is_mod_or_admin,
+ remove_user_data_in_community,
};
use lemmy_apub::{
+ activities::block::SiteOrCommunity,
objects::{community::ApubCommunity, person::ApubPerson},
protocol::activities::{
- community::{
- add_mod::AddMod,
- block_user::BlockUserFromCommunity,
- remove_mod::RemoveMod,
- undo_block_user::UndoBlockUserFromCommunity,
- },
+ block::{block_user::BlockUser, undo_block_user::UndoBlockUser},
+ community::{add_mod::AddMod, remove_mod::RemoveMod},
following::{follow::FollowCommunity as FollowCommunityApub, undo_follow::UndoFollowCommunity},
},
};
use lemmy_db_schema::{
source::{
- comment::Comment,
community::{
Community,
CommunityFollower,
ModTransferCommunityForm,
},
person::Person,
- post::Post,
- site::Site,
},
traits::{Bannable, Blockable, Crud, Followable, Joinable},
};
-use lemmy_db_views::comment_view::CommentQueryBuilder;
use lemmy_db_views_actor::{
community_moderator_view::CommunityModeratorView,
community_view::CommunityView,
person_view::PersonViewSafe,
};
-use lemmy_utils::{location_info, utils::naive_from_unix, ApiError, ConnectionId, LemmyError};
+use lemmy_utils::{location_info, utils::naive_from_unix, ConnectionId, LemmyError};
use lemmy_websocket::{messages::SendCommunityRoomMessage, LemmyContext, UserOperation};
#[async_trait::async_trait(?Send)]
impl Perform for FollowCommunity {
type Response = CommunityResponse;
+ #[tracing::instrument(skip(context, _websocket_id))]
async fn perform(
&self,
context: &Data<LemmyContext>,
let follow = move |conn: &'_ _| CommunityFollower::follow(conn, &community_follower_form);
blocking(context.pool(), follow)
.await?
- .map_err(|e| ApiError::err("community_follower_already_exists", e))?;
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("community_follower_already_exists"))?;
} else {
let unfollow =
move |conn: &'_ _| CommunityFollower::unfollow(conn, &community_follower_form);
blocking(context.pool(), unfollow)
.await?
- .map_err(|e| ApiError::err("community_follower_already_exists", e))?;
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("community_follower_already_exists"))?;
}
} else if data.follow {
// Dont actually add to the community followers here, because you need
let unfollow = move |conn: &'_ _| CommunityFollower::unfollow(conn, &community_follower_form);
blocking(context.pool(), unfollow)
.await?
- .map_err(|e| ApiError::err("community_follower_already_exists", e))?;
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("community_follower_already_exists"))?;
}
let community_id = data.community_id;
impl Perform for BlockCommunity {
type Response = BlockCommunityResponse;
+ #[tracing::instrument(skip(context, _websocket_id))]
async fn perform(
&self,
context: &Data<LemmyContext>,
let block = move |conn: &'_ _| CommunityBlock::block(conn, &community_block_form);
blocking(context.pool(), block)
.await?
- .map_err(|e| ApiError::err("community_block_already_exists", e))?;
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("community_block_already_exists"))?;
// Also, unfollow the community, and send a federated unfollow
let community_follower_form = CommunityFollowerForm {
let unblock = move |conn: &'_ _| CommunityBlock::unblock(conn, &community_block_form);
blocking(context.pool(), unblock)
.await?
- .map_err(|e| ApiError::err("community_block_already_exists", e))?;
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("community_block_already_exists"))?;
}
let community_view = blocking(context.pool(), move |conn| {
impl Perform for BanFromCommunity {
type Response = BanFromCommunityResponse;
+ #[tracing::instrument(skip(context, websocket_id))]
async fn perform(
&self,
context: &Data<LemmyContext>,
let community_id = data.community_id;
let banned_person_id = data.person_id;
+ let remove_data = data.remove_data.unwrap_or(false);
+ let expires = data.expires.map(naive_from_unix);
// Verify that only mods or admins can ban
is_mod_or_admin(context.pool(), local_user_view.person.id, community_id).await?;
let community_user_ban_form = CommunityPersonBanForm {
community_id: data.community_id,
person_id: data.person_id,
+ expires: Some(expires),
};
let community: ApubCommunity = blocking(context.pool(), move |conn: &'_ _| {
let ban = move |conn: &'_ _| CommunityPersonBan::ban(conn, &community_user_ban_form);
blocking(context.pool(), ban)
.await?
- .map_err(|e| ApiError::err("community_user_already_banned", e))?;
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("community_user_already_banned"))?;
// Also unsubscribe them from the community, if they are subscribed
let community_follower_form = CommunityFollowerForm {
.await?
.ok();
- BlockUserFromCommunity::send(
- &community,
+ BlockUser::send(
+ &SiteOrCommunity::Community(community),
&banned_person,
&local_user_view.person.clone().into(),
+ remove_data,
+ data.reason.clone(),
+ expires,
context,
)
.await?;
let unban = move |conn: &'_ _| CommunityPersonBan::unban(conn, &community_user_ban_form);
blocking(context.pool(), unban)
.await?
- .map_err(|e| ApiError::err("community_user_already_banned", e))?;
- UndoBlockUserFromCommunity::send(
- &community,
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("community_user_already_banned"))?;
+ UndoBlockUser::send(
+ &SiteOrCommunity::Community(community),
&banned_person,
&local_user_view.person.clone().into(),
+ data.reason.clone(),
context,
)
.await?;
}
// Remove/Restore their data if that's desired
- if data.remove_data.unwrap_or(false) {
- // Posts
- blocking(context.pool(), move |conn: &'_ _| {
- Post::update_removed_for_creator(conn, banned_person_id, Some(community_id), true)
- })
- .await??;
-
- // Comments
- // TODO Diesel doesn't allow updates with joins, so this has to be a loop
- let comments = blocking(context.pool(), move |conn| {
- CommentQueryBuilder::create(conn)
- .creator_id(banned_person_id)
- .community_id(community_id)
- .limit(std::i64::MAX)
- .list()
- })
- .await??;
-
- for comment_view in &comments {
- let comment_id = comment_view.comment.id;
- blocking(context.pool(), move |conn: &'_ _| {
- Comment::update_removed(conn, comment_id, true)
- })
- .await??;
- }
+ if remove_data {
+ remove_user_data_in_community(community_id, banned_person_id, context.pool()).await?;
}
// Mod tables
- // TODO eventually do correct expires
- let expires = data.expires.map(naive_from_unix);
-
let form = ModBanFromCommunityForm {
mod_person_id: local_user_view.person.id,
other_person_id: data.person_id,
impl Perform for AddModToCommunity {
type Response = AddModToCommunityResponse;
+ #[tracing::instrument(skip(context, websocket_id))]
async fn perform(
&self,
context: &Data<LemmyContext>,
let join = move |conn: &'_ _| CommunityModerator::join(conn, &community_moderator_form);
blocking(context.pool(), join)
.await?
- .map_err(|e| ApiError::err("community_moderator_already_exists", e))?;
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("community_moderator_already_exists"))?;
} else {
let leave = move |conn: &'_ _| CommunityModerator::leave(conn, &community_moderator_form);
blocking(context.pool(), leave)
.await?
- .map_err(|e| ApiError::err("community_moderator_already_exists", e))?;
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("community_moderator_already_exists"))?;
}
// Mod tables
impl Perform for TransferCommunity {
type Response = GetCommunityResponse;
+ #[tracing::instrument(skip(context, _websocket_id))]
async fn perform(
&self,
context: &Data<LemmyContext>,
let local_user_view =
get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
- let site_creator_id = blocking(context.pool(), move |conn| {
- Site::read(conn, 1).map(|s| s.creator_id)
- })
- .await??;
-
- let mut admins = blocking(context.pool(), PersonViewSafe::admins).await??;
-
- // Making sure the site creator, if an admin, is at the top
- let creator_index = admins
- .iter()
- .position(|r| r.person.id == site_creator_id)
- .context(location_info!())?;
- let creator_person = admins.remove(creator_index);
- admins.insert(0, creator_person);
+ let admins = blocking(context.pool(), PersonViewSafe::admins).await??;
// Fetch the community mods
let community_id = data.community_id;
.map(|a| a.person.id)
.any(|x| x == local_user_view.person.id)
{
- return Err(ApiError::err_plain("not_an_admin").into());
+ return Err(LemmyError::from_message("not_an_admin"));
}
// You have to re-do the community_moderator table, reordering it.
let join = move |conn: &'_ _| CommunityModerator::join(conn, &community_moderator_form);
blocking(context.pool(), join)
.await?
- .map_err(|e| ApiError::err("community_moderator_already_exists", e))?;
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("community_moderator_already_exists"))?;
}
// Mod tables
CommunityView::read(conn, community_id, Some(person_id))
})
.await?
- .map_err(|e| ApiError::err("couldnt_find_community", e))?;
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("couldnt_find_community"))?;
let community_id = data.community_id;
let moderators = blocking(context.pool(), move |conn| {
CommunityModeratorView::for_community(conn, community_id)
})
.await?
- .map_err(|e| ApiError::err("couldnt_find_community", e))?;
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("couldnt_find_community"))?;
// Return the jwt
Ok(GetCommunityResponse {
projects / lemmy.git / blobdiff