Add default post listing type (fixes #2195)

LemmyNet · Apr 12, 2022 · 61200e1 · 61200e1
1 parent 2180bd0
commit 61200e1
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 3 deletions.
diff --git a/crates/api_common/src/site.rs b/crates/api_common/src/site.rs
@@ -107,6 +107,7 @@ pub struct CreateSite {
   pub application_question: Option<String>,
   pub private_instance: Option<bool>,
   pub default_theme: Option<String>,
+  pub default_post_listing_type: Option<String>,
   pub auth: Sensitive<String>,
 }
 
@@ -126,6 +127,7 @@ pub struct EditSite {
   pub application_question: Option<String>,
   pub private_instance: Option<bool>,
   pub default_theme: Option<String>,
+  pub default_post_listing_type: Option<String>,
   pub auth: Sensitive<String>,
 }
 

diff --git a/crates/api_crud/src/post/read.rs b/crates/api_crud/src/post/read.rs
@@ -10,7 +10,7 @@ use lemmy_api_common::{
 use lemmy_apub::{fetcher::resolve_actor_identifier, objects::community::ApubCommunity};
 use lemmy_db_schema::{
   from_opt_str_to_opt_enum,
-  source::community::Community,
+  source::{community::Community, site::Site},
   traits::DeleteableOrRemoveable,
   ListingType,
   SortType,
@@ -25,6 +25,7 @@ use lemmy_db_views_actor::{
 };
 use lemmy_utils::{ConnectionId, LemmyError};
 use lemmy_websocket::{messages::GetPostUsersOnline, LemmyContext};
+use std::str::FromStr;
 
 #[async_trait::async_trait(?Send)]
 impl PerformCrud for GetPost {
@@ -146,7 +147,9 @@ impl PerformCrud for GetPosts {
       .map(|t| t.local_user.show_read_posts);
 
     let sort: Option<SortType> = from_opt_str_to_opt_enum(&data.sort);
-    let listing_type: Option<ListingType> = from_opt_str_to_opt_enum(&data.type_);
+    let site = blocking(context.pool(), Site::read_local_site).await??;
+    let listing_type: ListingType = from_opt_str_to_opt_enum(&data.type_)
+      .unwrap_or(ListingType::from_str(&site.default_post_listing_type)?);
 
     let page = data.page;
     let limit = data.limit;

diff --git a/crates/api_crud/src/site/create.rs b/crates/api_crud/src/site/create.rs
@@ -16,6 +16,7 @@ use lemmy_db_schema::{
   newtypes::DbUrl,
   source::site::{Site, SiteForm},
   traits::Crud,
+  ListingType,
 };
 use lemmy_db_views::site_view::SiteView;
 use lemmy_utils::{
@@ -84,6 +85,7 @@ impl PerformCrud for CreateSite {
       private_key: Some(Some(keypair.private_key)),
       public_key: Some(keypair.public_key),
       default_theme: data.default_theme.clone(),
+      default_post_listing_type: Some(ListingType::All.to_string()),
       ..SiteForm::default()
     };
 

diff --git a/crates/api_crud/src/site/read.rs b/crates/api_crud/src/site/read.rs
@@ -69,6 +69,7 @@ impl PerformCrud for GetSite {
             application_question: setup.application_question.to_owned(),
             private_instance: setup.private_instance,
             default_theme: setup.default_theme.to_owned(),
+            default_post_listing_type: setup.default_post_listing_type.to_owned(),
             auth: admin_jwt,
           };
           create_site.perform(context, websocket_id).await?;

diff --git a/crates/api_crud/src/site/update.rs b/crates/api_crud/src/site/update.rs
@@ -17,11 +17,12 @@ use lemmy_db_schema::{
     site::{Site, SiteForm},
   },
   traits::Crud,
+  ListingType,
 };
 use lemmy_db_views::site_view::SiteView;
 use lemmy_utils::{utils::check_slurs_opt, ConnectionId, LemmyError};
 use lemmy_websocket::{messages::SendAllMessage, LemmyContext, UserOperationCrud};
-use std::default::Default;
+use std::{default::Default, str::FromStr};
 
 #[async_trait::async_trait(?Send)]
 impl PerformCrud for EditSite {
@@ -64,6 +65,14 @@ impl PerformCrud for EditSite {
       return Err(LemmyError::from_message("application_question_required"));
     }
 
+    if let Some(default_post_listing_type) = &data.default_post_listing_type {
+      if ListingType::from_str(default_post_listing_type).is_err() {
+        return Err(LemmyError::from_message(
+          "invalid_default_post_listing_type",
+        ));
+      }
+    }
+
     let site_form = SiteForm {
       name: data.name.to_owned().unwrap_or(local_site.name),
       sidebar,
@@ -80,6 +89,7 @@ impl PerformCrud for EditSite {
       application_question,
       private_instance: data.private_instance,
       default_theme: data.default_theme.clone(),
+      default_post_listing_type: data.default_post_listing_type.clone(),
       ..SiteForm::default()
     };
 

diff --git a/crates/db_schema/src/schema.rs b/crates/db_schema/src/schema.rs
@@ -461,6 +461,7 @@ table! {
         private_key -> Nullable<Text>,
         public_key -> Text,
         default_theme -> Text,
+        default_post_listing_type -> Text,
     }
 }
 

diff --git a/crates/db_schema/src/source/site.rs b/crates/db_schema/src/source/site.rs
@@ -26,6 +26,7 @@ pub struct Site {
   pub private_key: Option<String>,
   pub public_key: String,
   pub default_theme: String,
+  pub default_post_listing_type: String,
 }
 
 #[derive(Insertable, AsChangeset, Default)]
@@ -52,4 +53,5 @@ pub struct SiteForm {
   pub private_key: Option<Option<String>>,
   pub public_key: Option<String>,
   pub default_theme: Option<String>,
+  pub default_post_listing_type: Option<String>,
 }
diff --git a/crates/utils/src/settings/structs.rs b/crates/utils/src/settings/structs.rs
@@ -217,4 +217,6 @@ pub struct SetupConfig {
   pub private_instance: Option<bool>,
   #[default(None)]
   pub default_theme: Option<String>,
+  #[default(None)]
+  pub default_post_listing_type: Option<String>,
 }
diff --git a/migrations/2022-04-12-114352_default_post_listing_type/down.sql b/migrations/2022-04-12-114352_default_post_listing_type/down.sql
@@ -0,0 +1 @@
+alter table site drop column default_post_listing_type;
diff --git a/migrations/2022-04-12-114352_default_post_listing_type/up.sql b/migrations/2022-04-12-114352_default_post_listing_type/up.sql
@@ -0,0 +1 @@
+alter table site add column default_post_listing_type varchar not null default 'All';