fetcher::{community::get_or_fetch_and_upsert_community, person::get_or_fetch_and_upsert_person},
ActorType,
};
-use activitystreams::activity::kind::{FollowType, UndoType};
+use activitystreams::{
+ activity::kind::UndoType,
+ base::AnyBase,
+ primitives::OneOrMany,
+ unparsed::Unparsed,
+};
use lemmy_api_common::blocking;
-use lemmy_apub_lib::{verify_urls_match, ActivityCommonFields, ActivityHandler};
+use lemmy_apub_lib::{verify_urls_match, ActivityFields, ActivityHandler};
use lemmy_db_queries::Followable;
use lemmy_db_schema::source::{
community::{Community, CommunityFollower, CommunityFollowerForm},
};
use lemmy_utils::LemmyError;
use lemmy_websocket::LemmyContext;
+use serde::{Deserialize, Serialize};
use url::Url;
-#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize, ActivityFields)]
#[serde(rename_all = "camelCase")]
pub struct UndoFollowCommunity {
+ actor: Url,
to: Url,
object: FollowCommunity,
#[serde(rename = "type")]
kind: UndoType,
+ id: Url,
+ #[serde(rename = "@context")]
+ context: OneOrMany<AnyBase>,
#[serde(flatten)]
- common: ActivityCommonFields,
+ unparsed: Unparsed,
}
impl UndoFollowCommunity {
community: &Community,
context: &LemmyContext,
) -> Result<(), LemmyError> {
- let id = generate_activity_id(UndoType::Undo)?;
+ let object = FollowCommunity::new(actor, community)?;
let undo = UndoFollowCommunity {
+ actor: actor.actor_id(),
to: community.actor_id(),
- object: FollowCommunity {
- to: community.actor_id(),
- object: community.actor_id(),
- kind: FollowType::Follow,
- common: ActivityCommonFields {
- context: lemmy_context(),
- id: generate_activity_id(FollowType::Follow)?,
- actor: actor.actor_id(),
- unparsed: Default::default(),
- },
- },
+ object,
kind: UndoType::Undo,
- common: ActivityCommonFields {
- context: lemmy_context(),
- id: id.clone(),
- actor: actor.actor_id(),
- unparsed: Default::default(),
- },
+ id: generate_activity_id(UndoType::Undo)?,
+ context: lemmy_context(),
+ unparsed: Default::default(),
};
let inbox = vec![community.get_shared_inbox_or_inbox_url()];
- send_activity_new(context, &undo, &id, actor, inbox, true).await
+ send_activity_new(context, &undo, &undo.id, actor, inbox, true).await
}
}
context: &LemmyContext,
request_counter: &mut i32,
) -> Result<(), LemmyError> {
- verify_activity(self.common())?;
+ verify_activity(self)?;
verify_urls_match(&self.to, &self.object.object)?;
- verify_urls_match(&self.common.actor, &self.object.common.actor)?;
- verify_person(&self.common.actor, context, request_counter).await?;
+ verify_urls_match(&self.actor, self.object.actor())?;
+ verify_person(&self.actor, context, request_counter).await?;
self.object.verify(context, request_counter).await?;
Ok(())
}
context: &LemmyContext,
request_counter: &mut i32,
) -> Result<(), LemmyError> {
- let actor =
- get_or_fetch_and_upsert_person(&self.common.actor, context, request_counter).await?;
+ let actor = get_or_fetch_and_upsert_person(&self.actor, context, request_counter).await?;
let community = get_or_fetch_and_upsert_community(&self.to, context, request_counter).await?;
let community_follower_form = CommunityFollowerForm {
.await?;
Ok(())
}
-
- fn common(&self) -> &ActivityCommonFields {
- &self.common
- }
}