diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 21:42:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 21:42:10 -0400 |
| commit | 065defefac7f1e7e05190f7853699dae9ecbf37a (patch) | |
| tree | 5fff3fb0e831c54989604c8ef5f085e13f76a323 /app/models/account.rb | |
| parent | 9a534d1df639ccd462d0c1f0b2faee0734daab8d (diff) | |
| parent | 6bfe0689047644743061cfc217a7a64e46c36a87 (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 |