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 10b36ac82e2e51e9c2fd553c0fb44a6e9c1cd666..f80666bad15c29b550cb91df48dbb39bb106f29b 100644 (file)
--- a/crates/db_views/src/site_view.rs
+++ b/crates/db_views/src/site_view.rs
@@ -1,13 +1,16 @@
 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::{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> {
+  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(
@@ -20,7 +23,8 @@ impl SiteView {
         local_site_rate_limit::all_columns,
         site_aggregates::all_columns,
       ))
-      .first::<(Site, LocalSite, LocalSiteRateLimit, SiteAggregates)>(conn)?;
+      .first::<(Site, LocalSite, LocalSiteRateLimit, SiteAggregates)>(conn)
+      .await?;
 
     site.private_key = None;
     Ok(SiteView {