protocol::activities::community::remove_mod::RemoveMod,
ActorType,
};
-use activitypub_federation::{core::object_id::ObjectId, data::Data, traits::ActivityHandler};
+use activitypub_federation::{
+ core::object_id::ObjectId,
+ data::Data,
+ traits::{ActivityHandler, Actor},
+};
use activitystreams_kinds::{activity::RemoveType, public};
-use lemmy_api_common::utils::blocking;
use lemmy_db_schema::{
source::{
community::{CommunityModerator, CommunityModeratorForm},
id: id.clone(),
cc: vec![community.actor_id()],
kind: RemoveType::Remove,
- unparsed: Default::default(),
};
let activity = AnnouncableActivities::RemoveMod(remove);
- let inboxes = vec![removed_mod.shared_inbox_or_inbox_url()];
- send_activity_in_community(activity, &id, actor, community, inboxes, context).await
+ let inboxes = vec![removed_mod.shared_inbox_or_inbox()];
+ send_activity_in_community(activity, actor, community, inboxes, true, context).await
}
}
verify_mod_action(
&self.actor,
self.object.inner(),
- &community,
+ community.id,
context,
request_counter,
)
let community = self.get_community(context, request_counter).await?;
let remove_mod = self
.object
- .dereference::<LemmyError>(context, local_instance(context), request_counter)
+ .dereference(context, local_instance(context).await, request_counter)
.await?;
let form = CommunityModeratorForm {
community_id: community.id,
person_id: remove_mod.id,
};
- blocking(context.pool(), move |conn| {
- CommunityModerator::leave(conn, &form)
- })
- .await??;
+ CommunityModerator::leave(context.pool(), &form).await?;
// write mod log
let actor = self
.actor
- .dereference::<LemmyError>(context, local_instance(context), request_counter)
+ .dereference(context, local_instance(context).await, request_counter)
.await?;
let form = ModAddCommunityForm {
mod_person_id: actor.id,
community_id: community.id,
removed: Some(true),
};
- blocking(context.pool(), move |conn| {
- ModAddCommunity::create(conn, &form)
- })
- .await??;
+ ModAddCommunity::create(context.pool(), &form).await?;
// TODO: send websocket notification about removed mod
Ok(())