get_local_user_view_from_jwt,
is_mod_or_admin,
};
-use lemmy_apub::activities::{
- community::{
- add_mod::AddMod,
- block_user::BlockUserFromCommunity,
- remove_mod::RemoveMod,
- undo_block_user::UndoBlockUserFromCommunity,
+use lemmy_apub::{
+ objects::{community::ApubCommunity, person::ApubPerson},
+ protocol::activities::{
+ community::{
+ add_mod::AddMod,
+ block_user::BlockUserFromCommunity,
+ remove_mod::RemoveMod,
+ undo_block_user::UndoBlockUserFromCommunity,
+ },
+ following::{follow::FollowCommunity as FollowCommunityApub, undo_follow::UndoFollowCommunity},
},
- following::{follow::FollowCommunity as FollowCommunityApub, undo::UndoFollowCommunity},
};
use lemmy_db_schema::{
source::{
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>,
get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
let community_id = data.community_id;
- let community = blocking(context.pool(), move |conn| {
+ let community: ApubCommunity = blocking(context.pool(), move |conn| {
Community::read(conn, community_id)
})
- .await??;
+ .await??
+ .into();
let community_follower_form = CommunityFollowerForm {
community_id: data.community_id,
person_id: local_user_view.person.id,
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
// to wait for the accept
- FollowCommunityApub::send(&local_user_view.person, &community, context).await?;
+ FollowCommunityApub::send(&local_user_view.person.clone().into(), &community, context)
+ .await?;
} else {
- UndoFollowCommunity::send(&local_user_view.person, &community, context).await?;
+ UndoFollowCommunity::send(&local_user_view.person.clone().into(), &community, context)
+ .await?;
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 {
Community::read(conn, community_id)
})
.await??;
- UndoFollowCommunity::send(&local_user_view.person, &community, context).await?;
+ UndoFollowCommunity::send(&local_user_view.person.into(), &community.into(), context).await?;
} else {
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 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 = blocking(context.pool(), move |conn: &'_ _| {
+ let community: ApubCommunity = blocking(context.pool(), move |conn: &'_ _| {
Community::read(conn, community_id)
})
- .await??;
- let banned_person = blocking(context.pool(), move |conn: &'_ _| {
+ .await??
+ .into();
+ let banned_person: ApubPerson = blocking(context.pool(), move |conn: &'_ _| {
Person::read(conn, banned_person_id)
})
- .await??;
+ .await??
+ .into();
if data.ban {
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, &banned_person, &local_user_view.person, context)
- .await?;
+ BlockUserFromCommunity::send(
+ &community,
+ &banned_person,
+ &local_user_view.person.clone().into(),
+ expires,
+ context,
+ )
+ .await?;
} else {
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))?;
+ .map_err(LemmyError::from)
+ .map_err(|e| e.with_message("community_user_already_banned"))?;
UndoBlockUserFromCommunity::send(
&community,
&banned_person,
- &local_user_view.person,
+ &local_user_view.person.clone().into(),
context,
)
.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
// Send to federated instances
let updated_mod_id = data.person_id;
- let updated_mod = blocking(context.pool(), move |conn| {
+ let updated_mod: ApubPerson = blocking(context.pool(), move |conn| {
Person::read(conn, updated_mod_id)
})
- .await??;
- let community = blocking(context.pool(), move |conn| {
+ .await??
+ .into();
+ let community: ApubCommunity = blocking(context.pool(), move |conn| {
Community::read(conn, community_id)
})
- .await??;
+ .await??
+ .into();
if data.added {
- AddMod::send(&community, &updated_mod, &local_user_view.person, context).await?;
+ AddMod::send(
+ &community,
+ &updated_mod,
+ &local_user_view.person.into(),
+ context,
+ )
+ .await?;
} else {
- RemoveMod::send(&community, &updated_mod, &local_user_view.person, context).await?;
+ RemoveMod::send(
+ &community,
+ &updated_mod,
+ &local_user_view.person.into(),
+ context,
+ )
+ .await?;
}
// Note: in case a remote mod is added, this returns the old moderators list, it will only get
impl Perform for TransferCommunity {
type Response = GetCommunityResponse;
+ #[tracing::instrument(skip(context, _websocket_id))]
async fn perform(
&self,
context: &Data<LemmyContext>,
.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