diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-07 22:28:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:28:15 +0200 |
| commit | 32748c0f718b44bcdb4d19526bc9931c325acb63 (patch) | |
| tree | 3568cd8b5283cc1e0fd994354a002eda04044d45 /app/models/account.rb | |
| parent | 37a36b0bec1f27508926a420de05e6aa3c96fd10 (diff) | |
| parent | d4c94fa004117fdb7226b1b846a12d12dc0542d9 (diff) | |
Merge pull request #1184 from thoughtbot/extract-proper-status
DRY up reblog vs original status check
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 |