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.
87 lines
2.3 KiB
Rust
87 lines
2.3 KiB
Rust
use crate::{
|
|
activities::{generate_activity_id, send_lemmy_activity, verify_is_public, verify_person},
|
|
local_instance,
|
|
objects::{instance::remote_instance_inboxes, person::ApubPerson},
|
|
protocol::activities::deletion::delete_user::DeleteUser,
|
|
};
|
|
use activitypub_federation::{
|
|
core::object_id::ObjectId,
|
|
data::Data,
|
|
traits::ActivityHandler,
|
|
utils::verify_urls_match,
|
|
};
|
|
use activitystreams_kinds::{activity::DeleteType, public};
|
|
use lemmy_api_common::utils::delete_user_account;
|
|
use lemmy_utils::error::LemmyError;
|
|
use lemmy_websocket::LemmyContext;
|
|
use url::Url;
|
|
|
|
/// This can be separate from Delete activity because it doesn't need to be handled in shared inbox
|
|
/// (cause instance actor doesn't have shared inbox).
|
|
#[async_trait::async_trait(?Send)]
|
|
impl ActivityHandler for DeleteUser {
|
|
type DataType = LemmyContext;
|
|
type Error = LemmyError;
|
|
|
|
fn id(&self) -> &Url {
|
|
&self.id
|
|
}
|
|
|
|
fn actor(&self) -> &Url {
|
|
self.actor.inner()
|
|
}
|
|
|
|
async fn verify(
|
|
&self,
|
|
context: &Data<LemmyContext>,
|
|
request_counter: &mut i32,
|
|
) -> Result<(), LemmyError> {
|
|
verify_is_public(&self.to, &[])?;
|
|
verify_person(&self.actor, context, request_counter).await?;
|
|
verify_urls_match(self.actor.inner(), self.object.inner())?;
|
|
Ok(())
|
|
}
|
|
|
|
async fn receive(
|
|
self,
|
|
context: &Data<LemmyContext>,
|
|
request_counter: &mut i32,
|
|
) -> Result<(), LemmyError> {
|
|
let actor = self
|
|
.actor
|
|
.dereference(context, local_instance(context).await, request_counter)
|
|
.await?;
|
|
delete_user_account(
|
|
actor.id,
|
|
context.pool(),
|
|
context.settings(),
|
|
context.client(),
|
|
)
|
|
.await?;
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
impl DeleteUser {
|
|
#[tracing::instrument(skip_all)]
|
|
pub async fn send(actor: &ApubPerson, context: &LemmyContext) -> Result<(), LemmyError> {
|
|
let actor_id = ObjectId::new(actor.actor_id.clone());
|
|
let id = generate_activity_id(
|
|
DeleteType::Delete,
|
|
&context.settings().get_protocol_and_hostname(),
|
|
)?;
|
|
let delete = DeleteUser {
|
|
actor: actor_id.clone(),
|
|
to: vec![public()],
|
|
object: actor_id,
|
|
kind: DeleteType::Delete,
|
|
id: id.clone(),
|
|
cc: vec![],
|
|
};
|
|
|
|
let inboxes = remote_instance_inboxes(context.pool()).await?;
|
|
send_lemmy_activity(context, delete, actor, inboxes, true).await?;
|
|
Ok(())
|
|
}
|
|
}
|