1
0
Fork 0
forked from gitea/nas

Fix errors

This commit is contained in:
KMY 2023-04-06 17:13:29 +09:00
parent 6042ef7008
commit 30379e75d4
7 changed files with 11 additions and 4 deletions

View file

@ -43,7 +43,7 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController
{ {
settings_attributes: { settings_attributes: {
default_privacy: source_params.fetch(:privacy, @account.user.setting_default_privacy), 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_sensitive: source_params.fetch(:sensitive, @account.user.setting_default_sensitive),
default_language: source_params.fetch(:language, @account.user.setting_default_language), default_language: source_params.fetch(:language, @account.user.setting_default_language),
}, },

View file

@ -83,7 +83,7 @@ const initialState = ImmutableMap({
suggestion_token: null, suggestion_token: null,
suggestions: ImmutableList(), suggestions: ImmutableList(),
default_privacy: 'public', default_privacy: 'public',
default_searchability: 'public', default_searchability: 'private',
default_sensitive: false, default_sensitive: false,
default_language: 'en', default_language: 'en',
resetFileKey: Math.floor((Math.random() * 0x10000)), resetFileKey: Math.floor((Math.random() * 0x10000)),

View file

@ -15,7 +15,7 @@ class UserSettings
setting :default_language, default: nil setting :default_language, default: nil
setting :default_sensitive, default: false setting :default_sensitive, default: false
setting :default_privacy, default: nil setting :default_privacy, default: nil
setting :default_searchability, default: :private, setting :default_searchability, default: :private
namespace :web do namespace :web do
setting :crop_images, default: true setting :crop_images, default: true

View file

@ -10,6 +10,7 @@ class REST::CredentialAccountSerializer < REST::AccountSerializer
{ {
privacy: user.setting_default_privacy, privacy: user.setting_default_privacy,
searchability: user.setting_default_searchability,
sensitive: user.setting_default_sensitive, sensitive: user.setting_default_sensitive,
language: user.setting_default_language, language: user.setting_default_language,
note: object.note, note: object.note,

View file

@ -2,6 +2,7 @@
class REST::PreferencesSerializer < ActiveModel::Serializer class REST::PreferencesSerializer < ActiveModel::Serializer
attribute :posting_default_privacy, key: 'posting:default:visibility' 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_sensitive, key: 'posting:default:sensitive'
attribute :posting_default_language, key: 'posting:default:language' attribute :posting_default_language, key: 'posting:default:language'
@ -13,6 +14,10 @@ class REST::PreferencesSerializer < ActiveModel::Serializer
object.user.setting_default_privacy object.user.setting_default_privacy
end end
def posting_default_searchability
object.user.setting_default_searchability
end
def posting_default_sensitive def posting_default_sensitive
object.user.setting_default_sensitive object.user.setting_default_sensitive
end end

View file

@ -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') = 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 .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 .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') = 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')

View file

@ -5,6 +5,7 @@ class MoveUserSettings < ActiveRecord::Migration[6.1]
MAPPING = { MAPPING = {
default_privacy: 'default_privacy', default_privacy: 'default_privacy',
default_searchability: 'default_searchability',
default_sensitive: 'web.default_sensitive', default_sensitive: 'web.default_sensitive',
default_language: 'default_language', default_language: 'default_language',
noindex: 'noindex', noindex: 'noindex',