diff options
| -rw-r--r-- | app/models/status.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index 05061bce1..55337a5e6 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -104,7 +104,7 @@ class Status < ApplicationRecord scope :curated, -> { where(curated: true) } scope :hidden, -> { where(hidden: true) } - scope :with_accounts, ->(ids) { where(id: ids).includes(:account) } + scope :with_accounts, ->(ids) { where(id: ids).where.not(account_id: ConversationKick.select(:account_id).where(conversation_id: self.conversation_id)).includes(:account) } scope :without_replies, -> { where('statuses.reply = FALSE OR statuses.in_reply_to_account_id = statuses.account_id') } scope :without_reblogs, -> { where('statuses.reblog_of_id IS NULL') } scope :reblogs, -> { where('statuses.reblog_of_id IS NOT NULL') } # all reblogs |