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