diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-11-27 22:47:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-27 22:47:06 +0100 |
commit | 706e534455e2137c324c0ebb30435e7630ab7c1f (patch) | |
tree | 9875215f85439929a41d70853a674a2c33096f93 /app | |
parent | ff78c1177a180f1b9aec8464734ac3aa1c888874 (diff) |
Add UI for setting up account migration (#5832)
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/settings/migrations_controller.rb | 32 | ||||
-rw-r--r-- | app/models/form/migration.rb | 27 | ||||
-rw-r--r-- | app/views/settings/migrations/show.html.haml | 17 | ||||
-rw-r--r-- | app/views/settings/profiles/show.html.haml | 5 |
4 files changed, 81 insertions, 0 deletions
diff --git a/app/controllers/settings/migrations_controller.rb b/app/controllers/settings/migrations_controller.rb new file mode 100644 index 000000000..711ba338f --- /dev/null +++ b/app/controllers/settings/migrations_controller.rb @@ -0,0 +1,32 @@ +# frozen_string_literal: true + +class Settings::MigrationsController < ApplicationController + layout 'admin' + + before_action :authenticate_user! + + def show + @migration = Form::Migration.new(account: current_account.moved_to_account) + end + + def update + @migration = Form::Migration.new(resource_params) + + if @migration.valid? + if current_account.moved_to_account_id != @migration.account&.id + current_account.update!(moved_to_account: @migration.account) + ActivityPub::UpdateDistributionWorker.perform_async(@account.id) + end + + redirect_to settings_migration_path + else + render :show + end + end + + private + + def resource_params + params.require(:migration).permit(:acct) + end +end diff --git a/app/models/form/migration.rb b/app/models/form/migration.rb new file mode 100644 index 000000000..53cee7ee1 --- /dev/null +++ b/app/models/form/migration.rb @@ -0,0 +1,27 @@ +# frozen_string_literal: true + +class Form::Migration + include ActiveModel::Validations + + attr_accessor :acct, :account + + validates :acct, presence: true + + def initialize(attrs = {}) + @account = attrs[:account] + @acct = attrs[:account].acct unless @account.nil? + @acct = attrs[:acct].gsub(/\A@/, '').strip unless attrs[:acct].nil? + end + + def valid? + return false unless super + set_account + errors.empty? + end + + private + + def set_account + self.account = ResolveRemoteAccountService.new.call(acct) if account.nil? && acct.present? + end +end diff --git a/app/views/settings/migrations/show.html.haml b/app/views/settings/migrations/show.html.haml new file mode 100644 index 000000000..b7c34761f --- /dev/null +++ b/app/views/settings/migrations/show.html.haml @@ -0,0 +1,17 @@ +- content_for :page_title do + = t('settings.migrate') + += simple_form_for @migration, as: :migration, url: settings_migration_path, html: { method: :put } do |f| + - if @migration.account + %p.hint= t('migrations.currently_redirecting') + + .fields-group + = render partial: 'authorize_follows/card', locals: { account: @migration.account } + + = render 'shared/error_messages', object: @migration + + .fields-group + = f.input :acct, placeholder: t('migrations.acct') + + .actions + = f.button :button, t('migrations.proceed'), type: :submit, class: 'negative' diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml index 7a06cd014..0fc9db2b9 100644 --- a/app/views/settings/profiles/show.html.haml +++ b/app/views/settings/profiles/show.html.haml @@ -21,3 +21,8 @@ .actions = f.button :button, t('generic.save_changes'), type: :submit + +%hr/ + +%h6= t('auth.migrate_account') +%p.muted-hint= t('auth.migrate_account_html', path: settings_migration_path) |