use crate::{
activities::{generate_activity_id, send_lemmy_activity, verify_activity, verify_person},
- fetcher::object_id::ObjectId,
objects::{community::ApubCommunity, person::ApubPerson},
protocol::activities::following::{follow::FollowCommunity, undo_follow::UndoFollowCommunity},
};
-use activitystreams::activity::kind::UndoType;
-use lemmy_api_common::blocking;
+use activitystreams_kinds::activity::UndoType;
+use lemmy_api_common::utils::blocking;
use lemmy_apub_lib::{
data::Data,
- traits::{ActivityFields, ActivityHandler, ActorType},
+ object_id::ObjectId,
+ traits::{ActivityHandler, ActorType},
verify::verify_urls_match,
};
use lemmy_db_schema::{
use lemmy_websocket::LemmyContext;
impl UndoFollowCommunity {
+ #[tracing::instrument(skip_all)]
pub async fn send(
actor: &ApubPerson,
community: &ApubCommunity,
let object = FollowCommunity::new(actor, community, context)?;
let undo = UndoFollowCommunity {
actor: ObjectId::new(actor.actor_id()),
- to: [ObjectId::new(community.actor_id())],
object,
kind: UndoType::Undo,
id: generate_activity_id(
#[async_trait::async_trait(?Send)]
impl ActivityHandler for UndoFollowCommunity {
type DataType = LemmyContext;
+
+ #[tracing::instrument(skip_all)]
async fn verify(
&self,
context: &Data<LemmyContext>,
request_counter: &mut i32,
) -> Result<(), LemmyError> {
- verify_activity(self, &context.settings())?;
- verify_urls_match(self.to[0].inner(), self.object.object.inner())?;
- verify_urls_match(self.actor(), self.object.actor())?;
+ verify_activity(&self.id, self.actor.inner(), &context.settings())?;
+ verify_urls_match(self.actor.inner(), self.object.actor.inner())?;
verify_person(&self.actor, context, request_counter).await?;
self.object.verify(context, request_counter).await?;
Ok(())
}
+ #[tracing::instrument(skip_all)]
async fn receive(
self,
context: &Data<LemmyContext>,
request_counter: &mut i32,
) -> Result<(), LemmyError> {
- let actor = self.actor.dereference(context, request_counter).await?;
- let community = self.to[0].dereference(context, request_counter).await?;
+ let person = self
+ .actor
+ .dereference(context, context.client(), request_counter)
+ .await?;
+ let community = self
+ .object
+ .object
+ .dereference(context, context.client(), request_counter)
+ .await?;
let community_follower_form = CommunityFollowerForm {
community_id: community.id,
- person_id: actor.id,
- pending: false,
+ person_id: person.id,
+ pending: Some(false),
};
// This will fail if they aren't a follower, but ignore the error.