about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-10-03 00:26:00 +0200
committerEugen Rochko <eugen@zeonfederated.com>2016-10-03 00:26:00 +0200
commit188c6f326b991793239c47751ef45226c0cd8890 (patch)
treeea0c2b7c4af03b793e1b08152e4b82953a265ea8 /app/models
parentd74da1a89aef27ed78eb521a86b6412ef00acd0f (diff)
Making public pages responsive, removing reblogs/favs counts from them
Diffstat (limited to 'app/models')
-rw-r--r--app/models/favourite.rb4
-rw-r--r--app/models/user.rb4
2 files changed, 1 insertions, 7 deletions
diff --git a/app/models/favourite.rb b/app/models/favourite.rb
index 3681181e5..4f9b20942 100644
--- a/app/models/favourite.rb
+++ b/app/models/favourite.rb
@@ -14,9 +14,7 @@ class Favourite < ApplicationRecord
     "#{account.acct} favourited a status by #{status.account.acct}"
   end
 
-  def object_type
-    target.object_type
-  end
+  delegate :object_type, to: :target
 
   def thread
     status
diff --git a/app/models/user.rb b/app/models/user.rb
index 9c0546c2f..04f3eb02c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -11,8 +11,4 @@ class User < ApplicationRecord
   scope :prolific, -> { joins('inner join statuses on statuses.account_id = users.account_id').select('users.*, count(statuses.id) as statuses_count').group('users.id').order('statuses_count desc') }
   scope :recent,   -> { order('created_at desc') }
   scope :admins,   -> { where(admin: true) }
-
-  def admin?
-    admin
-  end
 end