mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use current_account from ApplicationController. 

This avoids copy-pasting definitions of set_account.
pull/179/head
David Yip 2017-10-22 01:02:52 -05:00
parent 4b68e82a19
commit 4c84513e04
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/settings/keyword_mutes_controller.rb
View File

@ -4,7 +4,6 @@ class Settings::KeywordMutesController < ApplicationController
layout 'admin' layout 'admin'
before_action :authenticate_user! before_action :authenticate_user!
before_action :set_account
before_action :load_keyword_mute, only: [:edit, :update, :destroy] before_action :load_keyword_mute, only: [:edit, :update, :destroy]
def index def index
@ -50,12 +49,8 @@ class Settings::KeywordMutesController < ApplicationController
private private
def set_account
@account = current_user.account
end
def keyword_mutes_for_account def keyword_mutes_for_account
Glitch::KeywordMute.where(account: @account) Glitch::KeywordMute.where(account: current_account)
end end
def load_keyword_mute def load_keyword_mute