Refactor Api::V1::ProfilesController into two separate controllers (#26573)

This commit is contained in:
Claire 2023-08-21 15:47:09 +02:00 committed by GitHub
parent 1cdcd9dc08
commit 191d302b7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 44 deletions

View file

@ -0,0 +1,13 @@
# frozen_string_literal: true
class Api::V1::Profile::AvatarsController < Api::BaseController
before_action -> { doorkeeper_authorize! :write, :'write:accounts' }
before_action :require_user!
def destroy
@account = current_account
UpdateAccountService.new.call(@account, { avatar: nil }, raise_error: true)
ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
render json: @account, serializer: REST::CredentialAccountSerializer
end
end

View file

@ -0,0 +1,13 @@
# frozen_string_literal: true
class Api::V1::Profile::HeadersController < Api::BaseController
before_action -> { doorkeeper_authorize! :write, :'write:accounts' }
before_action :require_user!
def destroy
@account = current_account
UpdateAccountService.new.call(@account, { header: nil }, raise_error: true)
ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
render json: @account, serializer: REST::CredentialAccountSerializer
end
end

View file

@ -1,29 +0,0 @@
# frozen_string_literal: true
class Api::V1::ProfilesController < Api::BaseController
before_action -> { doorkeeper_authorize! :write, :'write:accounts' }
before_action :require_user!
before_action :set_image
before_action :validate_image_param
def destroy
@account = current_account
UpdateAccountService.new.call(@account, { @image => nil }, raise_error: true)
ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
render json: @account, serializer: REST::CredentialAccountSerializer
end
private
def set_image
@image = params[:image]
end
def validate_image_param
raise(Mastodon::InvalidParameterError, 'Image must be either "avatar" or "header"') unless valid_image?
end
def valid_image?
%w(avatar header).include?(@image)
end
end

View file

@ -95,7 +95,11 @@ namespace :api, format: false do
resources :filters, only: [:index, :create, :show, :update, :destroy] resources :filters, only: [:index, :create, :show, :update, :destroy]
resources :endorsements, only: [:index] resources :endorsements, only: [:index]
resources :markers, only: [:index, :create] resources :markers, only: [:index, :create]
resources :profile, only: :destroy, param: :image, controller: 'profiles'
namespace :profile do
resource :avatar, only: :destroy
resource :header, only: :destroy
end
namespace :apps do namespace :apps do
get :verify_credentials, to: 'credentials#show' get :verify_credentials, to: 'credentials#show'

View file

@ -94,19 +94,5 @@ RSpec.describe 'Deleting profile images' do
expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_async).with(account.id) expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_async).with(account.id)
end end
end end
context 'when provided picture value is invalid' do
it 'returns http bad request' do
delete '/api/v1/profile/invalid', headers: headers
expect(response).to have_http_status(400)
end
it 'does not queue up an account update distribution' do
delete '/api/v1/profile/invalid', headers: headers
expect(ActivityPub::UpdateDistributionWorker).to_not have_received(:perform_async).with(account.id)
end
end
end end
end end