Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Delegate some methods of User to @settings (#5706)

Browse source 
* Move some tests of User into Settings::ScopedSettings

* Add a test for User@settings
This commit is contained in:
ysksn 2017-11-16 00:05:20 +09:00 • committed by Eugen Rochko
parent 7d7df877ef
commit 19e8b861a2
3 changed files with 42 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

40
app/models/user.rb
View file

@ -73,6 +73,10 @@ class User < ApplicationRecord
has_many :session_activations, dependent: :destroy
delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :delete_modal,
:reduce_motion, :system_font_ui, :noindex, :theme,
to: :settings, prefix: :setting, allow_nil: false
def confirmed?
confirmed_at.present?
end
@ -136,42 +140,6 @@ class User < ApplicationRecord
settings.default_privacy || (account.locked? ? 'private' : 'public')
end
def setting_default_sensitive
settings.default_sensitive
end
def setting_unfollow_modal
settings.unfollow_modal
end
def setting_boost_modal
settings.boost_modal
end
def setting_delete_modal
settings.delete_modal
end
def setting_auto_play_gif
settings.auto_play_gif
end
def setting_reduce_motion
settings.reduce_motion
end
def setting_system_font_ui
settings.system_font_ui
end
def setting_noindex
settings.noindex
end
def setting_theme
settings.theme
end
def token_for_app(a)
return nil if a.nil? || a.owner != self
Doorkeeper::AccessToken