|
|
|
@ -93,6 +93,7 @@ pub async fn create_site(
|
|
|
|
|
private_instance: data.private_instance,
|
|
|
|
|
default_theme: data.default_theme.clone(),
|
|
|
|
|
default_post_listing_type: data.default_post_listing_type,
|
|
|
|
|
default_sort_type: data.default_sort_type,
|
|
|
|
|
legal_information: diesel_option_overwrite(data.legal_information.clone()),
|
|
|
|
|
application_email_admins: data.application_email_admins,
|
|
|
|
|
hide_modlog_mod_names: data.hide_modlog_mod_names,
|
|
|
|
@ -192,7 +193,7 @@ mod tests {
|
|
|
|
|
|
|
|
|
|
use crate::site::create::validate_create_payload;
|
|
|
|
|
use lemmy_api_common::site::CreateSite;
|
|
|
|
|
use lemmy_db_schema::{source::local_site::LocalSite, ListingType, RegistrationMode};
|
|
|
|
|
use lemmy_db_schema::{source::local_site::LocalSite, ListingType, RegistrationMode, SortType};
|
|
|
|
|
use lemmy_utils::error::LemmyErrorType;
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
@ -214,6 +215,7 @@ mod tests {
|
|
|
|
|
None::<String>,
|
|
|
|
|
None::<String>,
|
|
|
|
|
None::<ListingType>,
|
|
|
|
|
None::<SortType>,
|
|
|
|
|
None::<String>,
|
|
|
|
|
None::<bool>,
|
|
|
|
|
None::<bool>,
|
|
|
|
@ -237,6 +239,7 @@ mod tests {
|
|
|
|
|
None::<String>,
|
|
|
|
|
None::<String>,
|
|
|
|
|
None::<ListingType>,
|
|
|
|
|
None::<SortType>,
|
|
|
|
|
None::<String>,
|
|
|
|
|
None::<bool>,
|
|
|
|
|
None::<bool>,
|
|
|
|
@ -260,6 +263,7 @@ mod tests {
|
|
|
|
|
None::<String>,
|
|
|
|
|
None::<String>,
|
|
|
|
|
None::<ListingType>,
|
|
|
|
|
None::<SortType>,
|
|
|
|
|
Some(String::from("(zeta|alpha)")),
|
|
|
|
|
None::<bool>,
|
|
|
|
|
None::<bool>,
|
|
|
|
@ -283,6 +287,7 @@ mod tests {
|
|
|
|
|
None::<String>,
|
|
|
|
|
None::<String>,
|
|
|
|
|
Some(ListingType::Subscribed),
|
|
|
|
|
None::<SortType>,
|
|
|
|
|
None::<String>,
|
|
|
|
|
None::<bool>,
|
|
|
|
|
None::<bool>,
|
|
|
|
@ -306,6 +311,7 @@ mod tests {
|
|
|
|
|
None::<String>,
|
|
|
|
|
None::<String>,
|
|
|
|
|
None::<ListingType>,
|
|
|
|
|
None::<SortType>,
|
|
|
|
|
None::<String>,
|
|
|
|
|
Some(true),
|
|
|
|
|
Some(true),
|
|
|
|
@ -329,6 +335,7 @@ mod tests {
|
|
|
|
|
None::<String>,
|
|
|
|
|
None::<String>,
|
|
|
|
|
None::<ListingType>,
|
|
|
|
|
None::<SortType>,
|
|
|
|
|
None::<String>,
|
|
|
|
|
None::<bool>,
|
|
|
|
|
Some(true),
|
|
|
|
@ -352,6 +359,7 @@ mod tests {
|
|
|
|
|
None::<String>,
|
|
|
|
|
None::<String>,
|
|
|
|
|
None::<ListingType>,
|
|
|
|
|
None::<SortType>,
|
|
|
|
|
None::<String>,
|
|
|
|
|
None::<bool>,
|
|
|
|
|
None::<bool>,
|
|
|
|
@ -409,6 +417,7 @@ mod tests {
|
|
|
|
|
None::<String>,
|
|
|
|
|
None::<String>,
|
|
|
|
|
None::<ListingType>,
|
|
|
|
|
None::<SortType>,
|
|
|
|
|
None::<String>,
|
|
|
|
|
None::<bool>,
|
|
|
|
|
None::<bool>,
|
|
|
|
@ -431,6 +440,7 @@ mod tests {
|
|
|
|
|
Some(String::new()),
|
|
|
|
|
Some(String::new()),
|
|
|
|
|
Some(ListingType::All),
|
|
|
|
|
Some(SortType::Active),
|
|
|
|
|
Some(String::new()),
|
|
|
|
|
Some(false),
|
|
|
|
|
Some(true),
|
|
|
|
@ -453,6 +463,7 @@ mod tests {
|
|
|
|
|
None::<String>,
|
|
|
|
|
None::<String>,
|
|
|
|
|
None::<ListingType>,
|
|
|
|
|
None::<SortType>,
|
|
|
|
|
Some(String::new()),
|
|
|
|
|
None::<bool>,
|
|
|
|
|
None::<bool>,
|
|
|
|
@ -475,6 +486,7 @@ mod tests {
|
|
|
|
|
None::<String>,
|
|
|
|
|
None::<String>,
|
|
|
|
|
None::<ListingType>,
|
|
|
|
|
None::<SortType>,
|
|
|
|
|
None::<String>,
|
|
|
|
|
None::<bool>,
|
|
|
|
|
None::<bool>,
|
|
|
|
@ -524,6 +536,7 @@ mod tests {
|
|
|
|
|
site_description: Option<String>,
|
|
|
|
|
site_sidebar: Option<String>,
|
|
|
|
|
site_listing_type: Option<ListingType>,
|
|
|
|
|
site_sort_type: Option<SortType>,
|
|
|
|
|
site_slur_filter_regex: Option<String>,
|
|
|
|
|
site_is_private: Option<bool>,
|
|
|
|
|
site_is_federated: Option<bool>,
|
|
|
|
@ -544,6 +557,7 @@ mod tests {
|
|
|
|
|
private_instance: site_is_private,
|
|
|
|
|
default_theme: None,
|
|
|
|
|
default_post_listing_type: site_listing_type,
|
|
|
|
|
default_sort_type: site_sort_type,
|
|
|
|
|
legal_information: None,
|
|
|
|
|
application_email_admins: None,
|
|
|
|
|
hide_modlog_mod_names: None,
|
|
|
|
|