diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:54:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:54:25 -0400 |
| commit | 971c4de18c35bcfe24e92d40b657950b19dfa62a (patch) | |
| tree | 90118f965cd5770911e1daa8cc684746ece1e321 /app/models/account.rb | |
| parent | 4b08b7c50274bbfdd527a17eddd1242d21fc8cae (diff) | |
| parent | 394c8ef6801a82fab0bb3b75fbef1e6b6100d28a (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 |