Merge remote-tracking branch 'origin/split-db-workspace' into move_views_to_diesel_split

[lemmy.git] / lemmy_structs / src / site.rs

diff --git a/lemmy_structs/src/site.rs b/lemmy_structs/src/site.rs
index 5011d84fffe6dcbedf57aba77896a68788ec3db0..f24d9f49ee42db21292b2d09f40a253653b4beea 100644 (file)
--- a/lemmy_structs/src/site.rs
+++ b/lemmy_structs/src/site.rs
@@ -1,23 +1,20 @@
-use lemmy_db::{
-  aggregates::site_aggregates::SiteAggregates,
-  views::{
-    comment_view::CommentView,
-    community::community_view::CommunityView,
-    moderator::{
-      mod_add_community_view::ModAddCommunityView,
-      mod_add_view::ModAddView,
-      mod_ban_from_community_view::ModBanFromCommunityView,
-      mod_ban_view::ModBanView,
-      mod_lock_post_view::ModLockPostView,
-      mod_remove_comment_view::ModRemoveCommentView,
-      mod_remove_community_view::ModRemoveCommunityView,
-      mod_remove_post_view::ModRemovePostView,
-      mod_sticky_post_view::ModStickyPostView,
-    },
-    post_view::PostView,
-    site_view::SiteView,
-    user_view::UserViewSafe,
+use lemmy_db::views::{
+  comment_view::CommentView,
+  community::community_view::CommunityView,
+  moderator::{
+    mod_add_community_view::ModAddCommunityView,
+    mod_add_view::ModAddView,
+    mod_ban_from_community_view::ModBanFromCommunityView,
+    mod_ban_view::ModBanView,
+    mod_lock_post_view::ModLockPostView,
+    mod_remove_comment_view::ModRemoveCommentView,
+    mod_remove_community_view::ModRemoveCommunityView,
+    mod_remove_post_view::ModRemovePostView,
+    mod_sticky_post_view::ModStickyPostView,
   },
+  post_view::PostView,
+  site_view::SiteView,
+  user_view::UserViewSafe,
 };
 use lemmy_db_schema::source::{category::*, user::User_};
 use serde::{Deserialize, Serialize};
@@ -101,16 +98,14 @@ pub struct GetSite {
   pub auth: Option<String>,
 }
 
-// TODO combine siteresponse and getsiteresponse
 #[derive(Serialize, Clone)]
 pub struct SiteResponse {
-  pub site: SiteView,
+  pub site_view: SiteView,
 }
 
 #[derive(Serialize)]
 pub struct GetSiteResponse {
-  pub site: Option<SiteView>, // Because the site might not be set up yet
-  pub counts: SiteAggregates,
+  pub site_view: Option<SiteView>, // Because the site might not be set up yet
   pub admins: Vec<UserViewSafe>,
   pub banned: Vec<UserViewSafe>,
   pub online: usize,