Make functions work with both connection and pool (#3420)

[lemmy.git] / crates / db_views / src / site_view.rs

diff --git a/crates/db_views/src/site_view.rs b/crates/db_views/src/site_view.rs
index 03ee0d7d93ef89d8c68c34c392f6bd5f3437f564..f80666bad15c29b550cb91df48dbb39bb106f29b 100644 (file)
--- a/crates/db_views/src/site_view.rs
+++ b/crates/db_views/src/site_view.rs
@@ -1,20 +1,37 @@
 use crate::structs::SiteView;
-use diesel::{result::Error, *};
+use diesel::{result::Error, ExpressionMethods, JoinOnDsl, QueryDsl};
+use diesel_async::RunQueryDsl;
 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},
+  utils::{get_conn, DbPool},
 };
 
 impl SiteView {
-  pub fn read_local(conn: &mut PgConnection) -> Result<Self, Error> {
-    let (mut site, counts) = site::table
+  pub async fn read_local(pool: &mut 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, 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)
+      .await?;
 
     site.private_key = None;
-    Ok(SiteView { site, counts })
+    Ok(SiteView {
+      site,
+      local_site,
+      local_site_rate_limit,
+      counts,
+    })
   }
 }