fix;;;

2 files changed, 10 insertions, 10 deletions

diff --git a/app/models/tweet.rb b/app/models/tweet.rb
index 097c158..0fb8239 100644
--- a/app/models/tweet.rb
+++ b/app/models/tweet.rb
@@ -32,16 +32,6 @@ class Tweet < ActiveRecord::Base
     end
   end
 
-  def self.get(id, screen_name)
-    if id
-      User.find(id) rescue raise Aclog::Exceptions::UserNotFound
-    elsif screen_name
-      User.where(screen_name: screen_name).order(updated_at: :desc).first or raise Aclog::Exceptions::UserNotFound
-    else
-      Aclog::Exceptions::UserNotFound
-    end
-  end
-
   def self.list(params, options = {})
     count = params[:count].to_i
     count = Settings.tweets.count_default unless (1..Settings.tweets.count_max) === count
diff --git a/app/models/user.rb b/app/models/user.rb
index f8348a8..6139a2e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -5,6 +5,16 @@ class User < ActiveRecord::Base
   has_many :favorites, dependent: :delete_all
   has_many :retweets, dependent: :delete_all
 
+  def self.get(id, screen_name)
+    if id
+      find(id) rescue raise Aclog::Exceptions::UserNotFound
+    elsif screen_name
+      where(screen_name: screen_name).order(updated_at: :desc).first or raise Aclog::Exceptions::UserNotFound
+    else
+      Aclog::Exceptions::UserNotFound
+    end
+  end
+
   def self.from_receiver(msg)
     user = where(id: msg["id"]).first_or_initialize
     att = user.attributes.dup