about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2020-02-27 13:37:12 -0600
committermultiple creatures <dev@multiple-creature.party>2020-02-27 13:37:12 -0600
commit06bae23f0e537448a06430dada9a1ce6a654f9bc (patch)
tree2a0e0c806b530e1f00cf195c51f7503474f5cea3 /app
parent856c36af97c1f12013532a382ed9a44c1f97d6ac (diff)
(ref: `856c36a`) filter accounts that thread authors kicked out of their thread
Diffstat (limited to 'app')
-rw-r--r--app/models/status.rb2
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