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.
57 lines
1.9 KiB
Rust
57 lines
1.9 KiB
Rust
use crate::{fetcher::webfinger::webfinger_resolve_actor, ActorType};
|
|
use activitypub_federation::traits::ApubObject;
|
|
use itertools::Itertools;
|
|
use lemmy_db_schema::traits::ApubActor;
|
|
use lemmy_utils::error::LemmyError;
|
|
use lemmy_websocket::LemmyContext;
|
|
|
|
pub mod post_or_comment;
|
|
pub mod search;
|
|
pub mod user_or_community;
|
|
pub mod webfinger;
|
|
|
|
/// Resolve actor identifier (eg `!news@example.com`) from local database to avoid network requests.
|
|
/// This only works for local actors, and remote actors which were previously fetched (so it doesnt
|
|
/// trigger any new fetch).
|
|
#[tracing::instrument(skip_all)]
|
|
pub async fn resolve_actor_identifier<Actor, DbActor>(
|
|
identifier: &str,
|
|
context: &LemmyContext,
|
|
include_deleted: bool,
|
|
) -> Result<DbActor, LemmyError>
|
|
where
|
|
Actor: ApubObject<DataType = LemmyContext, Error = LemmyError>
|
|
+ ApubObject<DbType = DbActor>
|
|
+ ActorType
|
|
+ Send
|
|
+ 'static,
|
|
for<'de2> <Actor as ApubObject>::ApubType: serde::Deserialize<'de2>,
|
|
DbActor: ApubActor + Send + 'static,
|
|
{
|
|
// remote actor
|
|
if identifier.contains('@') {
|
|
let (name, domain) = identifier
|
|
.splitn(2, '@')
|
|
.collect_tuple()
|
|
.expect("invalid query");
|
|
let name = name.to_string();
|
|
let domain = format!("{}://{}", context.settings().get_protocol_string(), domain);
|
|
let actor = DbActor::read_from_name_and_domain(context.pool(), &name, &domain).await;
|
|
if actor.is_ok() {
|
|
Ok(actor?)
|
|
} else {
|
|
// Fetch the actor from its home instance using webfinger
|
|
let id = webfinger_resolve_actor::<Actor>(identifier, true, context, &mut 0).await?;
|
|
let actor: DbActor = DbActor::read_from_apub_id(context.pool(), &id)
|
|
.await?
|
|
.expect("actor exists as we fetched just before");
|
|
Ok(actor)
|
|
}
|
|
}
|
|
// local actor
|
|
else {
|
|
let identifier = identifier.to_string();
|
|
Ok(DbActor::read_from_name(context.pool(), &identifier, include_deleted).await?)
|
|
}
|
|
}
|