diff options
| author | ThibG <thib@sitedethib.com> | 2020-03-22 17:59:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-22 17:59:47 +0100 |
| commit | d101438b9d1bd827c191605cb21d58f83de2124d (patch) | |
| tree | b36d73f45175add7aa114bb42fca5a528a9b24a4 /app/models/status.rb | |
| parent | 7115b0b8c99b7e88aee264be75945e592dec33e4 (diff) | |
| parent | 9da4bd098cac88c3e44157765adcff01445ba31a (diff) | |
Merge pull request #1305 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/status.rb')
| -rw-r--r-- | app/models/status.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index b2d3c3f3b..a78717d0c 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -148,10 +148,12 @@ class Status < ApplicationRecord ids += mentions.where(account: Account.local).pluck(:account_id) ids += favourites.where(account: Account.local).pluck(:account_id) ids += reblogs.where(account: Account.local).pluck(:account_id) + ids += bookmarks.where(account: Account.local).pluck(:account_id) else ids += preloaded.mentions[id] || [] ids += preloaded.favourites[id] || [] ids += preloaded.reblogs[id] || [] + ids += preloaded.bookmarks[id] || [] end ids.uniq |