diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:46:36 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:46:36 -0400 |
commit | e7d7a99fbc78c7dbf763279aa4262580cabd8e1f (patch) | |
tree | 6f1fce572c176a73aeacffa948c51ca3bf797596 /app/models/account.rb | |
parent | f0d1107c530d43432f2e19a2c74aff6cdfbd2b83 (diff) | |
parent | 8d27de32b31f1093ab7c6eb177dfb9b866a1203e (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 |