activities::{
generate_activity_id,
send_lemmy_activity,
- verify_activity,
verify_person,
verify_person_in_community,
},
+ fetcher::user_or_community::UserOrCommunity,
+ insert_received_activity,
objects::{community::ApubCommunity, person::ApubPerson},
- protocol::activities::following::{accept::AcceptFollowCommunity, follow::FollowCommunity},
+ protocol::activities::following::{
+ accept::AcceptFollow,
+ follow::Follow,
+ undo_follow::UndoFollow,
+ },
+ SendActivity,
+};
+use activitypub_federation::{
+ config::Data,
+ kinds::activity::FollowType,
+ protocol::verification::verify_urls_match,
+ traits::{ActivityHandler, Actor},
};
-use activitystreams_kinds::activity::FollowType;
-use lemmy_api_common::utils::blocking;
-use lemmy_apub_lib::{
- data::Data,
- object_id::ObjectId,
- traits::{ActivityHandler, ActorType},
+use lemmy_api_common::{
+ community::{BlockCommunity, BlockCommunityResponse},
+ context::LemmyContext,
+ utils::local_user_view_from_jwt,
};
use lemmy_db_schema::{
- source::community::{CommunityFollower, CommunityFollowerForm},
- traits::Followable,
+ source::{
+ community::{Community, CommunityFollower, CommunityFollowerForm},
+ person::{PersonFollower, PersonFollowerForm},
+ },
+ traits::{Crud, Followable},
};
-use lemmy_utils::LemmyError;
-use lemmy_websocket::LemmyContext;
+use lemmy_utils::error::LemmyError;
+use url::Url;
-impl FollowCommunity {
+impl Follow {
pub(in crate::activities::following) fn new(
actor: &ApubPerson,
community: &ApubCommunity,
- context: &LemmyContext,
- ) -> Result<FollowCommunity, LemmyError> {
- Ok(FollowCommunity {
- actor: ObjectId::new(actor.actor_id()),
- object: ObjectId::new(community.actor_id()),
+ context: &Data<LemmyContext>,
+ ) -> Result<Follow, LemmyError> {
+ Ok(Follow {
+ actor: actor.id().into(),
+ object: community.id().into(),
+ to: Some([community.id().into()]),
kind: FollowType::Follow,
id: generate_activity_id(
FollowType::Follow,
&context.settings().get_protocol_and_hostname(),
)?,
- unparsed: Default::default(),
})
}
pub async fn send(
actor: &ApubPerson,
community: &ApubCommunity,
- context: &LemmyContext,
+ context: &Data<LemmyContext>,
) -> Result<(), LemmyError> {
let community_follower_form = CommunityFollowerForm {
community_id: community.id,
person_id: actor.id,
- pending: Some(true),
+ pending: true,
};
- blocking(context.pool(), move |conn| {
- CommunityFollower::follow(conn, &community_follower_form).ok()
- })
- .await?;
+ CommunityFollower::follow(&mut context.pool(), &community_follower_form)
+ .await
+ .ok();
- let follow = FollowCommunity::new(actor, community, context)?;
- let inbox = vec![community.inbox_url.clone().into()];
- send_lemmy_activity(context, &follow, &follow.id, actor, inbox, true).await
+ let follow = Follow::new(actor, community, context)?;
+ let inbox = vec![community.shared_inbox_or_inbox()];
+ send_lemmy_activity(context, follow, actor, inbox, true).await
}
}
-#[async_trait::async_trait(?Send)]
-impl ActivityHandler for FollowCommunity {
+#[async_trait::async_trait]
+impl ActivityHandler for Follow {
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_activity(&self.id, self.actor.inner(), &context.settings())?;
- verify_person(&self.actor, context, request_counter).await?;
- let community = self
- .object
- .dereference(context, context.client(), request_counter)
- .await?;
- verify_person_in_community(&self.actor, &community, context, request_counter).await?;
+ async fn verify(&self, context: &Data<LemmyContext>) -> Result<(), LemmyError> {
+ insert_received_activity(&self.id, context).await?;
+ verify_person(&self.actor, context).await?;
+ let object = self.object.dereference(context).await?;
+ if let UserOrCommunity::Community(c) = object {
+ verify_person_in_community(&self.actor, &c, context).await?;
+ }
+ if let Some(to) = &self.to {
+ verify_urls_match(to[0].inner(), self.object.inner())?;
+ }
Ok(())
}
#[tracing::instrument(skip_all)]
- async fn receive(
- self,
- context: &Data<LemmyContext>,
- request_counter: &mut i32,
- ) -> Result<(), LemmyError> {
- let person = self
- .actor
- .dereference(context, context.client(), request_counter)
- .await?;
- let community = self
- .object
- .dereference(context, context.client(), request_counter)
- .await?;
- let community_follower_form = CommunityFollowerForm {
- community_id: community.id,
- person_id: person.id,
- pending: Some(false),
- };
+ async fn receive(self, context: &Data<LemmyContext>) -> Result<(), LemmyError> {
+ let actor = self.actor.dereference(context).await?;
+ let object = self.object.dereference(context).await?;
+ match object {
+ UserOrCommunity::User(u) => {
+ let form = PersonFollowerForm {
+ person_id: u.id,
+ follower_id: actor.id,
+ pending: false,
+ };
+ PersonFollower::follow(&mut context.pool(), &form).await?;
+ }
+ UserOrCommunity::Community(c) => {
+ let form = CommunityFollowerForm {
+ community_id: c.id,
+ person_id: actor.id,
+ pending: false,
+ };
+ CommunityFollower::follow(&mut context.pool(), &form).await?;
+ }
+ }
- // This will fail if they're already a follower, but ignore the error.
- blocking(context.pool(), move |conn| {
- CommunityFollower::follow(conn, &community_follower_form).ok()
- })
- .await?;
+ AcceptFollow::send(self, context).await
+ }
+}
+
+#[async_trait::async_trait]
+impl SendActivity for BlockCommunity {
+ type Response = BlockCommunityResponse;
- AcceptFollowCommunity::send(self, context, request_counter).await
+ async fn send_activity(
+ request: &Self,
+ _response: &Self::Response,
+ context: &Data<LemmyContext>,
+ ) -> Result<(), LemmyError> {
+ let local_user_view = local_user_view_from_jwt(&request.auth, context).await?;
+ let community = Community::read(&mut context.pool(), request.community_id).await?;
+ UndoFollow::send(&local_user_view.person.into(), &community.into(), context).await
}
}
projects / lemmy.git / blobdiff