mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-02 13:39:21 +00:00
5d837780f5
* Moving settings to Database. - Moves many settings into the database. Fixes #2285 - Adds a local_site and instance table. Fixes #2365 . Fixes #2368 - Separates SQL update an insert forms, to avoid runtime errors. - Adds TypedBuilder to all the SQL forms, instead of default. * Fix weird clippy issue. * Removing extra lines. * Some fixes from suggestions. * Fixing apub tests. * Using instance creation helper function. * Move forms to their own line. * Trying to fix local_site_data, still broken. * Testing out async * Testing out async 2 * Fixing federation tests. * Trying to fix check features 1. * Starting on adding diesel async. 1/4th done. * Added async to views and schema. * Adding some more async * Compiling now. * Added diesel async. Fixes #2465 * Running clippy --fix * Trying to fix cargo test on drone. * Trying new muslrust. * Trying a custom dns * Trying a custom dns 2 * Trying a custom dns 3 * Trying a custom dns 4 * Trying a custom dns 5 * Trying a custom dns 6 * Trying a custom dns 7 * Addressing PR comments. * Adding check_apub to all verify functions. * Reverting back drone. * Fixing merge * Fix docker images. * Adding missing discussion_languages. * Trying to fix federation tests. * Fix site setup user creation. * Fix clippy * Fix clippy 2 * Test api faster * Try to fix 1 * Try to fix 2 * What are these lines about * Trying to fix 3 * Moving federation test back to top. * Remove logging cat.
117 lines
3.4 KiB
Rust
117 lines
3.4 KiB
Rust
use crate::{
|
|
activities::{generate_activity_id, send_lemmy_activity},
|
|
local_instance,
|
|
protocol::activities::following::{accept::AcceptFollowCommunity, follow::FollowCommunity},
|
|
ActorType,
|
|
};
|
|
use activitypub_federation::{
|
|
core::object_id::ObjectId,
|
|
data::Data,
|
|
traits::{ActivityHandler, Actor},
|
|
utils::verify_urls_match,
|
|
};
|
|
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;
|
|
|
|
impl AcceptFollowCommunity {
|
|
#[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).await, request_counter)
|
|
.await?;
|
|
let accept = AcceptFollowCommunity {
|
|
actor: ObjectId::new(community.actor_id()),
|
|
object: follow,
|
|
kind: AcceptType::Accept,
|
|
id: generate_activity_id(
|
|
AcceptType::Accept,
|
|
&context.settings().get_protocol_and_hostname(),
|
|
)?,
|
|
unparsed: Default::default(),
|
|
};
|
|
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: &Data<LemmyContext>,
|
|
request_counter: &mut i32,
|
|
) -> Result<(), LemmyError> {
|
|
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: &Data<LemmyContext>,
|
|
request_counter: &mut i32,
|
|
) -> Result<(), LemmyError> {
|
|
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
|
|
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(())
|
|
}
|
|
}
|