mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-16 04:10:32 +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.
79 lines
2.5 KiB
Rust
79 lines
2.5 KiB
Rust
use crate::{
|
|
newtypes::InstanceId,
|
|
schema::{federation_allowlist, federation_blocklist, instance},
|
|
source::instance::{Instance, InstanceForm},
|
|
utils::{get_conn, naive_now, DbPool},
|
|
};
|
|
use diesel::{dsl::*, result::Error, ExpressionMethods, QueryDsl};
|
|
use diesel_async::{AsyncPgConnection, RunQueryDsl};
|
|
use lemmy_utils::utils::generate_domain_url;
|
|
use url::Url;
|
|
|
|
impl Instance {
|
|
async fn create_from_form_conn(
|
|
conn: &mut AsyncPgConnection,
|
|
form: &InstanceForm,
|
|
) -> Result<Self, Error> {
|
|
// Do upsert on domain name conflict
|
|
insert_into(instance::table)
|
|
.values(form)
|
|
.on_conflict(instance::domain)
|
|
.do_update()
|
|
.set(form)
|
|
.get_result::<Self>(conn)
|
|
.await
|
|
}
|
|
pub async fn create(pool: &DbPool, domain: &str) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
Self::create_conn(conn, domain).await
|
|
}
|
|
pub async fn create_from_actor_id(pool: &DbPool, actor_id: &Url) -> Result<Self, Error> {
|
|
let domain = &generate_domain_url(actor_id).expect("actor id missing a domain");
|
|
Self::create(pool, domain).await
|
|
}
|
|
pub async fn create_conn(conn: &mut AsyncPgConnection, domain: &str) -> Result<Self, Error> {
|
|
let form = InstanceForm {
|
|
domain: domain.to_string(),
|
|
updated: Some(naive_now()),
|
|
};
|
|
Self::create_from_form_conn(conn, &form).await
|
|
}
|
|
pub async fn delete(pool: &DbPool, instance_id: InstanceId) -> Result<usize, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
diesel::delete(instance::table.find(instance_id))
|
|
.execute(conn)
|
|
.await
|
|
}
|
|
pub async fn delete_all(pool: &DbPool) -> Result<usize, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
diesel::delete(instance::table).execute(conn).await
|
|
}
|
|
pub async fn allowlist(pool: &DbPool) -> Result<Vec<String>, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
instance::table
|
|
.inner_join(federation_allowlist::table)
|
|
.select(instance::domain)
|
|
.load::<String>(conn)
|
|
.await
|
|
}
|
|
|
|
pub async fn blocklist(pool: &DbPool) -> Result<Vec<String>, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
instance::table
|
|
.inner_join(federation_blocklist::table)
|
|
.select(instance::domain)
|
|
.load::<String>(conn)
|
|
.await
|
|
}
|
|
|
|
pub async fn linked(pool: &DbPool) -> Result<Vec<String>, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
instance::table
|
|
.left_join(federation_blocklist::table)
|
|
.filter(federation_blocklist::id.is_null())
|
|
.select(instance::domain)
|
|
.load::<String>(conn)
|
|
.await
|
|
}
|
|
}
|