diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:02:26 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:02:26 -0400 |
commit | 9f43e3b428c0adea4af75fc4e340799954e42221 (patch) | |
tree | ab2b6bb407ca6310d63b84af6f64ab4dca90a2dc /app/models/account.rb | |
parent | 8989569dd42aabd9c768927f0975401af89bceb3 (diff) | |
parent | 4a40b40324aa50ec0c42d574f78bb45835dfe295 (diff) |
Merge branch 'master' into patch-4
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 |