diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 21:49:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 21:49:18 -0400 |
| commit | ed332693fea75ac5f95351e5cc2627ccfc21eb04 (patch) | |
| tree | cb96d7cd349ebdc93104ec05886d8256467cdaf7 /app/models/account.rb | |
| parent | 41a78be25e5b4d7b5f65cfbf4d6fba5184f41475 (diff) | |
| parent | 881e4277fdd5116037a86af3c711d4b6ceb240d4 (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 |