use crate::{
activities::{
- community::{announce::GetCommunity, send_activity_in_community},
generate_activity_id,
- verify_activity,
- verify_is_public,
verify_person_in_community,
voting::{undo_vote_comment, undo_vote_post},
},
- activity_lists::AnnouncableActivities,
+ insert_received_activity,
objects::{community::ApubCommunity, person::ApubPerson},
- protocol::activities::voting::{
- undo_vote::UndoVote,
- vote::{Vote, VoteType},
+ protocol::{
+ activities::voting::{undo_vote::UndoVote, vote::Vote},
+ InCommunity,
},
PostOrComment,
};
-use activitystreams_kinds::{activity::UndoType, public};
-use lemmy_api_common::utils::blocking;
-use lemmy_apub_lib::{
- data::Data,
- object_id::ObjectId,
- traits::{ActivityHandler, ActorType},
- verify::verify_urls_match,
+use activitypub_federation::{
+ config::Data,
+ kinds::activity::UndoType,
+ protocol::verification::verify_urls_match,
+ traits::{ActivityHandler, Actor},
};
-use lemmy_db_schema::{newtypes::CommunityId, source::community::Community, traits::Crud};
-use lemmy_utils::LemmyError;
-use lemmy_websocket::LemmyContext;
+use lemmy_api_common::context::LemmyContext;
+use lemmy_utils::error::LemmyError;
+use url::Url;
impl UndoVote {
- /// UndoVote has as:Public value in cc field, unlike other activities. This indicates to other
- /// software (like GNU social, or presumably Mastodon), that the like actor should not be
- /// disclosed.
- #[tracing::instrument(skip_all)]
- pub async fn send(
- object: &PostOrComment,
+ pub(in crate::activities::voting) fn new(
+ vote: Vote,
actor: &ApubPerson,
- community_id: CommunityId,
- kind: VoteType,
- context: &LemmyContext,
- ) -> Result<(), LemmyError> {
- let community: ApubCommunity = blocking(context.pool(), move |conn| {
- Community::read(conn, community_id)
- })
- .await??
- .into();
-
- let object = Vote::new(object, actor, &community, kind.clone(), context)?;
- let id = generate_activity_id(
- UndoType::Undo,
- &context.settings().get_protocol_and_hostname(),
- )?;
- let undo_vote = UndoVote {
- actor: ObjectId::new(actor.actor_id()),
- to: vec![community.actor_id()],
- object,
- cc: vec![public()],
+ community: &ApubCommunity,
+ context: &Data<LemmyContext>,
+ ) -> Result<Self, LemmyError> {
+ Ok(UndoVote {
+ actor: actor.id().into(),
+ object: vote,
kind: UndoType::Undo,
- id: id.clone(),
- unparsed: Default::default(),
- };
- let activity = AnnouncableActivities::UndoVote(undo_vote);
- send_activity_in_community(activity, &id, actor, &community, vec![], context).await
+ id: generate_activity_id(
+ UndoType::Undo,
+ &context.settings().get_protocol_and_hostname(),
+ )?,
+ audience: Some(community.id().into()),
+ })
}
}
-#[async_trait::async_trait(?Send)]
+#[async_trait::async_trait]
impl ActivityHandler for UndoVote {
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_is_public(&self.to, &self.cc)?;
- verify_activity(&self.id, self.actor.inner(), &context.settings())?;
- let community = self.get_community(context, 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?;
+ let community = self.community(context).await?;
+ verify_person_in_community(&self.actor, &community, context).await?;
verify_urls_match(self.actor.inner(), self.object.actor.inner())?;
- self.object.verify(context, request_counter).await?;
+ self.object.verify(context).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, context.client(), request_counter)
- .await?;
- let object = self
- .object
- .object
- .dereference(context, context.client(), request_counter)
- .await?;
+ async fn receive(self, context: &Data<LemmyContext>) -> Result<(), LemmyError> {
+ let actor = self.actor.dereference(context).await?;
+ let object = self.object.object.dereference(context).await?;
match object {
PostOrComment::Post(p) => undo_vote_post(actor, &p, context).await,
PostOrComment::Comment(c) => undo_vote_comment(actor, &c, context).await,
}
}
}
-
-#[async_trait::async_trait(?Send)]
-impl GetCommunity for UndoVote {
- #[tracing::instrument(skip_all)]
- async fn get_community(
- &self,
- context: &LemmyContext,
- request_counter: &mut i32,
- ) -> Result<ApubCommunity, LemmyError> {
- self.object.get_community(context, request_counter).await
- }
-}