use crate::{
- activities::{generate_activity_id, send_lemmy_activity, verify_activity, verify_person},
+ activities::{generate_activity_id, send_lemmy_activity, verify_person},
+ fetcher::user_or_community::UserOrCommunity,
+ local_instance,
objects::{community::ApubCommunity, person::ApubPerson},
- protocol::activities::following::{follow::FollowCommunity, undo_follow::UndoFollowCommunity},
+ protocol::activities::following::{follow::Follow, undo_follow::UndoFollow},
+ ActorType,
};
-use activitystreams_kinds::activity::UndoType;
-use lemmy_api_common::utils::blocking;
-use lemmy_apub_lib::{
+use activitypub_federation::{
+ core::object_id::ObjectId,
data::Data,
- object_id::ObjectId,
- traits::{ActivityHandler, ActorType},
- verify::verify_urls_match,
+ traits::{ActivityHandler, Actor},
+ utils::verify_urls_match,
};
+use activitystreams_kinds::activity::UndoType;
use lemmy_db_schema::{
- source::community::{CommunityFollower, CommunityFollowerForm},
+ source::{
+ community::{CommunityFollower, CommunityFollowerForm},
+ person::{PersonFollower, PersonFollowerForm},
+ },
traits::Followable,
};
-use lemmy_utils::LemmyError;
+use lemmy_utils::error::LemmyError;
use lemmy_websocket::LemmyContext;
+use url::Url;
-impl UndoFollowCommunity {
+impl UndoFollow {
#[tracing::instrument(skip_all)]
pub async fn send(
actor: &ApubPerson,
community: &ApubCommunity,
context: &LemmyContext,
) -> Result<(), LemmyError> {
- let object = FollowCommunity::new(actor, community, context)?;
- let undo = UndoFollowCommunity {
+ let object = Follow::new(actor, community, context)?;
+ let undo = UndoFollow {
actor: ObjectId::new(actor.actor_id()),
object,
kind: UndoType::Undo,
UndoType::Undo,
&context.settings().get_protocol_and_hostname(),
)?,
- unparsed: Default::default(),
};
- let inbox = vec![community.shared_inbox_or_inbox_url()];
- send_lemmy_activity(context, &undo, &undo.id, actor, inbox, true).await
+ let inbox = vec![community.shared_inbox_or_inbox()];
+ send_lemmy_activity(context, undo, actor, inbox, true).await
}
}
#[async_trait::async_trait(?Send)]
-impl ActivityHandler for UndoFollowCommunity {
+impl ActivityHandler for UndoFollow {
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(
context: &Data<LemmyContext>,
request_counter: &mut i32,
) -> Result<(), LemmyError> {
- 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?;
) -> Result<(), LemmyError> {
let person = self
.actor
- .dereference(context, context.client(), request_counter)
+ .dereference(context, local_instance(context).await, request_counter)
.await?;
- let community = self
+ let object = self
.object
.object
- .dereference(context, context.client(), request_counter)
+ .dereference(context, local_instance(context).await, request_counter)
.await?;
- let community_follower_form = CommunityFollowerForm {
- community_id: community.id,
- person_id: person.id,
- pending: Some(false),
- };
+ match object {
+ UserOrCommunity::User(u) => {
+ let form = PersonFollowerForm {
+ person_id: u.id,
+ follower_id: person.id,
+ pending: false,
+ };
+ PersonFollower::unfollow(context.pool(), &form).await?;
+ }
+ UserOrCommunity::Community(c) => {
+ let form = CommunityFollowerForm {
+ community_id: c.id,
+ person_id: person.id,
+ pending: false,
+ };
+ CommunityFollower::unfollow(context.pool(), &form).await?;
+ }
+ }
- // This will fail if they aren't a follower, but ignore the error.
- blocking(context.pool(), move |conn| {
- CommunityFollower::unfollow(conn, &community_follower_form).ok()
- })
- .await?;
Ok(())
}
}