about summary refs log tree commit diff
path: root/app/models/account.rb
diff options
context:
space:
mode:
authorShel R <Yiskah.Raphen@gmail.com>2017-04-07 21:59:21 -0400
committerGitHub <noreply@github.com>2017-04-07 21:59:21 -0400
commit4c05f0e630aacad594e7b21147340e2c0a0ac8ad (patch)
tree4ef28c2f42dd8e4cdfd9815dd6550b5bd2601f36 /app/models/account.rb
parent96812a6c792c8b048ed8d4a50351d9696dcf0f77 (diff)
parentd438eab67301e767bdd040c6f9bd831c92214656 (diff)
Merge branch 'master' into patch-1
Diffstat (limited to 'app/models/account.rb')
-rw-r--r--app/models/account.rb4
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