use crate::{
activities::{
- verify_activity,
+ community::send_activity_in_community,
+ generate_activity_id,
verify_add_remove_moderator_target,
+ verify_is_public,
verify_mod_action,
verify_person_in_community,
},
- fetcher::{community::get_or_fetch_and_upsert_community, person::get_or_fetch_and_upsert_person},
- CommunityType,
+ activity_lists::AnnouncableActivities,
+ local_instance,
+ objects::{community::ApubCommunity, person::ApubPerson},
+ protocol::{
+ activities::community::{add_mod::AddMod, remove_mod::RemoveMod},
+ InCommunity,
+ },
+ ActorType,
+ SendActivity,
+};
+use activitypub_federation::{
+ core::object_id::ObjectId,
+ data::Data,
+ traits::{ActivityHandler, Actor},
};
-use activitystreams::{activity::kind::AddType, base::AnyBase};
-use lemmy_api_common::blocking;
-use lemmy_apub_lib::{ActivityCommonFields, ActivityHandler, PublicUrl};
-use lemmy_db_queries::{source::community::CommunityModerator_, Joinable};
-use lemmy_db_schema::source::community::{CommunityModerator, CommunityModeratorForm};
-use lemmy_utils::LemmyError;
-use lemmy_websocket::LemmyContext;
+use activitystreams_kinds::{activity::AddType, public};
+use lemmy_api_common::{
+ community::{AddModToCommunity, AddModToCommunityResponse},
+ context::LemmyContext,
+ utils::{generate_moderators_url, get_local_user_view_from_jwt},
+};
+use lemmy_db_schema::{
+ source::{
+ community::{Community, CommunityModerator, CommunityModeratorForm},
+ moderator::{ModAddCommunity, ModAddCommunityForm},
+ person::Person,
+ },
+ traits::{Crud, Joinable},
+};
+use lemmy_utils::error::LemmyError;
use url::Url;
-#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct AddMod {
- to: PublicUrl,
- object: Url,
- target: Url,
- cc: [Url; 1],
- #[serde(rename = "type")]
- kind: AddType,
- #[serde(flatten)]
- common: ActivityCommonFields,
+impl AddMod {
+ #[tracing::instrument(skip_all)]
+ pub async fn send(
+ community: &ApubCommunity,
+ added_mod: &ApubPerson,
+ actor: &ApubPerson,
+ context: &LemmyContext,
+ ) -> Result<(), LemmyError> {
+ let id = generate_activity_id(
+ AddType::Add,
+ &context.settings().get_protocol_and_hostname(),
+ )?;
+ let add = AddMod {
+ actor: ObjectId::new(actor.actor_id()),
+ to: vec![public()],
+ object: ObjectId::new(added_mod.actor_id()),
+ target: generate_moderators_url(&community.actor_id)?.into(),
+ cc: vec![community.actor_id()],
+ kind: AddType::Add,
+ id: id.clone(),
+ audience: Some(ObjectId::new(community.actor_id())),
+ };
+
+ let activity = AnnouncableActivities::AddMod(add);
+ let inboxes = vec![added_mod.shared_inbox_or_inbox()];
+ send_activity_in_community(activity, actor, community, inboxes, true, context).await
+ }
}
#[async_trait::async_trait(?Send)]
impl ActivityHandler for AddMod {
+ 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.common())?;
- verify_person_in_community(&self.common.actor, &self.cc, context, request_counter).await?;
- verify_mod_action(&self.common.actor, self.cc[0].clone(), context).await?;
- verify_add_remove_moderator_target(&self.target, self.cc[0].clone())?;
+ 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,
+ self,
+ context: &Data<LemmyContext>,
request_counter: &mut i32,
) -> Result<(), LemmyError> {
- let community =
- get_or_fetch_and_upsert_community(&self.cc[0], context, request_counter).await?;
- let new_mod = get_or_fetch_and_upsert_person(&self.object, context, request_counter).await?;
+ let community = self.community(context, request_counter).await?;
+ let new_mod = self
+ .object
+ .dereference(context, local_instance(context).await, request_counter)
+ .await?;
// If we had to refetch the community while parsing the activity, then the new mod has already
// been added. Skip it here as it would result in a duplicate key error.
let new_mod_id = new_mod.id;
- let moderated_communities = blocking(context.pool(), move |conn| {
- CommunityModerator::get_person_moderated_communities(conn, new_mod_id)
- })
- .await??;
+ let moderated_communities =
+ CommunityModerator::get_person_moderated_communities(context.pool(), new_mod_id).await?;
if !moderated_communities.contains(&community.id) {
let form = CommunityModeratorForm {
community_id: community.id,
person_id: new_mod.id,
};
- blocking(context.pool(), move |conn| {
- CommunityModerator::join(conn, &form)
- })
- .await??;
- }
- if community.local {
- let anybase = AnyBase::from_arbitrary_json(serde_json::to_string(self)?)?;
- community
- .send_announce(anybase, Some(self.object.clone()), context)
+ CommunityModerator::join(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: new_mod.id,
+ community_id: community.id,
+ removed: Some(false),
+ };
+ ModAddCommunity::create(context.pool(), &form).await?;
}
// TODO: send websocket notification about added mod
Ok(())
}
+}
+
+#[async_trait::async_trait(?Send)]
+impl SendActivity for AddModToCommunity {
+ type Response = AddModToCommunityResponse;
- fn common(&self) -> &ActivityCommonFields {
- &self.common
+ async fn send_activity(
+ request: &Self,
+ _response: &Self::Response,
+ context: &LemmyContext,
+ ) -> Result<(), LemmyError> {
+ let local_user_view =
+ get_local_user_view_from_jwt(&request.auth, context.pool(), context.secret()).await?;
+ let community: ApubCommunity = Community::read(context.pool(), request.community_id)
+ .await?
+ .into();
+ let updated_mod: ApubPerson = Person::read(context.pool(), request.person_id)
+ .await?
+ .into();
+ if request.added {
+ AddMod::send(
+ &community,
+ &updated_mod,
+ &local_user_view.person.into(),
+ context,
+ )
+ .await
+ } else {
+ RemoveMod::send(
+ &community,
+ &updated_mod,
+ &local_user_view.person.into(),
+ context,
+ )
+ .await
+ }
}
}
projects / lemmy.git / blobdiff