From 0e8f59c16fcb21301c736ecbc4424cb4c5388c42 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 29 Feb 2016 19:42:08 +0100
Subject: Refactoring Grape API methods into normal controllers & other things

---
 app/models/account.rb | 4 ++++
 app/models/user.rb    | 5 -----
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'app/models')

diff --git a/app/models/account.rb b/app/models/account.rb
index 6cb638b3e..6a4aa16b4 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -76,6 +76,10 @@ class Account < ActiveRecord::Base
     @avatar_remote_url = url
   end
 
+  def to_param
+    self.username
+  end
+
   before_create do
     if local?
       keypair = OpenSSL::PKey::RSA.new(Rails.env.test? ? 1024 : 2048)
diff --git a/app/models/user.rb b/app/models/user.rb
index c54a5fab3..d871a760a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,9 +1,4 @@
 class User < ActiveRecord::Base
   belongs_to :account, inverse_of: :user
-
   validates :account, presence: true
-
-  def timeline
-    StreamEntry.where(account_id: self.account.following, activity_type: 'Status').order('id desc')
-  end
 end
-- 
cgit