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 c04e85e9c8cf079e007ce8c670301e880b631080..f80666bad15c29b550cb91df48dbb39bb106f29b 100644 (file)
--- a/crates/db_views/src/site_view.rs
+++ b/crates/db_views/src/site_view.rs
@@ -1,36 +1,36 @@
-use diesel::{result::Error, *};
-use lemmy_db_queries::{aggregates::site_aggregates::SiteAggregates, ToSafe};
+use crate::structs::SiteView;
+use diesel::{result::Error, ExpressionMethods, JoinOnDsl, QueryDsl};
+use diesel_async::RunQueryDsl;
 use lemmy_db_schema::{
-  schema::{site, site_aggregates, user_},
-  source::{
-    site::Site,
-    user::{UserSafe, User_},
-  },
+  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},
 };
-use serde::Serialize;
-
-#[derive(Debug, Serialize, Clone)]
-pub struct SiteView {
-  pub site: Site,
-  pub creator: UserSafe,
-  pub counts: SiteAggregates,
-}
 
 impl SiteView {
-  pub fn read(conn: &PgConnection) -> Result<Self, Error> {
-    let (site, creator, counts) = site::table
-      .inner_join(user_::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,
-        User_::safe_columns_tuple(),
+        local_site::all_columns,
+        local_site_rate_limit::all_columns,
         site_aggregates::all_columns,
       ))
-      .first::<(Site, UserSafe, SiteAggregates)>(conn)?;
+      .first::<(Site, LocalSite, LocalSiteRateLimit, SiteAggregates)>(conn)
+      .await?;
 
+    site.private_key = None;
     Ok(SiteView {
       site,
-      creator,
+      local_site,
+      local_site_rate_limit,
       counts,
     })
   }