tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Thibaut Girka
2020-05-28 13:44:57 +02:00
parent ead09f5ddc 57e5e65687
commit ef6bfaf12e
27 changed files with 337 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/status.rb
View File

@ -145,7 +145,7 @@ class Status < ApplicationRecord
ids << account_id if local?
if preloaded.nil?
ids += mentions.where(account: Account.local).pluck(:account_id)
ids += mentions.where(account: Account.local, silent: false).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)