mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-16 16:15:01 +01:00
a7aedebc31
Conflicts: - `Gemfile.lock`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file. - `app/controllers/oauth/authorized_applications_controller.rb`: Upstream changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/base_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/sessions_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/models/user.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc not preventing moved accounts from logging in. Ported upstream changes while keeping the ability for moved accounts to log in. - `app/policies/status_policy.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `app/serializers/rest/account_serializer.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's ability to hide followers count. Ported upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `package.json`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file.
66 lines
2.1 KiB
Ruby
66 lines
2.1 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class Settings::IdentityProofsController < Settings::BaseController
|
|
before_action :check_required_params, only: :new
|
|
before_action :check_enabled, only: :new
|
|
|
|
def index
|
|
@proofs = AccountIdentityProof.where(account: current_account).order(provider: :asc, provider_username: :asc)
|
|
@proofs.each(&:refresh!)
|
|
end
|
|
|
|
def new
|
|
@proof = current_account.identity_proofs.new(
|
|
token: params[:token],
|
|
provider: params[:provider],
|
|
provider_username: params[:provider_username]
|
|
)
|
|
|
|
if current_account.username.casecmp(params[:username]).zero?
|
|
render layout: 'auth'
|
|
else
|
|
redirect_to settings_identity_proofs_path, alert: I18n.t('identity_proofs.errors.wrong_user', proving: params[:username], current: current_account.username)
|
|
end
|
|
end
|
|
|
|
def create
|
|
@proof = current_account.identity_proofs.where(provider: resource_params[:provider], provider_username: resource_params[:provider_username]).first_or_initialize(resource_params)
|
|
@proof.token = resource_params[:token]
|
|
|
|
if @proof.save
|
|
PostStatusService.new.call(current_user.account, text: post_params[:status_text]) if publish_proof?
|
|
redirect_to @proof.on_success_path(params[:user_agent])
|
|
else
|
|
redirect_to settings_identity_proofs_path, alert: I18n.t('identity_proofs.errors.failed', provider: @proof.provider.capitalize)
|
|
end
|
|
end
|
|
|
|
def destroy
|
|
@proof = current_account.identity_proofs.find(params[:id])
|
|
@proof.destroy!
|
|
redirect_to settings_identity_proofs_path, success: I18n.t('identity_proofs.removed')
|
|
end
|
|
|
|
private
|
|
|
|
def check_enabled
|
|
not_found unless Setting.enable_keybase
|
|
end
|
|
|
|
def check_required_params
|
|
redirect_to settings_identity_proofs_path unless [:provider, :provider_username, :username, :token].all? { |k| params[k].present? }
|
|
end
|
|
|
|
def resource_params
|
|
params.require(:account_identity_proof).permit(:provider, :provider_username, :token)
|
|
end
|
|
|
|
def publish_proof?
|
|
ActiveModel::Type::Boolean.new.cast(post_params[:post_status])
|
|
end
|
|
|
|
def post_params
|
|
params.require(:account_identity_proof).permit(:post_status, :status_text)
|
|
end
|
|
end
|