verify_person_in_community,
},
fetcher::user_or_community::UserOrCommunity,
- local_instance,
+ insert_activity,
objects::{community::ApubCommunity, person::ApubPerson},
protocol::activities::following::{
accept::AcceptFollow,
follow::Follow,
undo_follow::UndoFollow,
},
- ActorType,
SendActivity,
};
use activitypub_federation::{
- core::object_id::ObjectId,
- data::Data,
+ config::Data,
+ kinds::activity::FollowType,
+ protocol::verification::verify_urls_match,
traits::{ActivityHandler, Actor},
};
-use activitystreams_kinds::activity::FollowType;
use lemmy_api_common::{
community::{BlockCommunity, BlockCommunityResponse},
context::LemmyContext,
- utils::get_local_user_view_from_jwt,
+ utils::local_user_view_from_jwt,
};
use lemmy_db_schema::{
source::{
pub(in crate::activities::following) fn new(
actor: &ApubPerson,
community: &ApubCommunity,
- context: &LemmyContext,
+ context: &Data<LemmyContext>,
) -> Result<Follow, LemmyError> {
Ok(Follow {
- actor: ObjectId::new(actor.actor_id()),
- object: ObjectId::new(community.actor_id()),
+ actor: actor.id().into(),
+ object: community.id().into(),
+ to: Some([community.id().into()]),
kind: FollowType::Follow,
id: generate_activity_id(
FollowType::Follow,
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: true,
};
- CommunityFollower::follow(context.pool(), &community_follower_form)
+ CommunityFollower::follow(&mut context.pool(), &community_follower_form)
.await
.ok();
}
}
-#[async_trait::async_trait(?Send)]
+#[async_trait::async_trait]
impl ActivityHandler for Follow {
type DataType = LemmyContext;
type Error = LemmyError;
}
#[tracing::instrument(skip_all)]
- async fn verify(
- &self,
- context: &Data<LemmyContext>,
- request_counter: &mut i32,
- ) -> Result<(), LemmyError> {
- verify_person(&self.actor, context, request_counter).await?;
- let object = self
- .object
- .dereference(context, local_instance(context).await, request_counter)
- .await?;
+ async fn verify(&self, context: &Data<LemmyContext>) -> Result<(), LemmyError> {
+ 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, request_counter).await?;
+ 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 actor = self
- .actor
- .dereference(context, local_instance(context).await, request_counter)
- .await?;
- let object = self
- .object
- .dereference(context, local_instance(context).await, request_counter)
- .await?;
+ async fn receive(self, context: &Data<LemmyContext>) -> Result<(), LemmyError> {
+ insert_activity(&self.id, &self, false, true, context).await?;
+ let actor = self.actor.dereference(context).await?;
+ let object = self.object.dereference(context).await?;
match object {
UserOrCommunity::User(u) => {
let form = PersonFollowerForm {
follower_id: actor.id,
pending: false,
};
- PersonFollower::follow(context.pool(), &form).await?;
+ PersonFollower::follow(&mut context.pool(), &form).await?;
}
UserOrCommunity::Community(c) => {
let form = CommunityFollowerForm {
person_id: actor.id,
pending: false,
};
- CommunityFollower::follow(context.pool(), &form).await?;
+ CommunityFollower::follow(&mut context.pool(), &form).await?;
}
}
- AcceptFollow::send(self, context, request_counter).await
+ AcceptFollow::send(self, context).await
}
}
-#[async_trait::async_trait(?Send)]
+#[async_trait::async_trait]
impl SendActivity for BlockCommunity {
type Response = BlockCommunityResponse;
async fn send_activity(
request: &Self,
_response: &Self::Response,
- context: &LemmyContext,
+ context: &Data<LemmyContext>,
) -> Result<(), LemmyError> {
- let local_user_view =
- get_local_user_view_from_jwt(&request.auth, context.pool(), context.secret()).await?;
- let community = Community::read(context.pool(), request.community_id).await?;
+ 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
}
}