From 5a880ff995ea9b1e8be419965bd4ad3ef148ed9a Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Fri, 27 Mar 2026 11:29:52 -0400 Subject: [PATCH] Clean up some route declarations (#38444) --- config/routes.rb | 6 ++++-- config/routes/admin.rb | 6 +++--- config/routes/api.rb | 2 +- config/routes/settings.rb | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index d31331a6c1..85bd79a1ce 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -200,7 +200,7 @@ Rails.application.routes.draw do resources :emojis, only: [:show] resources :invites, only: [:index, :create, :destroy] resources :filters, except: [:show] do - resources :statuses, only: [:index], controller: 'filters/statuses' do + resources :statuses, only: [:index], module: :filters do collection do post :batch end @@ -219,7 +219,9 @@ Rails.application.routes.draw do resource :statuses_cleanup, controller: :statuses_cleanup, only: [:show, :update] get '/media_proxy/:id/(*any)', to: 'media_proxy#show', as: :media_proxy, format: false - get '/backups/:id/download', to: 'backups#download', as: :download_backup, format: false + resources :backups, only: [] do + member { get :download, format: false } + end resource :authorize_interaction, only: [:show] resource :share, only: [:show] diff --git a/config/routes/admin.rb b/config/routes/admin.rb index 84beea4611..3751126382 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -92,7 +92,7 @@ namespace :admin do post :stop_delivery end - resources :moderation_notes, controller: 'instances/moderation_notes', only: [:create, :destroy] + resources :moderation_notes, module: :instances, only: [:create, :destroy] end resources :rules, only: [:index, :new, :create, :edit, :update, :destroy] do @@ -108,13 +108,13 @@ namespace :admin do post :disable end - resource :secret, only: [], controller: 'webhooks/secrets' do + resource :secret, only: [], module: :webhooks do post :rotate end end resources :reports, only: [:index, :show] do - resources :actions, only: [:create], controller: 'reports/actions' do + resources :actions, only: [:create], module: :reports do collection do post :preview end diff --git a/config/routes/api.rb b/config/routes/api.rb index 696981aad2..a2a93ff207 100644 --- a/config/routes/api.rb +++ b/config/routes/api.rb @@ -258,7 +258,7 @@ namespace :api, format: false do end namespace :featured_tags do - get :suggestions, to: 'suggestions#index' + resources :suggestions, only: :index end resources :featured_tags, only: [:index, :create, :destroy] diff --git a/config/routes/settings.rb b/config/routes/settings.rb index f5869a767c..bec68fc6e2 100644 --- a/config/routes/settings.rb +++ b/config/routes/settings.rb @@ -9,7 +9,7 @@ namespace :settings do namespace :preferences do resource :appearance, only: [:show, :update], controller: :appearance - resource :posting_defaults, only: [:show, :update], controller: :posting_defaults + resource :posting_defaults, only: [:show, :update] resource :notifications, only: [:show, :update] resource :other, only: [:show, :update], controller: :other end