diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-04-25 18:28:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-25 18:28:27 +0200 |
| commit | a481af15a9b2a7829c2a849906aa4b475ccdbd98 (patch) | |
| tree | 2316623ed73758bd1d61477d94aee3492744933c /app/models | |
| parent | bb12af7250c9368905bae7d91c6ff0b06f3aa400 (diff) | |
| parent | 002d2729fb342ec899d4322bbd64331da7d22a03 (diff) | |
Merge pull request #1750 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models')
| -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 9eaf85668..cc7ee568f 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -150,11 +150,13 @@ class Status < ApplicationRecord 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) + ids += poll.votes.where(account: Account.local).pluck(:account_id) if poll.present? else ids += preloaded.mentions[id] || [] ids += preloaded.favourites[id] || [] ids += preloaded.reblogs[id] || [] ids += preloaded.bookmarks[id] || [] + ids += preloaded.votes[id] || [] end ids.uniq |