Merge remote-tracking branch 'origin/kb_development' into kb_migration

app/controllers/api/v1/accounts/credentials_controller.rb

@@ -29,6 +29,7 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController
       :locked,
       :bot,
       :discoverable,
+      :searchability,
       :hide_collections,
       fields_attributes: [:name, :value]
     )
@@ -42,6 +43,7 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController
     {
       settings_attributes: {
         default_privacy: source_params.fetch(:privacy, @account.user.setting_default_privacy),
+        default_searchability: source_params.fetch(:searchability, @account.user.setting_default_searchability)
         default_sensitive: source_params.fetch(:sensitive, @account.user.setting_default_sensitive),
         default_language: source_params.fetch(:language, @account.user.setting_default_language),
       },

app/controllers/api/v1/statuses_controller.rb

@@ -59,6 +59,7 @@ class Api::V1::StatusesController < Api::BaseController
       sensitive: status_params[:sensitive],
       spoiler_text: status_params[:spoiler_text],
       visibility: status_params[:visibility],
+      searchability: status_params[:searchability],
       language: status_params[:language],
       scheduled_at: status_params[:scheduled_at],
       application: doorkeeper_token.application,
@@ -133,6 +134,7 @@ class Api::V1::StatusesController < Api::BaseController
       :sensitive,
       :spoiler_text,
       :visibility,
+      :searchability,
       :language,
       :scheduled_at,
       allowed_mentions: [],

app/controllers/api/v2/search_controller.rb

@@ -39,6 +39,6 @@ class Api::V2::SearchController < Api::BaseController
   end
 
   def search_params
-    params.permit(:type, :offset, :min_id, :max_id, :account_id)
+    params.permit(:type, :offset, :min_id, :max_id, :account_id, :searchability)
   end
 end