mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-21 22:27:08 +00:00
* Add default post listing type (fixes #2195) * review fixes * change column type
This commit is contained in:
parent
24be9f2cd5
commit
00b0b26dfa
|
@ -109,6 +109,7 @@
|
|||
application_question: "string"
|
||||
private_instance: true
|
||||
default_theme: "string"
|
||||
default_post_listing_type: "string"
|
||||
}
|
||||
# the domain name of your instance (mandatory)
|
||||
hostname: "unset"
|
||||
|
|
|
@ -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>,
|
||||
}
|
||||
|
||||
|
|
|
@ -4,12 +4,12 @@ use lemmy_api_common::{
|
|||
blocking,
|
||||
check_private_instance,
|
||||
get_local_user_view_from_jwt_opt,
|
||||
post::*,
|
||||
post::{GetPosts, GetPostsResponse},
|
||||
};
|
||||
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,
|
||||
|
@ -17,6 +17,7 @@ use lemmy_db_schema::{
|
|||
use lemmy_db_views::post_view::PostQueryBuilder;
|
||||
use lemmy_utils::{ConnectionId, LemmyError};
|
||||
use lemmy_websocket::LemmyContext;
|
||||
use std::str::FromStr;
|
||||
|
||||
#[async_trait::async_trait(?Send)]
|
||||
impl PerformCrud for GetPosts {
|
||||
|
@ -46,7 +47,13 @@ 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 listing_type: ListingType = match from_opt_str_to_opt_enum(&data.type_) {
|
||||
Some(l) => l,
|
||||
None => {
|
||||
let site = blocking(context.pool(), Site::read_local_site).await??;
|
||||
ListingType::from_str(&site.default_post_listing_type)?
|
||||
}
|
||||
};
|
||||
|
||||
let page = data.page;
|
||||
let limit = data.limit;
|
||||
|
|
|
@ -5,7 +5,7 @@ use lemmy_api_common::{
|
|||
check_private_instance,
|
||||
get_local_user_view_from_jwt_opt,
|
||||
mark_post_as_read,
|
||||
post::*,
|
||||
post::{GetPost, GetPostResponse},
|
||||
};
|
||||
use lemmy_db_schema::traits::DeleteableOrRemoveable;
|
||||
use lemmy_db_views::{comment_view::CommentQueryBuilder, post_view::PostView};
|
||||
|
|
|
@ -84,6 +84,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: data.default_post_listing_type.clone(),
|
||||
..SiteForm::default()
|
||||
};
|
||||
|
||||
|
|
|
@ -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?;
|
||||
|
|
|
@ -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,16 @@ impl PerformCrud for EditSite {
|
|||
return Err(LemmyError::from_message("application_question_required"));
|
||||
}
|
||||
|
||||
if let Some(default_post_listing_type) = &data.default_post_listing_type {
|
||||
// only allow all or local as default listing types
|
||||
let val = ListingType::from_str(default_post_listing_type);
|
||||
if val != Ok(ListingType::All) && val != Ok(ListingType::Local) {
|
||||
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 +91,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()
|
||||
};
|
||||
|
||||
|
|
|
@ -46,7 +46,7 @@ pub enum SortType {
|
|||
NewComments,
|
||||
}
|
||||
|
||||
#[derive(EnumString, Display, Debug, Serialize, Deserialize, Clone, Copy)]
|
||||
#[derive(EnumString, Display, Debug, Serialize, Deserialize, Clone, Copy, PartialEq)]
|
||||
pub enum ListingType {
|
||||
All,
|
||||
Local,
|
||||
|
|
|
@ -461,6 +461,7 @@ table! {
|
|||
private_key -> Nullable<Text>,
|
||||
public_key -> Text,
|
||||
default_theme -> Text,
|
||||
default_post_listing_type -> Text,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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>,
|
||||
}
|
||||
|
|
|
@ -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>,
|
||||
}
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
alter table site drop column default_post_listing_type;
|
|
@ -0,0 +1 @@
|
|||
alter table site add column default_post_listing_type text not null default 'Local';
|
Loading…
Reference in a new issue