diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:34:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:34:45 -0400 |
| commit | cf03634e74364af3a703ea09073ab0a58448d460 (patch) | |
| tree | d4454c7feaa75a99532d4a5cd9bfdff8b4c8bf09 /app/models/account.rb | |
| parent | 83530f0eef8f6cf04321b61c917da08ab0f4e323 (diff) | |
| parent | 698d74a15fe8db61de057b8876e9967e9e9c7330 (diff) | |
Merge branch 'master' into add-elao-com-instance
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 |