diff options
Diffstat (limited to 'app/models/status.rb')
| -rw-r--r-- | app/models/status.rb | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index 9e2711008..c6f5c8d6c 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Status < ApplicationRecord include Paginable include Streamable @@ -89,22 +91,17 @@ class Status < ApplicationRecord def as_public_timeline(account = nil) query = joins('LEFT OUTER JOIN accounts ON statuses.account_id = accounts.id').where('accounts.silenced = FALSE') - - unless account.nil? - query = filter_timeline(query, account) - end + query = filter_timeline(query, account) unless account.nil? query.with_includes.with_counters end def as_tag_timeline(tag, account = nil) query = tag.statuses - .joins('LEFT OUTER JOIN accounts ON statuses.account_id = accounts.id') - .where('accounts.silenced = FALSE') + .joins('LEFT OUTER JOIN accounts ON statuses.account_id = accounts.id') + .where('accounts.silenced = FALSE') - unless account.nil? - query = filter_timeline(query, account) - end + query = filter_timeline(query, account) unless account.nil? query.with_includes.with_counters end |