use crate::{
- activities::{
- following::follow::FollowCommunity,
- generate_activity_id,
- verify_activity,
- verify_community,
- },
- activity_queue::send_activity_new,
- extensions::context::lemmy_context,
- fetcher::{community::get_or_fetch_and_upsert_community, person::get_or_fetch_and_upsert_person},
+ activities::{generate_activity_id, send_lemmy_activity},
+ check_apub_id_valid,
+ fetch_local_site_data,
+ local_instance,
+ protocol::activities::following::{accept::AcceptFollowCommunity, follow::FollowCommunity},
ActorType,
};
-use activitystreams::activity::kind::AcceptType;
-use lemmy_api_common::blocking;
-use lemmy_apub_lib::{verify_urls_match, ActivityCommonFields, ActivityHandler};
-use lemmy_db_queries::{ApubObject, Followable};
-use lemmy_db_schema::source::{
- community::{Community, CommunityFollower},
- person::Person,
+use activitypub_federation::{
+ core::object_id::ObjectId,
+ data::Data,
+ traits::{ActivityHandler, Actor},
+ utils::verify_urls_match,
};
-use lemmy_utils::LemmyError;
-use lemmy_websocket::LemmyContext;
+use activitystreams_kinds::activity::AcceptType;
+use lemmy_api_common::{community::CommunityResponse, utils::blocking};
+use lemmy_db_schema::{source::community::CommunityFollower, traits::Followable};
+use lemmy_db_views::structs::LocalUserView;
+use lemmy_db_views_actor::structs::CommunityView;
+use lemmy_utils::error::LemmyError;
+use lemmy_websocket::{messages::SendUserRoomMessage, LemmyContext, UserOperation};
use url::Url;
-#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct AcceptFollowCommunity {
- to: Url,
- object: FollowCommunity,
- #[serde(rename = "type")]
- kind: AcceptType,
- #[serde(flatten)]
- common: ActivityCommonFields,
-}
-
impl AcceptFollowCommunity {
- pub async fn send(follow: FollowCommunity, context: &LemmyContext) -> Result<(), LemmyError> {
- let community_id = follow.object.clone();
- let community = blocking(context.pool(), move |conn| {
- Community::read_from_apub_id(conn, &community_id.into())
- })
- .await??;
- let person_id = follow.common.actor.clone();
- let person = blocking(context.pool(), move |conn| {
- Person::read_from_apub_id(conn, &person_id.into())
- })
- .await??;
-
- let id = generate_activity_id(AcceptType::Accept)?;
+ #[tracing::instrument(skip_all)]
+ pub async fn send(
+ follow: FollowCommunity,
+ context: &LemmyContext,
+ request_counter: &mut i32,
+ ) -> Result<(), LemmyError> {
+ let community = follow.object.dereference_local(context).await?;
+ let person = follow
+ .actor
+ .clone()
+ .dereference(context, local_instance(context), request_counter)
+ .await?;
let accept = AcceptFollowCommunity {
- to: person.actor_id(),
+ actor: ObjectId::new(community.actor_id()),
object: follow,
kind: AcceptType::Accept,
- common: ActivityCommonFields {
- context: lemmy_context(),
- id: id.clone(),
- actor: community.actor_id(),
- unparsed: Default::default(),
- },
+ id: generate_activity_id(
+ AcceptType::Accept,
+ &context.settings().get_protocol_and_hostname(),
+ )?,
+ unparsed: Default::default(),
};
- let inbox = vec![person.inbox_url.into()];
- send_activity_new(context, &accept, &id, &community, inbox, true).await
+ let inbox = vec![person.shared_inbox_or_inbox()];
+ send_lemmy_activity(context, accept, &community, inbox, true).await
}
}
+
/// Handle accepted follows
#[async_trait::async_trait(?Send)]
impl ActivityHandler for AcceptFollowCommunity {
+ 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: &LemmyContext,
+ context: &Data<LemmyContext>,
request_counter: &mut i32,
) -> Result<(), LemmyError> {
- verify_activity(self.common())?;
- verify_urls_match(&self.to, &self.object.common.actor)?;
- verify_urls_match(&self.common.actor, &self.object.to)?;
- verify_community(&self.common.actor, context, request_counter).await?;
+ let local_site_data = blocking(context.pool(), fetch_local_site_data).await??;
+ check_apub_id_valid(self.id(), &local_site_data, context.settings())
+ .map_err(LemmyError::from_message)?;
+
+ verify_urls_match(self.actor.inner(), self.object.object.inner())?;
self.object.verify(context, request_counter).await?;
Ok(())
}
+ #[tracing::instrument(skip_all)]
async fn receive(
self,
- context: &LemmyContext,
+ context: &Data<LemmyContext>,
request_counter: &mut i32,
) -> Result<(), LemmyError> {
- let actor =
- get_or_fetch_and_upsert_community(&self.common.actor, context, request_counter).await?;
- let to = get_or_fetch_and_upsert_person(&self.to, context, request_counter).await?;
+ let community = self
+ .actor
+ .dereference(context, local_instance(context), request_counter)
+ .await?;
+ let person = self
+ .object
+ .actor
+ .dereference(context, local_instance(context), request_counter)
+ .await?;
// This will throw an error if no follow was requested
+ let community_id = community.id;
+ let person_id = person.id;
blocking(context.pool(), move |conn| {
- CommunityFollower::follow_accepted(conn, actor.id, to.id)
+ CommunityFollower::follow_accepted(conn, community_id, person_id)
})
.await??;
- Ok(())
- }
+ // Send the Subscribed message over websocket
+ // Re-read the community_view to get the new SubscribedType
+ let community_view = blocking(context.pool(), move |conn| {
+ CommunityView::read(conn, community_id, Some(person_id))
+ })
+ .await??;
+
+ // Get the local_user_id
+ let local_recipient_id = blocking(context.pool(), move |conn| {
+ LocalUserView::read_person(conn, person_id)
+ })
+ .await??
+ .local_user
+ .id;
- fn common(&self) -> &ActivityCommonFields {
- &self.common
+ let response = CommunityResponse { community_view };
+
+ context.chat_server().do_send(SendUserRoomMessage {
+ op: UserOperation::FollowCommunity,
+ response,
+ local_recipient_id,
+ websocket_id: None,
+ });
+
+ Ok(())
}
}
projects / lemmy.git / blobdiff