Implement JSON API

1 files changed, 18 insertions, 27 deletions

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 1ebb5a6..cc11c2e 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,23 +1,4 @@
 class UsersController < ApplicationController
-  def show
-    tweet_id = Integer(params[:id])
-
-    @item = Tweet.find(tweet_id)
-    @user = @item.user
-    helpers = ApplicationController.helpers
-    @title = "\"#{helpers.strip_tags(helpers.format_tweet_text(@item.text))[0...30]}\" from @#{@item.user.screen_name}"
-
-    respond_to do |format|
-      format.html do
-        prepare_info
-      end
-
-      format.json do
-        @trim_user = params[:trim_user] == "true"
-      end
-    end
-  end
-
   def best
     user = render_timeline(params) do |tweets, user|
       tweets.of(user).reacted.order_by_reactions
@@ -47,9 +28,16 @@ class UsersController < ApplicationController
     end
   end
 
-  def my
+  def discovered
     user = render_timeline(params) do |tweets, user|
-      tweets.discovered(user).order_by_id
+      case params[:tweets]
+      when "favorite"
+        tweets.favorited_by(user).order_by_id
+      when "retweet"
+        tweets.retweeted_by(user).order_by_id
+      else
+        tweets.discovered_by(user).order_by_id
+      end
     end
     @title = "@#{user.screen_name}'s Recent Discoveries"
   end
@@ -57,24 +45,27 @@ class UsersController < ApplicationController
   private
   def render_timeline(params, &g)
     page = get_page_number(params)
+    count = get_page_count(params)
     screen_name = params[:screen_name]
+    user_id = params[:user_id]
 
     @user = User.where(:screen_name => screen_name).first
     unless @user
-      raise ActiveRecord::RecordNotFound.new(screen_name)
+      @user = User.where(:id => user_id).first
+      unless @user
+        raise ActiveRecord::RecordNotFound.new("screen_name=#{screen_name}&user_id=#{user_id}")
+      end
     end
 
     @items = g.call(Tweet, @user)
       .page(page)
-      .per(Settings.page_per)
+      .per(count)
 
     respond_to do |format|
-      format.html do
-        prepare_info
-      end
+      format.html
 
       format.json do
-        @trim_user = params[:trim_user] == "true"
+        @include_user = params[:include_user] == "true"
       end
     end