X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fdb_views%2Fsrc%2Fsite_view.rs;h=10b36ac82e2e51e9c2fd553c0fb44a6e9c1cd666;hb=235cc8b22897bfb3e71ba3dbd725d36863fea8ba;hp=03ee0d7d93ef89d8c68c34c392f6bd5f3437f564;hpb=276a8c2bd3e4fd1323e66b808675cf14cf6f75c5;p=lemmy.git diff --git a/crates/db_views/src/site_view.rs b/crates/db_views/src/site_view.rs index 03ee0d7d..10b36ac8 100644 --- a/crates/db_views/src/site_view.rs +++ b/crates/db_views/src/site_view.rs @@ -2,19 +2,32 @@ use crate::structs::SiteView; use diesel::{result::Error, *}; use lemmy_db_schema::{ aggregates::structs::SiteAggregates, - schema::{site, site_aggregates}, - source::site::Site, + schema::{local_site, local_site_rate_limit, site, site_aggregates}, + source::{local_site::LocalSite, local_site_rate_limit::LocalSiteRateLimit, site::Site}, }; impl SiteView { pub fn read_local(conn: &mut PgConnection) -> Result { - let (mut site, counts) = site::table + 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, site_aggregates::all_columns)) - .order_by(site::id) - .first::<(Site, SiteAggregates)>(conn)?; + .select(( + site::all_columns, + local_site::all_columns, + local_site_rate_limit::all_columns, + site_aggregates::all_columns, + )) + .first::<(Site, LocalSite, LocalSiteRateLimit, SiteAggregates)>(conn)?; site.private_key = None; - Ok(SiteView { site, counts }) + Ok(SiteView { + site, + local_site, + local_site_rate_limit, + counts, + }) } }