Error message for avatar image that's too large. #9204

app/services/update_account_service.rb

@@ -12,6 +12,9 @@ def call(account, params, raise_error: false)
  check_links(account)
  process_hashtags(account)
  end
+ rescue Mastodon::DimensionsValidationError => de
+ account.errors.add(:avatar, de.message)
+ false
  end
 
  private

spec/controllers/settings/profiles_controller_spec.rb

@@ -26,4 +26,26 @@
  expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_async).with(account.id)
  end
  end
+
+ describe 'PUT #update with new profile image' do
+ it 'updates profile image' do
+ allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async)
+ account = Fabricate(:account, user: @user, display_name: 'AvatarTest')
+ expect(account.avatar.instance.avatar_file_name).to be_nil
+
+ put :update, params: { account: { avatar: fixture_file_upload('files/avatar.gif', 'image/gif') } }
+ expect(response).to redirect_to(settings_profile_path)
+ expect(account.reload.avatar.instance.avatar_file_name).not_to be_nil
+ expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_async).with(account.id)
+ end
+ end
+
+ describe 'PUT #update with oversized image' do
+ it 'gives the user an error message' do
+ allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async)
+ account = Fabricate(:account, user: @user, display_name: 'AvatarTest')
+ put :update, params: { account: { avatar: fixture_file_upload('files/4096x4097.png', 'image/png') } }
+ expect(response.body).to include('images are not supported')
+ end
+ end
 end