diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-10-01 12:43:20 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-01 12:43:20 +0200 |
commit | c91d9b7389c489980fe98812a8f3884b2d41e19e (patch) | |
tree | 78509567984a32411c661167e254c8645eba2919 /app/models/user.rb | |
parent | 4e60a0d5433f5dfa4f71a452cc5c6ceb0f21ceab (diff) | |
parent | 5d5d1b528eda560191b2813714c9e461fda3c9d8 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb
Diffstat (limited to 'app/models/user.rb')
-rw-r--r-- | app/models/user.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 6022a5eb0..b9e18eecd 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -95,8 +95,8 @@ class User < ApplicationRecord has_many :session_activations, dependent: :destroy delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :favourite_modal, :delete_modal, - :reduce_motion, :system_font_ui, :noindex, :flavour, :skin, :display_sensitive_media, :hide_network, - :default_language, to: :settings, prefix: :setting, allow_nil: false + :reduce_motion, :system_font_ui, :noindex, :flavour, :skin, :display_media, :hide_network, + :expand_spoilers, :default_language, to: :settings, prefix: :setting, allow_nil: false attr_reader :invite_code @@ -316,6 +316,14 @@ class User < ApplicationRecord super end + def show_all_media? + setting_display_media == 'show_all' + end + + def hide_all_media? + setting_display_media == 'hide_all' + end + protected def send_devise_notification(notification, *args) |