use crate::{
activities::{
- community::{announce::GetCommunity, get_community_from_moderators_url, send_to_community},
+ community::{
+ announce::GetCommunity,
+ get_community_from_moderators_url,
+ send_activity_in_community,
+ },
generate_activity_id,
- verify_activity,
verify_add_remove_moderator_target,
verify_is_public,
verify_mod_action,
verify_person_in_community,
},
activity_lists::AnnouncableActivities,
- fetcher::object_id::ObjectId,
generate_moderators_url,
+ local_instance,
objects::{community::ApubCommunity, person::ApubPerson},
protocol::activities::community::remove_mod::RemoveMod,
+ ActorType,
};
-use activitystreams::{activity::kind::RemoveType, public};
-use lemmy_api_common::blocking;
-use lemmy_apub_lib::{
+use activitypub_federation::{
+ core::object_id::ObjectId,
data::Data,
- traits::{ActivityHandler, ActorType},
+ traits::{ActivityHandler, Actor},
};
+use activitystreams_kinds::{activity::RemoveType, public};
use lemmy_db_schema::{
- source::community::{CommunityModerator, CommunityModeratorForm},
- traits::Joinable,
+ source::{
+ community::{CommunityModerator, CommunityModeratorForm},
+ moderator::{ModAddCommunity, ModAddCommunityForm},
+ },
+ traits::{Crud, Joinable},
};
-use lemmy_utils::LemmyError;
+use lemmy_utils::error::LemmyError;
use lemmy_websocket::LemmyContext;
+use url::Url;
impl RemoveMod {
+ #[tracing::instrument(skip_all)]
pub async fn send(
community: &ApubCommunity,
removed_mod: &ApubPerson,
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_to_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
}
}
#[async_trait::async_trait(?Send)]
impl ActivityHandler for RemoveMod {
type DataType = LemmyContext;
+ type Error = LemmyError;
+
+ fn id(&self) -> &Url {
+ &self.id
+ }
+
+ fn actor(&self) -> &Url {
+ self.actor.inner()
+ }
+
+ #[tracing::instrument(skip_all)]
async fn verify(
&self,
context: &Data<LemmyContext>,
request_counter: &mut i32,
) -> Result<(), LemmyError> {
- verify_is_public(&self.to)?;
- verify_activity(self, &context.settings())?;
+ verify_is_public(&self.to, &self.cc)?;
let community = self.get_community(context, request_counter).await?;
verify_person_in_community(&self.actor, &community, context, request_counter).await?;
- verify_mod_action(&self.actor, &community, context, request_counter).await?;
+ verify_mod_action(
+ &self.actor,
+ self.object.inner(),
+ community.id,
+ context,
+ request_counter,
+ )
+ .await?;
verify_add_remove_moderator_target(&self.target, &community)?;
Ok(())
}
+ #[tracing::instrument(skip_all)]
async fn receive(
self,
context: &Data<LemmyContext>,
request_counter: &mut i32,
) -> Result<(), LemmyError> {
let community = self.get_community(context, request_counter).await?;
- let remove_mod = self.object.dereference(context, request_counter).await?;
+ let remove_mod = self
+ .object
+ .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(context, local_instance(context).await, request_counter)
+ .await?;
+ let form = ModAddCommunityForm {
+ mod_person_id: actor.id,
+ other_person_id: remove_mod.id,
+ community_id: community.id,
+ removed: Some(true),
+ };
+ ModAddCommunity::create(context.pool(), &form).await?;
+
// TODO: send websocket notification about removed mod
Ok(())
}
#[async_trait::async_trait(?Send)]
impl GetCommunity for RemoveMod {
+ #[tracing::instrument(skip_all)]
async fn get_community(
&self,
context: &LemmyContext,