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 22:15:55 -0400
committerGitHub <noreply@github.com>2017-04-07 22:15:55 -0400
commit1b42f717f2c44bb0c85dfc8e8b40790b12d45993 (patch)
tree852b1ccaeb7c5eeae530c66eb1a97462b2dd7831 /app/models/account.rb
parenteb98c99924ab810eea8a97040a82308f68c805cc (diff)
parent7004c692040d9372c187a13a21f1215f07d3a8ff (diff)
Merge branch 'master' into master
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