diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 23:08:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 23:08:41 -0400 |
| commit | 315ff648c8ab9f3bb34e2b6b1f77453159e260c4 (patch) | |
| tree | b3793cec5458e83ad0d7053d7f85a174d05a5523 /app/models/account.rb | |
| parent | 94536af96d9884e2acb2c34d0cf8948b1de7dd5d (diff) | |
| parent | 41923d1c6ba28df6652aefd9619acc33a5cf467a (diff) | |
Merge branch 'master' into list-oulipo-social
Diffstat (limited to 'app/models/account.rb')
| -rw-r--r-- | app/models/account.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 6968607a2..cbba8b5b6 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -125,11 +125,11 @@ class Account < ApplicationRecord end def favourited?(status) - (status.reblog? ? status.reblog : status).favourites.where(account: self).count.positive? + status.proper.favourites.where(account: self).count.positive? end def reblogged?(status) - (status.reblog? ? status.reblog : status).reblogs.where(account: self).count.positive? + status.proper.reblogs.where(account: self).count.positive? end def keypair |