diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:35:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:35:45 -0400 |
| commit | c945f29e96d537a827b95b3efb035ec8084576a1 (patch) | |
| tree | dac7e26c482f0a69e00f031e771e58858e64b054 /app/models/account.rb | |
| parent | c62696bc467133869f6b1d39b923135b0e64900f (diff) | |
| parent | 0d4d42dce6e7b0856469317da9e039ec5dc431b1 (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 |