diff --git a/app/controllers/api/activitypub/activities_controller.rb b/app/controllers/api/activitypub/activities_controller.rb
index 025ab960e3741793930f986f9348e1581410e408..740c8589a7b2853f68199c3635d1e4b201cbe4db 100644
--- a/app/controllers/api/activitypub/activities_controller.rb
+++ b/app/controllers/api/activitypub/activities_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::Activitypub::ActivitiesController < ApiController
+class Api::Activitypub::ActivitiesController < Api::BaseController
include Authorization
# before_action :set_follow, only: [:show_follow]
diff --git a/app/controllers/api/activitypub/notes_controller.rb b/app/controllers/api/activitypub/notes_controller.rb
index ff9383413b4848770b6d6d5f1aa06e3e2b9d32d0..783c1c4edd43c4dad1d4fc45d3155b4c47f3c62a 100644
--- a/app/controllers/api/activitypub/notes_controller.rb
+++ b/app/controllers/api/activitypub/notes_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::Activitypub::NotesController < ApiController
+class Api::Activitypub::NotesController < Api::BaseController
include Authorization
before_action :set_status
diff --git a/app/controllers/api/activitypub/outbox_controller.rb b/app/controllers/api/activitypub/outbox_controller.rb
index 7b6cbdd38be723482efa313868e6fc18a2c53a77..0738d7dee5ae3efc55efa8704fd35b0d437311ee 100644
--- a/app/controllers/api/activitypub/outbox_controller.rb
+++ b/app/controllers/api/activitypub/outbox_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::Activitypub::OutboxController < ApiController
+class Api::Activitypub::OutboxController < Api::BaseController
before_action :set_account
respond_to :activitystreams2
diff --git a/app/controllers/api_controller.rb b/app/controllers/api/base_controller.rb
similarity index 98%
rename from app/controllers/api_controller.rb
rename to app/controllers/api/base_controller.rb
index 42b85865edec9fd2f1b2d5061eaa369b9fb61f22..c1b2ec3cf58bf7941bc48d1b7682e22b6da65bc5 100644
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class ApiController < ApplicationController
+class Api::BaseController < ApplicationController
DEFAULT_STATUSES_LIMIT = 20
DEFAULT_ACCOUNTS_LIMIT = 40
diff --git a/app/controllers/api/oembed_controller.rb b/app/controllers/api/oembed_controller.rb
index 57618835312042bb9a17f9094803620bc0af4f97..6e3e34d964d85c60787ca2bb4b967f328fa98599 100644
--- a/app/controllers/api/oembed_controller.rb
+++ b/app/controllers/api/oembed_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::OEmbedController < ApiController
+class Api::OEmbedController < Api::BaseController
respond_to :json
def show
diff --git a/app/controllers/api/push_controller.rb b/app/controllers/api/push_controller.rb
index 75a1f757b44fe7709e5f119435e234889bc8c253..951867140ca13f0c91859a353bc9c59f23208d3c 100644
--- a/app/controllers/api/push_controller.rb
+++ b/app/controllers/api/push_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::PushController < ApiController
+class Api::PushController < Api::BaseController
def update
response, status = process_push_request
render plain: response, status: status
diff --git a/app/controllers/api/salmon_controller.rb b/app/controllers/api/salmon_controller.rb
index f611b48a098fe4533f99aec2e325ba2a13145972..e9e700b18de5c731bbdc77594393493322becf28 100644
--- a/app/controllers/api/salmon_controller.rb
+++ b/app/controllers/api/salmon_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::SalmonController < ApiController
+class Api::SalmonController < Api::BaseController
before_action :set_account
respond_to :txt
diff --git a/app/controllers/api/subscriptions_controller.rb b/app/controllers/api/subscriptions_controller.rb
index dd2f42aab7bdff474fc01eba594e34ca8f1de8c0..d3ea986761d94c1bc73b75bda27e5d87b70f6110 100644
--- a/app/controllers/api/subscriptions_controller.rb
+++ b/app/controllers/api/subscriptions_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::SubscriptionsController < ApiController
+class Api::SubscriptionsController < Api::BaseController
before_action :set_account
respond_to :txt
diff --git a/app/controllers/api/v1/accounts/credentials_controller.rb b/app/controllers/api/v1/accounts/credentials_controller.rb
index 8f2ded29e39ca156f25e70fa6add320fb3ed7e6e..1cf52ff10c5ed7cf53b2eb1a206e6e5f470d5631 100644
--- a/app/controllers/api/v1/accounts/credentials_controller.rb
+++ b/app/controllers/api/v1/accounts/credentials_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::V1::Accounts::CredentialsController < ApiController
+class Api::V1::Accounts::CredentialsController < Api::BaseController
before_action -> { doorkeeper_authorize! :write }, only: [:update]
before_action :require_user!
diff --git a/app/controllers/api/v1/accounts/follower_accounts_controller.rb b/app/controllers/api/v1/accounts/follower_accounts_controller.rb
index 3e9da29e341681bf9ba601c802398dc83c9e20ac..81aae56d3f67ae6cefde04b4b0f7fa5806921405 100644
--- a/app/controllers/api/v1/accounts/follower_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/follower_accounts_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::V1::Accounts::FollowerAccountsController < ApiController
+class Api::V1::Accounts::FollowerAccountsController < Api::BaseController
before_action -> { doorkeeper_authorize! :read }
before_action :set_account
after_action :insert_pagination_headers
diff --git a/app/controllers/api/v1/accounts/following_accounts_controller.rb b/app/controllers/api/v1/accounts/following_accounts_controller.rb
index 732961aac1051280aa3194e26c57a23672d63d95..63c6d54b29c12e074893717af277a54baa4c9b40 100644
--- a/app/controllers/api/v1/accounts/following_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/following_accounts_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::V1::Accounts::FollowingAccountsController < ApiController
+class Api::V1::Accounts::FollowingAccountsController < Api::BaseController
before_action -> { doorkeeper_authorize! :read }
before_action :set_account
after_action :insert_pagination_headers
diff --git a/app/controllers/api/v1/accounts/relationships_controller.rb b/app/controllers/api/v1/accounts/relationships_controller.rb
index d1a4f178b6cde5a879bb17e1d82bc89dcdc93545..cb923ab91777e70b71790a27ef7eac58151a4661 100644
--- a/app/controllers/api/v1/accounts/relationships_controller.rb
+++ b/app/controllers/api/v1/accounts/relationships_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::V1::Accounts::RelationshipsController < ApiController
+class Api::V1::Accounts::RelationshipsController < Api::BaseController
before_action -> { doorkeeper_authorize! :read }
before_action :require_user!
diff --git a/app/controllers/api/v1/accounts/search_controller.rb b/app/controllers/api/v1/accounts/search_controller.rb
index 6d4c6e4cf9aeb2523620216d5f628ffd7002a4ca..c4a8f97f248d8224d76a7b921dac0beec04255a4 100644
--- a/app/controllers/api/v1/accounts/search_controller.rb
+++ b/app/controllers/api/v1/accounts/search_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::V1::Accounts::SearchController < ApiController
+class Api::V1::Accounts::SearchController < Api::BaseController
before_action -> { doorkeeper_authorize! :read }
before_action :require_user!
diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb
index 1e0d2a740b0f6c9d5f3de504f26ed101199fbe68..504ed8c07d37eb947f5cf493e05e978f96a96368 100644
--- a/app/controllers/api/v1/accounts/statuses_controller.rb
+++ b/app/controllers/api/v1/accounts/statuses_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::V1::Accounts::StatusesController < ApiController
+class Api::V1::Accounts::StatusesController < Api::BaseController
before_action -> { doorkeeper_authorize! :read }
before_action :set_account
after_action :insert_pagination_headers
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index 3b23e996d61715950e499b4cf1b39500427a6310..8fc0dd36f59b346f813566d826a031f34a83f470 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::V1::AccountsController < ApiController
+class Api::V1::AccountsController < Api::BaseController
before_action -> { doorkeeper_authorize! :read }, except: [:follow, :unfollow, :block, :unblock, :mute, :unmute]
before_action -> { doorkeeper_authorize! :follow }, only: [:follow, :unfollow, :block, :unblock, :mute, :unmute]
before_action :require_user!, except: [:show]
diff --git a/app/controllers/api/v1/apps_controller.rb b/app/controllers/api/v1/apps_controller.rb
index 54f8d40b20b0069aeb6fb2dfe438763c84c9e053..98e90894896e33dc1632e5f1f8c6ce93a3652d60 100644
--- a/app/controllers/api/v1/apps_controller.rb
+++ b/app/controllers/api/v1/apps_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::V1::AppsController < ApiController
+class Api::V1::AppsController < Api::BaseController
respond_to :json
def create
diff --git a/app/controllers/api/v1/blocks_controller.rb b/app/controllers/api/v1/blocks_controller.rb
index d15cb439cf5827bc20c9f8ee61626f58880bdbfc..1702953cf73a0ad03766eb737c6ddf02902af33c 100644
--- a/app/controllers/api/v1/blocks_controller.rb
+++ b/app/controllers/api/v1/blocks_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::V1::BlocksController < ApiController
+class Api::V1::BlocksController < Api::BaseController
before_action -> { doorkeeper_authorize! :follow }
before_action :require_user!
after_action :insert_pagination_headers
diff --git a/app/controllers/api/v1/domain_blocks_controller.rb b/app/controllers/api/v1/domain_blocks_controller.rb
index 772c0468760192892e5b67c7a86e3512729e7690..e93dc603bb2fbcf2015006b4be6a310b8fecca82 100644
--- a/app/controllers/api/v1/domain_blocks_controller.rb
+++ b/app/controllers/api/v1/domain_blocks_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::V1::DomainBlocksController < ApiController
+class Api::V1::DomainBlocksController < Api::BaseController
BLOCK_LIMIT = 100
before_action -> { doorkeeper_authorize! :follow }
diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb
index a74db92af00326b945b85df20039dcb2efdda1f7..fe0819a3f5913cb768814c73944907bc1259dc7d 100644
--- a/app/controllers/api/v1/favourites_controller.rb
+++ b/app/controllers/api/v1/favourites_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::V1::FavouritesController < ApiController
+class Api::V1::FavouritesController < Api::BaseController
before_action -> { doorkeeper_authorize! :read }
before_action :require_user!
after_action :insert_pagination_headers
diff --git a/app/controllers/api/v1/follow_requests_controller.rb b/app/controllers/api/v1/follow_requests_controller.rb
index 8a8d40d7711e371144760dce7b6028fd397551fd..eed22ef4fbae183eafb49c198ad06ce1cf556e33 100644
--- a/app/controllers/api/v1/follow_requests_controller.rb
+++ b/app/controllers/api/v1/follow_requests_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::V1::FollowRequestsController < ApiController
+class Api::V1::FollowRequestsController < Api::BaseController
before_action -> { doorkeeper_authorize! :follow }
before_action :require_user!
after_action :insert_pagination_headers, only: :index
diff --git a/app/controllers/api/v1/follows_controller.rb b/app/controllers/api/v1/follows_controller.rb
index 67d823398a686b7bf406975858c7bd64a64ea3ef..bcdb4e177a752c9e1416c2d888d94af5cadda2d2 100644
--- a/app/controllers/api/v1/follows_controller.rb
+++ b/app/controllers/api/v1/follows_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::V1::FollowsController < ApiController
+class Api::V1::FollowsController < Api::BaseController
before_action -> { doorkeeper_authorize! :follow }
before_action :require_user!
diff --git a/app/controllers/api/v1/instances_controller.rb b/app/controllers/api/v1/instances_controller.rb
index 51d92838acf179ca47dff1d4e948808deba05ad6..ce2181879be0f64e1cdd06f13b1078e1fb96f9d5 100644
--- a/app/controllers/api/v1/instances_controller.rb
+++ b/app/controllers/api/v1/instances_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::V1::InstancesController < ApiController
+class Api::V1::InstancesController < Api::BaseController
respond_to :json
def show; end
diff --git a/app/controllers/api/v1/media_controller.rb b/app/controllers/api/v1/media_controller.rb
index 3d7dcef420f63e7c354f7b7dfc214153c1bb9b19..25a3313195cbdc62513a93aa1d4624d76d8d7635 100644
--- a/app/controllers/api/v1/media_controller.rb
+++ b/app/controllers/api/v1/media_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::V1::MediaController < ApiController
+class Api::V1::MediaController < Api::BaseController
before_action -> { doorkeeper_authorize! :write }
before_action :require_user!
diff --git a/app/controllers/api/v1/mutes_controller.rb b/app/controllers/api/v1/mutes_controller.rb
index b9ac741765d5a830d61939e5acd4506f0a384f8d..2a353df039a622a93433600306ea8cbe564a54cb 100644
--- a/app/controllers/api/v1/mutes_controller.rb
+++ b/app/controllers/api/v1/mutes_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::V1::MutesController < ApiController
+class Api::V1::MutesController < Api::BaseController
before_action -> { doorkeeper_authorize! :follow }
before_action :require_user!
after_action :insert_pagination_headers
diff --git a/app/controllers/api/v1/notifications_controller.rb b/app/controllers/api/v1/notifications_controller.rb
index 1cd4ca40a4bcd703f238e02c9328f6799c5ce5c9..20b28776db80b5f09ddb62f01ce77047e2e7c1bf 100644
--- a/app/controllers/api/v1/notifications_controller.rb
+++ b/app/controllers/api/v1/notifications_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::V1::NotificationsController < ApiController
+class Api::V1::NotificationsController < Api::BaseController
before_action -> { doorkeeper_authorize! :read }
before_action :require_user!
after_action :insert_pagination_headers, only: :index
diff --git a/app/controllers/api/v1/reports_controller.rb b/app/controllers/api/v1/reports_controller.rb
index e0f9ed2322cdbbbee9fb828fc78fd5b3df647c4d..71df76e922e0b285a2908451e5e452a8a4a3efb7 100644
--- a/app/controllers/api/v1/reports_controller.rb
+++ b/app/controllers/api/v1/reports_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::V1::ReportsController < ApiController
+class Api::V1::ReportsController < Api::BaseController
before_action -> { doorkeeper_authorize! :read }, except: [:create]
before_action -> { doorkeeper_authorize! :write }, only: [:create]
before_action :require_user!
diff --git a/app/controllers/api/v1/search_controller.rb b/app/controllers/api/v1/search_controller.rb
index 1ee2589a0143d85d223ef5a3e2b1a775c8334559..8b832148c303dd896c69db8de21517b6c128b3c0 100644
--- a/app/controllers/api/v1/search_controller.rb
+++ b/app/controllers/api/v1/search_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::V1::SearchController < ApiController
+class Api::V1::SearchController < Api::BaseController
RESULTS_LIMIT = 5
respond_to :json
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index 7386d715825525a647e9c70c6bbf6bda3a1121cd..53fb1619e7ffa13490120e80cdca39518ddeb960 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::V1::StatusesController < ApiController
+class Api::V1::StatusesController < Api::BaseController
include Authorization
before_action :authorize_if_got_token, except: [:create, :destroy, :reblog, :unreblog, :favourite, :unfavourite, :mute, :unmute]
diff --git a/app/controllers/api/v1/streaming_controller.rb b/app/controllers/api/v1/streaming_controller.rb
index 3779514723984bd089139fbc70d6af81e6ba58e6..66b812e761f641f39301843a824b303ecf3268e3 100644
--- a/app/controllers/api/v1/streaming_controller.rb
+++ b/app/controllers/api/v1/streaming_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::V1::StreamingController < ApiController
+class Api::V1::StreamingController < Api::BaseController
respond_to :json
def index
diff --git a/app/controllers/api/v1/timelines/home_controller.rb b/app/controllers/api/v1/timelines/home_controller.rb
index 29e570fa5e107a69598df002adbad9fb32c874c7..511d2f65da2d6d13b511b32e5f923ddbf400f55c 100644
--- a/app/controllers/api/v1/timelines/home_controller.rb
+++ b/app/controllers/api/v1/timelines/home_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::V1::Timelines::HomeController < ApiController
+class Api::V1::Timelines::HomeController < Api::BaseController
before_action -> { doorkeeper_authorize! :read }, only: [:show]
before_action :require_user!, only: [:show]
after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb
index cd3663d5f44cf5332fb5ab6392cb54b734c11187..305451cc7b76d6eaedc45e7137fbb48dc91cbea8 100644
--- a/app/controllers/api/v1/timelines/public_controller.rb
+++ b/app/controllers/api/v1/timelines/public_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::V1::Timelines::PublicController < ApiController
+class Api::V1::Timelines::PublicController < Api::BaseController
after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
respond_to :json
diff --git a/app/controllers/api/v1/timelines/tag_controller.rb b/app/controllers/api/v1/timelines/tag_controller.rb
index 0481f5debe4ba5d62d74a6347db2427013616548..50afca7c72352d35759121dc7bd5c42e902aaef9 100644
--- a/app/controllers/api/v1/timelines/tag_controller.rb
+++ b/app/controllers/api/v1/timelines/tag_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::V1::Timelines::TagController < ApiController
+class Api::V1::Timelines::TagController < Api::BaseController
before_action :load_tag
after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
diff --git a/app/controllers/api/web/settings_controller.rb b/app/controllers/api/web/settings_controller.rb
index 7cceb0dfc794fefb75de6e6f1301d773cc12b593..f6739d506207c3bfb06bbb505a1d568ee588172b 100644
--- a/app/controllers/api/web/settings_controller.rb
+++ b/app/controllers/api/web/settings_controller.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class Api::Web::SettingsController < ApiController
+class Api::Web::SettingsController < Api::BaseController
respond_to :json
before_action :require_user!
diff --git a/spec/controllers/api/base_controller_spec.rb b/spec/controllers/api/base_controller_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..7d5e0116c0da8b01cbf2d2343030e252ccbb2e74
--- /dev/null
+++ b/spec/controllers/api/base_controller_spec.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+class FakeService; end
+
+describe Api::BaseController do
+ controller do
+ def success
+ head 200
+ end
+
+ def error
+ FakeService.new
+ end
+ end
+
+ describe 'Forgery protection' do
+ before do
+ routes.draw { post 'success' => 'api/base#success' }
+ end
+
+ it 'does not protect from forgery' do
+ ActionController::Base.allow_forgery_protection = true
+ post 'success'
+ expect(response).to have_http_status(:success)
+ end
+ end
+
+ describe 'Error handling' do
+ ERRORS_WITH_CODES = {
+ ActiveRecord::RecordInvalid => 422,
+ Mastodon::ValidationError => 422,
+ ActiveRecord::RecordNotFound => 404,
+ Goldfinger::Error => 422,
+ HTTP::Error => 503,
+ OpenSSL::SSL::SSLError => 503,
+ Mastodon::NotPermittedError => 403,
+ }
+
+ before do
+ routes.draw { get 'error' => 'api/base#error' }
+ end
+
+ ERRORS_WITH_CODES.each do |error, code|
+ it "Handles error class of #{error}" do
+ expect(FakeService).to receive(:new).and_raise(error)
+
+ get 'error'
+ expect(response).to have_http_status(code)
+ end
+ end
+ end
+end
diff --git a/spec/controllers/api_controller_spec.rb b/spec/controllers/api_controller_spec.rb
deleted file mode 100644
index 44be4276aca9fd617a3b9c67dbb9e63a822363c4..0000000000000000000000000000000000000000
--- a/spec/controllers/api_controller_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe ApiController, type: :controller do
- controller do
- def success
- head 200
- end
- end
-
- before do
- routes.draw { post 'success' => 'api#success' }
- end
-
- it 'does not protect from forgery' do
- ActionController::Base.allow_forgery_protection = true
- post 'success'
- expect(response).to have_http_status(:success)
- end
-end