mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-16 01:14:02 +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.
75 lines
2 KiB
Rust
75 lines
2 KiB
Rust
use crate::{
|
|
newtypes::{DbUrl, SiteId},
|
|
schema::site::dsl::*,
|
|
source::{actor_language::SiteLanguage, site::*},
|
|
traits::Crud,
|
|
utils::{get_conn, DbPool},
|
|
};
|
|
use diesel::{dsl::*, result::Error, ExpressionMethods, QueryDsl};
|
|
use diesel_async::RunQueryDsl;
|
|
use url::Url;
|
|
|
|
#[async_trait]
|
|
impl Crud for Site {
|
|
type InsertForm = SiteInsertForm;
|
|
type UpdateForm = SiteUpdateForm;
|
|
type IdType = SiteId;
|
|
|
|
async fn read(pool: &DbPool, _site_id: SiteId) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
site.first::<Self>(conn).await
|
|
}
|
|
|
|
async fn create(pool: &DbPool, form: &Self::InsertForm) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
let site_ = insert_into(site)
|
|
.values(form)
|
|
.on_conflict(actor_id)
|
|
.do_update()
|
|
.set(form)
|
|
.get_result::<Self>(conn)
|
|
.await?;
|
|
|
|
// initialize with all languages
|
|
SiteLanguage::update(pool, vec![], &site_).await?;
|
|
Ok(site_)
|
|
}
|
|
|
|
async fn update(
|
|
pool: &DbPool,
|
|
site_id: SiteId,
|
|
new_site: &Self::UpdateForm,
|
|
) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
diesel::update(site.find(site_id))
|
|
.set(new_site)
|
|
.get_result::<Self>(conn)
|
|
.await
|
|
}
|
|
|
|
async fn delete(pool: &DbPool, site_id: SiteId) -> Result<usize, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
diesel::delete(site.find(site_id)).execute(conn).await
|
|
}
|
|
}
|
|
|
|
impl Site {
|
|
pub async fn read_from_apub_id(pool: &DbPool, object_id: Url) -> Result<Option<Self>, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
let object_id: DbUrl = object_id.into();
|
|
Ok(
|
|
site
|
|
.filter(actor_id.eq(object_id))
|
|
.first::<Site>(conn)
|
|
.await
|
|
.ok()
|
|
.map(Into::into),
|
|
)
|
|
}
|
|
|
|
// TODO this needs fixed
|
|
pub async fn read_remote_sites(pool: &DbPool) -> Result<Vec<Self>, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
site.order_by(id).offset(1).get_results::<Self>(conn).await
|
|
}
|
|
}
|