Merge pull request #1529 from LemmyNet/show_score_setting

Adding a setting to show / hide scores. Fixes #1503
This commit is contained in:
Nutomic 2021-04-06 11:47:31 +00:00 committed by GitHub
commit 7daee06383
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 12 additions and 1 deletions

View file

@ -267,6 +267,7 @@ impl Perform for SaveUserSettings {
email,
password_encrypted,
show_nsfw: data.show_nsfw,
show_scores: data.show_scores,
theme: data.theme.to_owned(),
default_sort_type,
default_listing_type,

View file

@ -47,6 +47,8 @@ pub struct CaptchaResponse {
#[derive(Deserialize)]
pub struct SaveUserSettings {
pub show_nsfw: Option<bool>,
pub show_scores: Option<bool>,
pub show_avatars: Option<bool>,
pub theme: Option<String>,
pub default_sort_type: Option<i16>,
pub default_listing_type: Option<i16>,
@ -60,7 +62,6 @@ pub struct SaveUserSettings {
pub new_password: Option<String>,
pub new_password_verify: Option<String>,
pub old_password: Option<String>,
pub show_avatars: Option<bool>,
pub send_notifications_to_email: Option<bool>,
pub auth: String,
}

View file

@ -133,6 +133,7 @@ impl PerformCrud for Register {
default_listing_type: Some(ListingType::Subscribed as i16),
lang: Some("browser".into()),
show_avatars: Some(true),
show_scores: Some(true),
send_notifications_to_email: Some(false),
};

View file

@ -24,6 +24,7 @@ mod safe_settings_type {
show_avatars,
send_notifications_to_email,
validator_time,
show_scores,
);
impl ToSafeSettings for LocalUser {
@ -43,6 +44,7 @@ mod safe_settings_type {
show_avatars,
send_notifications_to_email,
validator_time,
show_scores,
)
}
}

View file

@ -154,6 +154,7 @@ table! {
show_avatars -> Bool,
send_notifications_to_email -> Bool,
validator_time -> Timestamp,
show_scores -> Bool,
}
}

View file

@ -16,6 +16,7 @@ pub struct LocalUser {
pub show_avatars: bool,
pub send_notifications_to_email: bool,
pub validator_time: chrono::NaiveDateTime,
pub show_scores: bool,
}
// TODO redo these, check table defaults
@ -32,6 +33,7 @@ pub struct LocalUserForm {
pub lang: Option<String>,
pub show_avatars: Option<bool>,
pub send_notifications_to_email: Option<bool>,
pub show_scores: Option<bool>,
}
/// A local user view that removes password encrypted
@ -49,4 +51,5 @@ pub struct LocalUserSettings {
pub show_avatars: bool,
pub send_notifications_to_email: bool,
pub validator_time: chrono::NaiveDateTime,
pub show_scores: bool,
}

View file

@ -0,0 +1 @@
alter table local_user drop column show_scores;

View file

@ -0,0 +1 @@
alter table local_user add column show_scores boolean default true not null;