Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2024-03-14 17:27:16 +01:00
40 changed files with 351 additions and 244 deletions

View File

@@ -126,14 +126,16 @@ namespace :api, format: false do
end
resource :instance, only: [:show] do
resources :peers, only: [:index], controller: 'instances/peers'
resources :rules, only: [:index], controller: 'instances/rules'
resources :domain_blocks, only: [:index], controller: 'instances/domain_blocks'
resource :privacy_policy, only: [:show], controller: 'instances/privacy_policies'
resource :extended_description, only: [:show], controller: 'instances/extended_descriptions'
resource :translation_languages, only: [:show], controller: 'instances/translation_languages'
resource :languages, only: [:show], controller: 'instances/languages'
resource :activity, only: [:show], controller: 'instances/activity'
scope module: :instances do
resources :peers, only: [:index]
resources :rules, only: [:index]
resources :domain_blocks, only: [:index]
resource :privacy_policy, only: [:show]
resource :extended_description, only: [:show]
resource :translation_languages, only: [:show]
resource :languages, only: [:show]
resource :activity, only: [:show], controller: :activity
end
end
namespace :peers do
@@ -183,12 +185,14 @@ namespace :api, format: false do
end
resources :accounts, only: [:create, :show] do
resources :statuses, only: :index, controller: 'accounts/statuses'
resources :followers, only: :index, controller: 'accounts/follower_accounts'
resources :following, only: :index, controller: 'accounts/following_accounts'
resources :lists, only: :index, controller: 'accounts/lists'
resources :identity_proofs, only: :index, controller: 'accounts/identity_proofs'
resources :featured_tags, only: :index, controller: 'accounts/featured_tags'
scope module: :accounts do
resources :statuses, only: :index
resources :followers, only: :index, controller: :follower_accounts
resources :following, only: :index, controller: :following_accounts
resources :lists, only: :index
resources :identity_proofs, only: :index
resources :featured_tags, only: :index
end
member do
post :follow