mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-24 08: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.
38 lines
1.2 KiB
Rust
38 lines
1.2 KiB
Rust
use crate::structs::SiteView;
|
|
use diesel::{result::Error, ExpressionMethods, JoinOnDsl, QueryDsl};
|
|
use diesel_async::RunQueryDsl;
|
|
use lemmy_db_schema::{
|
|
aggregates::structs::SiteAggregates,
|
|
schema::{local_site, local_site_rate_limit, site, site_aggregates},
|
|
source::{local_site::LocalSite, local_site_rate_limit::LocalSiteRateLimit, site::Site},
|
|
utils::{get_conn, DbPool},
|
|
};
|
|
|
|
impl SiteView {
|
|
pub async fn read_local(pool: &DbPool) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
let (mut site, local_site, local_site_rate_limit, counts) = site::table
|
|
.inner_join(local_site::table)
|
|
.inner_join(
|
|
local_site_rate_limit::table.on(local_site::id.eq(local_site_rate_limit::local_site_id)),
|
|
)
|
|
.inner_join(site_aggregates::table)
|
|
.select((
|
|
site::all_columns,
|
|
local_site::all_columns,
|
|
local_site_rate_limit::all_columns,
|
|
site_aggregates::all_columns,
|
|
))
|
|
.first::<(Site, LocalSite, LocalSiteRateLimit, SiteAggregates)>(conn)
|
|
.await?;
|
|
|
|
site.private_key = None;
|
|
Ok(SiteView {
|
|
site,
|
|
local_site,
|
|
local_site_rate_limit,
|
|
counts,
|
|
})
|
|
}
|
|
}
|