mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-24 05:48:07 +01:00
bf94a43496
Conflicts: - app/controllers/oauth/authorized_applications_controller.rb Two changes too close to each other - app/controllers/settings/sessions_controller.rb - app/lib/user_settings_decorator.rb Two changes too close to each other - app/models/media_attachment.rb New changes too close to glitch-soc only changes. - app/models/user.rb Two changes too close to each other. - app/services/remove_status_service.rb Kept direct timeline code which had been removed upstream. - app/views/settings/preferences/show.html.haml Two changes too close to each other. - config/locales/en.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/ja.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/pl.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/simple_form.en.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/locales/simple_form.pl.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/settings.yml Reverted upstream's decision of enabling posting application by default.
34 lines
822 B
Ruby
34 lines
822 B
Ruby
# frozen_string_literal: true
|
|
|
|
class Settings::ProfilesController < Settings::BaseController
|
|
include ObfuscateFilename
|
|
|
|
before_action :set_account
|
|
|
|
obfuscate_filename [:account, :avatar]
|
|
obfuscate_filename [:account, :header]
|
|
|
|
def show
|
|
@account.build_fields
|
|
end
|
|
|
|
def update
|
|
if UpdateAccountService.new.call(@account, account_params)
|
|
ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
|
|
redirect_to settings_profile_path, notice: I18n.t('generic.changes_saved_msg')
|
|
else
|
|
@account.build_fields
|
|
render :show
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def account_params
|
|
params.require(:account).permit(:display_name, :note, :avatar, :header, :locked, :bot, :discoverable, fields_attributes: [:name, :value])
|
|
end
|
|
|
|
def set_account
|
|
@account = current_account
|
|
end
|
|
end
|