4 files changed, 20 insertions(+), 33 deletions(-)

R app/controllers/api/v1/{profiles_controller => profile/avatars_controller}.rb
A app/controllers/api/v1/profile/headers_controller.rb
M config/routes/api.rb
M spec/requests/api/v1/profiles_spec.rb

@@ 1,29 1,13 @@
 # frozen_string_literal: true
 
-class Api::V1::ProfilesController < Api::BaseController
+class Api::V1::Profile::AvatarsController < 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)
+    UpdateAccountService.new.call(@account, { avatar: 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

@@ 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

@@ 95,7 95,11 @@ namespace :api, format: false do
     resources :filters, only: [:index, :create, :show, :update, :destroy]
     resources :endorsements, only: [:index]
     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
       get :verify_credentials, to: 'credentials#show'

@@ 94,19 94,5 @@ RSpec.describe 'Deleting profile images' do
         expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_async).with(account.id)
       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