From 30379e75d467027b034655d5a35068a70e323a50 Mon Sep 17 00:00:00 2001 From: KMY Date: Thu, 6 Apr 2023 17:13:29 +0900 Subject: [PATCH] Fix errors --- app/controllers/api/v1/accounts/credentials_controller.rb | 2 +- app/javascript/mastodon/reducers/compose.js | 2 +- app/models/user_settings.rb | 2 +- app/serializers/rest/credential_account_serializer.rb | 1 + app/serializers/rest/preferences_serializer.rb | 5 +++++ app/views/settings/preferences/other/show.html.haml | 2 +- db/migrate/20230215074423_move_user_settings.rb | 1 + 7 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/controllers/api/v1/accounts/credentials_controller.rb b/app/controllers/api/v1/accounts/credentials_controller.rb index 9a40f361e7..43d91a4ed6 100644 --- a/app/controllers/api/v1/accounts/credentials_controller.rb +++ b/app/controllers/api/v1/accounts/credentials_controller.rb @@ -43,7 +43,7 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController { settings_attributes: { default_privacy: source_params.fetch(:privacy, @account.user.setting_default_privacy), - default_searchability: source_params.fetch(:searchability, @account.user.setting_default_searchability) + default_searchability: source_params.fetch(:searchability, @account.user.setting_default_searchability), default_sensitive: source_params.fetch(:sensitive, @account.user.setting_default_sensitive), default_language: source_params.fetch(:language, @account.user.setting_default_language), }, diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js index d499f9283e..dfbf064a0e 100644 --- a/app/javascript/mastodon/reducers/compose.js +++ b/app/javascript/mastodon/reducers/compose.js @@ -83,7 +83,7 @@ const initialState = ImmutableMap({ suggestion_token: null, suggestions: ImmutableList(), default_privacy: 'public', - default_searchability: 'public', + default_searchability: 'private', default_sensitive: false, default_language: 'en', resetFileKey: Math.floor((Math.random() * 0x10000)), diff --git a/app/models/user_settings.rb b/app/models/user_settings.rb index cf5201118a..109f5bda67 100644 --- a/app/models/user_settings.rb +++ b/app/models/user_settings.rb @@ -15,7 +15,7 @@ class UserSettings setting :default_language, default: nil setting :default_sensitive, default: false setting :default_privacy, default: nil - setting :default_searchability, default: :private, + setting :default_searchability, default: :private namespace :web do setting :crop_images, default: true diff --git a/app/serializers/rest/credential_account_serializer.rb b/app/serializers/rest/credential_account_serializer.rb index 27e1db2077..3e15387b66 100644 --- a/app/serializers/rest/credential_account_serializer.rb +++ b/app/serializers/rest/credential_account_serializer.rb @@ -10,6 +10,7 @@ class REST::CredentialAccountSerializer < REST::AccountSerializer { privacy: user.setting_default_privacy, + searchability: user.setting_default_searchability, sensitive: user.setting_default_sensitive, language: user.setting_default_language, note: object.note, diff --git a/app/serializers/rest/preferences_serializer.rb b/app/serializers/rest/preferences_serializer.rb index e1c6544608..c63a33b828 100644 --- a/app/serializers/rest/preferences_serializer.rb +++ b/app/serializers/rest/preferences_serializer.rb @@ -2,6 +2,7 @@ class REST::PreferencesSerializer < ActiveModel::Serializer attribute :posting_default_privacy, key: 'posting:default:visibility' + attribute :posting_default_searchability, key: 'posting:default:searchability' attribute :posting_default_sensitive, key: 'posting:default:sensitive' attribute :posting_default_language, key: 'posting:default:language' @@ -13,6 +14,10 @@ class REST::PreferencesSerializer < ActiveModel::Serializer object.user.setting_default_privacy end + def posting_default_searchability + object.user.setting_default_searchability + end + def posting_default_sensitive object.user.setting_default_sensitive end diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml index 67946c62fa..510d6a0cc3 100644 --- a/app/views/settings/preferences/other/show.html.haml +++ b/app/views/settings/preferences/other/show.html.haml @@ -24,7 +24,7 @@ = ff.input :default_language, collection: [nil] + filterable_languages, wrapper: :with_label, label_method: lambda { |locale| locale.nil? ? I18n.t('statuses.default_language') : native_locale_name(locale) }, required: false, include_blank: false, hint: false, label: I18n.t('simple_form.labels.defaults.setting_default_language') .fields-group - = f.input :setting_default_searchability, collection: Status.selectable_searchabilities, wrapper: :with_label, include_blank: false, label_method: lambda { |searchability| safe_join([I18n.t("statuses.searchabilities.#{searchability}"), I18n.t("statuses.searchabilities.#{searchability}_long")], ' - ') }, required: false, hint: false + = ff.input :default_searchability, collection: Status.selectable_searchabilities, wrapper: :with_label, include_blank: false, label_method: lambda { |searchability| safe_join([I18n.t("statuses.searchabilities.#{searchability}"), I18n.t("statuses.searchabilities.#{searchability}_long")], ' - ') }, required: false, hint: false, label: I18n.t('simple_form.labels.defaults.setting_default_searchability') .fields-group = ff.input :default_sensitive, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_default_sensitive'), hint: I18n.t('simple_form.hints.defaults.setting_default_sensitive') diff --git a/db/migrate/20230215074423_move_user_settings.rb b/db/migrate/20230215074423_move_user_settings.rb index 351a8b61df..14c65fd762 100644 --- a/db/migrate/20230215074423_move_user_settings.rb +++ b/db/migrate/20230215074423_move_user_settings.rb @@ -5,6 +5,7 @@ class MoveUserSettings < ActiveRecord::Migration[6.1] MAPPING = { default_privacy: 'default_privacy', + default_searchability: 'default_searchability', default_sensitive: 'web.default_sensitive', default_language: 'default_language', noindex: 'noindex',