aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/users_controller.rb
diff options
context:
space:
mode:
authorRhenium <rhenium@rhe.jp>2014-01-15 06:46:37 +0900
committerRhenium <rhenium@rhe.jp>2014-01-15 06:46:37 +0900
commit006f080ed80c45504a2711225238bd61ca1c7a59 (patch)
treed2b5c450da55ac88b8798576ee2dc1ff3d70d1c5 /app/controllers/users_controller.rb
parent2c4a2f7192c3f2f7bc8e4fa806d3a423bd244890 (diff)
downloadaclog-006f080ed80c45504a2711225238bd61ca1c7a59.tar.gz
update controllers
Diffstat (limited to 'app/controllers/users_controller.rb')
-rw-r--r--app/controllers/users_controller.rb12
1 files changed, 7 insertions, 5 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index cbd03eb..09894df 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -8,14 +8,15 @@ class UsersController < ApplicationController
description "Returns the stats of a user, specified by username or user ID."
param_group :user
def stats
- @user = require_public_user
+ @user = require_user
end
get "users/discovered_by"
description "Returns the list of the users who discovored the Tweets of a user, specified by username or user ID."
param_group :user
def discovered_by
- @user = require_public_user
+ @user = require_user
+ authorize_to_show_user_best! @user
@result = @user.count_discovered_by.take(Settings.users.count)
respond_to do |format|
@@ -33,7 +34,8 @@ class UsersController < ApplicationController
description "Returns the list of the users discovored by a user, specified by username or user ID."
param_group :user
def discovered_users
- @user = require_public_user
+ @user = require_user
+ authorize_to_show_user_best! @user
@result = @user.count_discovered_users.take(Settings.users.count)
respond_to do |format|
@@ -59,7 +61,7 @@ class UsersController < ApplicationController
end
private
- def require_public_user
- require_user(user_id: (params[:id] || params[:user_id]), screen_name: params[:screen_name], public: true)
+ def require_user
+ User.find(id: (params[:id] || params[:user_id]), screen_name: params[:screen_name])
end
end