Move mute action into `Settings::MutesController`
This commit is contained in:
parent
917e32b4fc
commit
a4bc137aca
|
@ -0,0 +1,9 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
class Settings::MutesController < ApplicationController
|
||||||
|
before_action :authenticate_user!
|
||||||
|
|
||||||
|
def index
|
||||||
|
@rules = MuteRule.where(user: current_user)
|
||||||
|
end
|
||||||
|
end
|
|
@ -1,5 +1,5 @@
|
||||||
class UserController < ApplicationController
|
class UserController < ApplicationController
|
||||||
before_action :authenticate_user!, only: %w[data edit_mute edit_blocks]
|
before_action :authenticate_user!, only: %w[data edit_blocks]
|
||||||
|
|
||||||
def show
|
def show
|
||||||
@user = User.where('LOWER(screen_name) = ?', params[:username].downcase).includes(:profile).first!
|
@user = User.where('LOWER(screen_name) = ?', params[:username].downcase).includes(:profile).first!
|
||||||
|
@ -69,12 +69,6 @@ class UserController < ApplicationController
|
||||||
def data
|
def data
|
||||||
end
|
end
|
||||||
|
|
||||||
# region Muting
|
|
||||||
def edit_mute
|
|
||||||
@rules = MuteRule.where(user: current_user)
|
|
||||||
end
|
|
||||||
# endregion
|
|
||||||
|
|
||||||
def edit_blocks
|
def edit_blocks
|
||||||
@blocks = Relationships::Block.where(source: current_user)
|
@blocks = Relationships::Block.where(source: current_user)
|
||||||
@anonymous_blocks = AnonymousBlock.where(user: current_user)
|
@anonymous_blocks = AnonymousBlock.where(user: current_user)
|
||||||
|
|
|
@ -75,6 +75,8 @@ Rails.application.routes.draw do
|
||||||
get :export, to: 'export#index'
|
get :export, to: 'export#index'
|
||||||
post :export, to: 'export#create'
|
post :export, to: 'export#create'
|
||||||
|
|
||||||
|
get :muted, to: 'mutes#index'
|
||||||
|
|
||||||
namespace :two_factor_authentication do
|
namespace :two_factor_authentication do
|
||||||
get :otp_authentication, to: 'otp_authentication#index'
|
get :otp_authentication, to: 'otp_authentication#index'
|
||||||
patch :otp_authentication, to: 'otp_authentication#update'
|
patch :otp_authentication, to: 'otp_authentication#update'
|
||||||
|
@ -85,7 +87,6 @@ Rails.application.routes.draw do
|
||||||
resolve('Theme') { [:settings_theme] } # to make link_to/form_for work nicely when passing a `Theme` object to it, see also: https://api.rubyonrails.org/v6.1.5.1/classes/ActionDispatch/Routing/Mapper/CustomUrls.html#method-i-resolve
|
resolve('Theme') { [:settings_theme] } # to make link_to/form_for work nicely when passing a `Theme` object to it, see also: https://api.rubyonrails.org/v6.1.5.1/classes/ActionDispatch/Routing/Mapper/CustomUrls.html#method-i-resolve
|
||||||
resolve('Profile') { [:settings_profile] }
|
resolve('Profile') { [:settings_profile] }
|
||||||
|
|
||||||
match '/settings/muted', to: 'user#edit_mute', via: :get, as: :edit_user_mute_rules
|
|
||||||
match '/settings/blocks', to: 'user#edit_blocks', via: :get, as: :edit_user_blocks
|
match '/settings/blocks', to: 'user#edit_blocks', via: :get, as: :edit_user_blocks
|
||||||
|
|
||||||
# resources :services, only: [:index, :destroy]
|
# resources :services, only: [:index, :destroy]
|
||||||
|
|
Loading…
Reference in New Issue