Removing the site creator, adding leave_admin. Fixes #1808 (#2052)

[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 87fded01b184ef27517f1fb6964f6a7e6f13349e..e77d7c6ce770298a51bb84b6b3026199d54499e4 100644 (file)
--- a/crates/db_views/src/site_view.rs
+++ b/crates/db_views/src/site_view.rs
@@ -1,37 +1,24 @@
 use diesel::{result::Error, *};
-use lemmy_db_queries::{aggregates::site_aggregates::SiteAggregates, ToSafe};
 use lemmy_db_schema::{
-  schema::{person, site, site_aggregates},
-  source::{
-    person::{Person, PersonSafe},
-    site::Site,
-  },
+  aggregates::site_aggregates::SiteAggregates,
+  schema::{site, site_aggregates},
+  source::site::Site,
 };
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 
-#[derive(Debug, Serialize, Clone)]
+#[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct SiteView {
   pub site: Site,
-  pub creator: PersonSafe,
   pub counts: SiteAggregates,
 }
 
 impl SiteView {
   pub fn read(conn: &PgConnection) -> Result<Self, Error> {
-    let (site, creator, counts) = site::table
-      .inner_join(person::table)
+    let (site, counts) = site::table
       .inner_join(site_aggregates::table)
-      .select((
-        site::all_columns,
-        Person::safe_columns_tuple(),
-        site_aggregates::all_columns,
-      ))
-      .first::<(Site, PersonSafe, SiteAggregates)>(conn)?;
+      .select((site::all_columns, site_aggregates::all_columns))
+      .first::<(Site, SiteAggregates)>(conn)?;
 
-    Ok(SiteView {
-      site,
-      creator,
-      counts,
-    })
+    Ok(SiteView { site, counts })
   }
 }