diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 21:44:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 21:44:16 -0400 |
| commit | 6d519e6fd19051f48e983ed20748051f58cae146 (patch) | |
| tree | e3ea9fd86592a5172960d1077fddcd43402d104e /app/models/account.rb | |
| parent | 4de3182dc8dbd596785f2e77e3df939be1fc4962 (diff) | |
| parent | d2c9cc31deb812f1a794f27c60ecf65452d31113 (diff) | |
Merge branch 'master' into patch-1
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 |