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:08:54 -0400
committerGitHub <noreply@github.com>2017-04-07 22:08:54 -0400
commit05be34a94b79eaae7d1c4a66eb943b388940636d (patch)
tree944d1431693e13a4a68ae5584269211b2215e17c /app/models/account.rb
parent41396de7a90f23dd0afe1afa3dab1be43b7b6ecd (diff)
parentcb58694a81093230d1069040177de7f688c56d0d (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