gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 17

Merge remote-tracking branch 'parent/main' into upstream-20240716

Browse source
This commit is contained in:
KMY 2024-07-16 09:01:12 +09:00
commit adee1645a3
203 changed files with 1707 additions and 1067 deletions
Download patch file Download diff file Expand all files Collapse all files

18
config/routes/api.rb
View file

@ -218,9 +218,11 @@ namespace :api, format: false do
post :unmute
end
resource :pin, only: :create, controller: 'accounts/pins'
post :unpin, to: 'accounts/pins#destroy'
resource :note, only: :create, controller: 'accounts/notes'
scope module: :accounts do
resource :pin, only: :create
post :unpin, to: 'pins#destroy'
resource :note, only: :create
end
end
resources :tags, only: [:show] do
@ -233,7 +235,7 @@ namespace :api, format: false do
resources :followed_tags, only: [:index]
resources :lists, only: [:index, :create, :show, :update, :destroy] do
resource :accounts, only: [:show, :create, :destroy], controller: 'lists/accounts'
resource :accounts, only: [:show, :create, :destroy], module: :lists
end
resources :antennas, only: [:index, :create, :show, :update, :destroy] do
@ -263,7 +265,7 @@ namespace :api, format: false do
resources :featured_tags, only: [:index, :create, :destroy]
resources :polls, only: [:create, :show] do
resources :votes, only: :create, controller: 'polls/votes'
resources :votes, only: :create, module: :polls
end
namespace :push do
@ -349,8 +351,10 @@ namespace :api, format: false do
resources :suggestions, only: [:index]
resource :instance, only: [:show]
resources :filters, only: [:index, :create, :show, :update, :destroy] do
resources :keywords, only: [:index, :create], controller: 'filters/keywords'
resources :statuses, only: [:index, :create], controller: 'filters/statuses'
scope module: :filters do
resources :keywords, only: [:index, :create]
resources :statuses, only: [:index, :create]
end
end
namespace :filters do

16
config/routes/settings.rb
View file

@ -27,9 +27,9 @@ namespace :settings do
resources :follows, only: :index, controller: :following_accounts
resources :blocks, only: :index, controller: :blocked_accounts
resources :mutes, only: :index, controller: :muted_accounts
resources :lists, only: :index, controller: :lists
resources :lists, only: :index
resources :domain_blocks, only: :index, controller: :blocked_domains
resources :bookmarks, only: :index, controller: :bookmarks
resources :bookmarks, only: :index
end
resources :two_factor_authentication_methods, only: [:index] do
@ -38,13 +38,13 @@ namespace :settings do
end
end
resource :otp_authentication, only: [:show, :create], controller: 'two_factor_authentication/otp_authentication'
scope module: :two_factor_authentication do
resource :otp_authentication, only: [:show, :create], controller: :otp_authentication
resources :webauthn_credentials, only: [:index, :new, :create, :destroy],
path: 'security_keys',
controller: 'two_factor_authentication/webauthn_credentials' do
collection do
get :options
resources :webauthn_credentials, only: [:index, :new, :create, :destroy], path: 'security_keys' do
collection do
get :options
end
end
end