Skip to content

Commit

Permalink
Add Open links in new tab setting (#3318)
Browse files Browse the repository at this point in the history
* Add Open links in new tab setting

* reorder because it fixes tests ?
  • Loading branch information
Simon Bordeyne committed Jul 3, 2023
1 parent efe9815 commit b8ee931
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 3 deletions.
1 change: 1 addition & 0 deletions crates/api/src/local_user/save_settings.rs
Expand Up @@ -127,6 +127,7 @@ impl Perform for SaveUserSettings {
.interface_language(data.interface_language.clone())
.totp_2fa_secret(totp_2fa_secret)
.totp_2fa_url(totp_2fa_url)
.open_links_in_new_tab(data.open_links_in_new_tab)
.build();

let local_user_res = LocalUser::update(context.pool(), local_user_id, &local_user_form).await;
Expand Down
8 changes: 5 additions & 3 deletions crates/api_common/src/person.rs
Expand Up @@ -75,9 +75,9 @@ pub struct GetCaptchaResponse {
#[cfg_attr(feature = "full", ts(export))]
/// A captcha response.
pub struct CaptchaResponse {
/// A Base64 encoded png
/// A Base64 encoded png
pub png: String,
/// A Base64 encoded wav audio
/// A Base64 encoded wav audio
pub wav: String,
/// The UUID for the captcha item.
pub uuid: String,
Expand Down Expand Up @@ -109,7 +109,7 @@ pub struct SaveUserSettings {
pub email: Option<Sensitive<String>>,
/// Your bio / info, in markdown.
pub bio: Option<String>,
/// Your matrix user id. Ex: @my_user:matrix.org
/// Your matrix user id. Ex: @my_user:matrix.org
pub matrix_user_id: Option<String>,
/// Whether to show or hide avatars.
pub show_avatars: Option<bool>,
Expand All @@ -131,6 +131,8 @@ pub struct SaveUserSettings {
/// None leaves it as is, true will generate or regenerate it, false clears it out.
pub generate_totp_2fa: Option<bool>,
pub auth: Sensitive<String>,
/// Open links in a new tab
pub open_links_in_new_tab: Option<bool>,
}

#[derive(Debug, Serialize, Deserialize, Clone, Default)]
Expand Down
1 change: 1 addition & 0 deletions crates/db_schema/src/schema.rs
Expand Up @@ -406,6 +406,7 @@ diesel::table! {
accepted_application -> Bool,
totp_2fa_secret -> Nullable<Text>,
totp_2fa_url -> Nullable<Text>,
open_links_in_new_tab -> Bool,
}
}

Expand Down
4 changes: 4 additions & 0 deletions crates/db_schema/src/source/local_user.rs
Expand Up @@ -51,6 +51,8 @@ pub struct LocalUser {
pub totp_2fa_secret: Option<String>,
/// A URL to add their 2-factor auth.
pub totp_2fa_url: Option<String>,
/// Open links in a new tab.
pub open_links_in_new_tab: bool,
}

#[derive(Clone, TypedBuilder)]
Expand Down Expand Up @@ -78,6 +80,7 @@ pub struct LocalUserInsertForm {
pub accepted_application: Option<bool>,
pub totp_2fa_secret: Option<Option<String>>,
pub totp_2fa_url: Option<Option<String>>,
pub open_links_in_new_tab: Option<bool>,
}

#[derive(Clone, TypedBuilder)]
Expand All @@ -102,4 +105,5 @@ pub struct LocalUserUpdateForm {
pub accepted_application: Option<bool>,
pub totp_2fa_secret: Option<Option<String>>,
pub totp_2fa_url: Option<Option<String>>,
pub open_links_in_new_tab: Option<bool>,
}
1 change: 1 addition & 0 deletions crates/db_views/src/registration_application_view.rs
Expand Up @@ -287,6 +287,7 @@ mod tests {
totp_2fa_secret: inserted_sara_local_user.totp_2fa_secret,
totp_2fa_url: inserted_sara_local_user.totp_2fa_url,
password_encrypted: inserted_sara_local_user.password_encrypted,
open_links_in_new_tab: inserted_sara_local_user.open_links_in_new_tab,
},
creator: Person {
id: inserted_sara_person.id,
Expand Down
@@ -0,0 +1 @@
alter table local_user drop column open_links_in_new_tab;
@@ -0,0 +1 @@
alter table local_user add column open_links_in_new_tab boolean default false not null;

0 comments on commit b8ee931

Please sign in to comment.