use crate::{
activities::{generate_activity_id, send_lemmy_activity},
- local_instance,
- protocol::activities::following::{accept::AcceptFollowCommunity, follow::FollowCommunity},
- ActorType,
+ insert_received_activity,
+ protocol::activities::following::{accept::AcceptFollow, follow::Follow},
};
use activitypub_federation::{
- core::object_id::ObjectId,
- data::Data,
- traits::ActivityHandler,
- utils::verify_urls_match,
+ config::Data,
+ kinds::activity::AcceptType,
+ protocol::verification::verify_urls_match,
+ traits::{ActivityHandler, Actor},
};
-use activitystreams_kinds::activity::AcceptType;
-use lemmy_api_common::utils::blocking;
+use lemmy_api_common::context::LemmyContext;
use lemmy_db_schema::{source::community::CommunityFollower, traits::Followable};
use lemmy_utils::error::LemmyError;
-use lemmy_websocket::LemmyContext;
use url::Url;
-impl AcceptFollowCommunity {
+impl AcceptFollow {
#[tracing::instrument(skip_all)]
- pub async fn send(
- follow: FollowCommunity,
- context: &LemmyContext,
- request_counter: &mut i32,
- ) -> Result<(), LemmyError> {
- let community = follow
- .object
- .dereference_local::<LemmyError>(context)
- .await?;
- let person = follow
- .actor
- .clone()
- .dereference::<LemmyError>(context, local_instance(context), request_counter)
- .await?;
- let accept = AcceptFollowCommunity {
- actor: ObjectId::new(community.actor_id()),
+ pub async fn send(follow: Follow, context: &Data<LemmyContext>) -> Result<(), LemmyError> {
+ let user_or_community = follow.object.dereference_local(context).await?;
+ let person = follow.actor.clone().dereference(context).await?;
+ let accept = AcceptFollow {
+ actor: user_or_community.id().into(),
+ to: Some([person.id().into()]),
object: follow,
kind: AcceptType::Accept,
id: generate_activity_id(
AcceptType::Accept,
&context.settings().get_protocol_and_hostname(),
)?,
- unparsed: Default::default(),
};
- let inbox = vec![person.inbox_url()];
- send_lemmy_activity(context, &accept, &accept.id, &community, inbox, true).await
+ let inbox = vec![person.shared_inbox_or_inbox()];
+ send_lemmy_activity(context, accept, &user_or_community, inbox, true).await
}
}
/// Handle accepted follows
-#[async_trait::async_trait(?Send)]
-impl ActivityHandler for AcceptFollowCommunity {
+#[async_trait::async_trait]
+impl ActivityHandler for AcceptFollow {
type DataType = LemmyContext;
type Error = LemmyError;
}
#[tracing::instrument(skip_all)]
- async fn verify(
- &self,
- context: &Data<LemmyContext>,
- request_counter: &mut i32,
- ) -> Result<(), LemmyError> {
+ async fn verify(&self, context: &Data<LemmyContext>) -> Result<(), LemmyError> {
+ insert_received_activity(&self.id, context).await?;
verify_urls_match(self.actor.inner(), self.object.object.inner())?;
- self.object.verify(context, request_counter).await?;
+ self.object.verify(context).await?;
+ if let Some(to) = &self.to {
+ verify_urls_match(to[0].inner(), self.object.actor.inner())?;
+ }
Ok(())
}
#[tracing::instrument(skip_all)]
- async fn receive(
- self,
- context: &Data<LemmyContext>,
- request_counter: &mut i32,
- ) -> Result<(), LemmyError> {
- let person = self
- .actor
- .dereference::<LemmyError>(context, local_instance(context), request_counter)
- .await?;
- let community = self
- .object
- .actor
- .dereference::<LemmyError>(context, local_instance(context), request_counter)
- .await?;
+ async fn receive(self, context: &Data<LemmyContext>) -> Result<(), LemmyError> {
+ let community = self.actor.dereference(context).await?;
+ let person = self.object.actor.dereference(context).await?;
// This will throw an error if no follow was requested
- blocking(context.pool(), move |conn| {
- CommunityFollower::follow_accepted(conn, person.id, community.id)
- })
- .await??;
+ let community_id = community.id;
+ let person_id = person.id;
+ CommunityFollower::follow_accepted(&mut context.pool(), community_id, person_id).await?;
Ok(())
}