diff options
| author | multiple creatures <dev@multiple-creature.party> | 2019-12-12 04:38:56 -0600 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2019-12-12 04:38:56 -0600 |
| commit | a8713ee8b73ef63dab45c3c4db949dbfc49a6381 (patch) | |
| tree | 51bc07def409119d246bbbcf4e123ebc0572470a /app/models/concerns/status_threading_concern.rb | |
| parent | 90373b7f3190e86882e764d9cf595f7345a97245 (diff) | |
add ability for post authors to kick jerks out of their threads
Diffstat (limited to 'app/models/concerns/status_threading_concern.rb')
| -rw-r--r-- | app/models/concerns/status_threading_concern.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/concerns/status_threading_concern.rb b/app/models/concerns/status_threading_concern.rb index 1e5c52c46..adf8659d3 100644 --- a/app/models/concerns/status_threading_concern.rb +++ b/app/models/concerns/status_threading_concern.rb @@ -127,7 +127,8 @@ module StatusThreadingConcern end def statuses_with_accounts(ids) - Status.where(id: ids).includes(:account) + kicked_accounts = ConversationKick.select(:account_id).where(conversation_id: self.conversation_id) + Status.where(id: ids).where.not(account_id: kicked_accounts).includes(:account) end def filter_from_context?(status, account, relations) |