aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/users_controller.rb
diff options
context:
space:
mode:
authorrhenium <rhenium@rhe.jp>2015-04-05 15:58:03 +0900
committerrhenium <rhenium@rhe.jp>2015-04-05 15:58:03 +0900
commita1812b253efdc1b06dba4ef59b6c3dcc8ef22c54 (patch)
tree558bb10f0bdf4b0b7b50916a5c3aa5c5e80db21c /app/controllers/users_controller.rb
parente3d1ef82877f8bbeb6c2e9d6499fdd5ecbc40c94 (diff)
downloadaclog-a1812b253efdc1b06dba4ef59b6c3dcc8ef22c54.tar.gz
web: reorganize views
Diffstat (limited to 'app/controllers/users_controller.rb')
-rw-r--r--app/controllers/users_controller.rb18
1 files changed, 8 insertions, 10 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b43ad0e..fa0de47 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,33 +1,31 @@
class UsersController < ApplicationController
def discovered_by
- @user = require_user
+ authorize! @user = User.find(screen_name: params[:screen_name])
@user.require_registered!
@result = @user.count_discovered_by.take(Settings.users.count)
@cached_users = User.find(@result.map(&:first)).map {|user| [user.id, user] }.to_h
+
+ @sidebars = [:user]
end
def discovered_users
- @user = require_user
+ authorize! @user = User.find(screen_name: params[:screen_name])
@user.require_registered!
@result = @user.count_discovered_users.take(Settings.users.count)
@cached_users = User.find(@result.map(&:first)).map {|user| [user.id, user] }.to_h
+
+ @sidebars = [:user]
end
def i_suggest_screen_name
- sleep 2 if Rails.env.development?
+ sleep 1 if Rails.env.development?
users = User.suggest_screen_name(params[:head].to_s).limit(10)
filtered = users.map {|user| { name: user.name, screen_name: user.screen_name, profile_image_url: user.profile_image_url(:mini) } }
render json: filtered
end
def stats
- sleep 2 if Rails.env.development?
- user = require_user
+ user = User.find(screen_name: params[:screen_name])
render json: user.stats.to_h
end
-
- private
- def require_user
- User.find(screen_name: params[:screen_name])
- end
end