use crate::{
activities::{
- community::announce::AnnouncableActivities,
- deletion::{delete::receive_remove_action, verify_delete_activity},
+ community::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_queue::send_to_community_new,
- extensions::context::lemmy_context,
- fetcher::object_id::ObjectId,
- generate_moderators_url,
+ activity_lists::AnnouncableActivities,
+ local_instance,
+ objects::{community::ApubCommunity, person::ApubPerson},
+ protocol::{activities::community::remove_mod::RemoveMod, InCommunity},
ActorType,
};
-use activitystreams::{
- activity::kind::RemoveType,
- base::AnyBase,
- primitives::OneOrMany,
- unparsed::Unparsed,
+use activitypub_federation::{
+ core::object_id::ObjectId,
+ data::Data,
+ traits::{ActivityHandler, Actor},
};
-use lemmy_api_common::blocking;
-use lemmy_apub_lib::{values::PublicUrl, ActivityFields, ActivityHandler};
-use lemmy_db_queries::Joinable;
-use lemmy_db_schema::source::{
- community::{Community, CommunityModerator, CommunityModeratorForm},
- person::Person,
+use activitystreams_kinds::{activity::RemoveType, public};
+use lemmy_api_common::{context::LemmyContext, utils::generate_moderators_url};
+use lemmy_db_schema::{
+ source::{
+ community::{CommunityModerator, CommunityModeratorForm},
+ moderator::{ModAddCommunity, ModAddCommunityForm},
+ },
+ traits::{Crud, Joinable},
};
-use lemmy_utils::LemmyError;
-use lemmy_websocket::LemmyContext;
-use serde::{Deserialize, Serialize};
+use lemmy_utils::error::LemmyError;
use url::Url;
-#[derive(Clone, Debug, Deserialize, Serialize, ActivityFields)]
-#[serde(rename_all = "camelCase")]
-pub struct RemoveMod {
- actor: ObjectId<Person>,
- to: [PublicUrl; 1],
- pub(in crate::activities) object: ObjectId<Person>,
- cc: [ObjectId<Community>; 1],
- #[serde(rename = "type")]
- kind: RemoveType,
- // if target is set, this is means remove mod from community
- pub(in crate::activities) target: Option<Url>,
- id: Url,
- #[serde(rename = "@context")]
- context: OneOrMany<AnyBase>,
- #[serde(flatten)]
- unparsed: Unparsed,
-}
-
impl RemoveMod {
+ #[tracing::instrument(skip_all)]
pub async fn send(
- community: &Community,
- removed_mod: &Person,
- actor: &Person,
+ community: &ApubCommunity,
+ removed_mod: &ApubPerson,
+ actor: &ApubPerson,
context: &LemmyContext,
) -> Result<(), LemmyError> {
- let id = generate_activity_id(RemoveType::Remove)?;
+ let id = generate_activity_id(
+ RemoveType::Remove,
+ &context.settings().get_protocol_and_hostname(),
+ )?;
let remove = RemoveMod {
actor: ObjectId::new(actor.actor_id()),
- to: [PublicUrl::Public],
+ to: vec![public()],
object: ObjectId::new(removed_mod.actor_id()),
- target: Some(generate_moderators_url(&community.actor_id)?.into()),
+ target: generate_moderators_url(&community.actor_id)?.into(),
id: id.clone(),
- context: lemmy_context(),
- cc: [ObjectId::new(community.actor_id())],
+ cc: vec![community.actor_id()],
kind: RemoveType::Remove,
- unparsed: Default::default(),
+ audience: Some(ObjectId::new(community.actor_id())),
};
let activity = AnnouncableActivities::RemoveMod(remove);
- let inboxes = vec![removed_mod.get_shared_inbox_or_inbox_url()];
- send_to_community_new(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: &LemmyContext,
+ context: &Data<LemmyContext>,
request_counter: &mut i32,
) -> Result<(), LemmyError> {
- verify_activity(self)?;
- if let Some(target) = &self.target {
- verify_person_in_community(&self.actor, &self.cc[0], context, request_counter).await?;
- verify_mod_action(&self.actor, self.cc[0].clone(), context).await?;
- verify_add_remove_moderator_target(target, &self.cc[0])?;
- } else {
- verify_delete_activity(
- self.object.inner(),
- self,
- &self.cc[0],
- true,
- context,
- request_counter,
- )
- .await?;
- }
+ verify_is_public(&self.to, &self.cc)?;
+ let community = self.community(context, request_counter).await?;
+ verify_person_in_community(&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: &LemmyContext,
+ context: &Data<LemmyContext>,
request_counter: &mut i32,
) -> Result<(), LemmyError> {
- if self.target.is_some() {
- let community = self.cc[0].dereference(context, request_counter).await?;
- let remove_mod = self.object.dereference(context, request_counter).await?;
+ let community = self.community(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,
+ };
+ CommunityModerator::leave(context.pool(), &form).await?;
- let form = CommunityModeratorForm {
- community_id: community.id,
- person_id: remove_mod.id,
- };
- blocking(context.pool(), move |conn| {
- CommunityModerator::leave(conn, &form)
- })
- .await??;
- // TODO: send websocket notification about removed mod
- Ok(())
- } else {
- receive_remove_action(
- &self.actor,
- self.object.inner(),
- None,
- context,
- request_counter,
- )
- .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(())
}
}
projects / lemmy.git / blobdiff