diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/media_attachment.rb | 4 | ||||
| -rw-r--r-- | app/models/user.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index 324bd0305..4fed048a5 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -197,8 +197,8 @@ class MediaAttachment < ApplicationRecord scope :uninlined, -> { where(inline: false) } scope :inlined, -> { rewhere(inline: true) } scope :all_media, -> { unscope(where: :inline) } - scope :local, -> { where(remote_url: '') } - scope :remote, -> { where.not(remote_url: '') } + scope :local, -> { all_media.where(remote_url: '') } + scope :remote, -> { all_media.where.not(remote_url: '') } scope :cached, -> { remote.where.not(file_file_name: nil) } default_scope { uninlined.order(id: :asc) } diff --git a/app/models/user.rb b/app/models/user.rb index 8fe694ba1..23c0f232b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -114,7 +114,7 @@ class User < ApplicationRecord :expand_spoilers, :default_language, :aggregate_reblogs, :show_application, :advanced_layout, :use_blurhash, :use_pending_items, :trends, :crop_images, :default_content_type, :system_emoji_font, - :manual_publish, + :manual_publish, :style_dashed_nest, to: :settings, prefix: :setting, allow_nil: false attr_reader :invite_code, :sign_in_token_attempt |