diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:49:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:49:14 -0400 |
| commit | b67b60fec3adecffef544924a7776cce9b0a2633 (patch) | |
| tree | b592548a0a8cc6e9f1cbdf91df04e197503c070f /app/models/account.rb | |
| parent | acf6436a993b514aa2fffffb8a03d3718c5a49a0 (diff) | |
| parent | cc16fa75137586dff8eb1ef4e508aed81bf21718 (diff) | |
Merge branch 'master' into patch-2
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 |