aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2015-06-19 01:18:50 +0900
committerKazuki Yamaguchi <k@rhe.jp>2015-06-19 01:18:50 +0900
commit94d21b4bf2833be948215006ed51f486231d0315 (patch)
treeb776f9ed694a50fa01e2caf2a776b70487cfcd82
parent3a21cf8cc21f0f7f56b21e8ebc8e049cabc956ca (diff)
downloadaclog-94d21b4bf2833be948215006ed51f486231d0315.tar.gz
web: move /i/:id/responses to /i/api/tweets/responses for consistency
-rw-r--r--app/assets/javascripts/tweets.coffee.erb2
-rw-r--r--app/controllers/tweets_controller.rb2
-rw-r--r--app/controllers/users_controller.rb11
-rw-r--r--app/views/tweets/i_responses.json.jbuilder (renamed from app/views/tweets/responses.json.jbuilder)0
-rw-r--r--config/routes.rb2
5 files changed, 8 insertions, 9 deletions
diff --git a/app/assets/javascripts/tweets.coffee.erb b/app/assets/javascripts/tweets.coffee.erb
index cd40568..87f333c 100644
--- a/app/assets/javascripts/tweets.coffee.erb
+++ b/app/assets/javascripts/tweets.coffee.erb
@@ -42,7 +42,7 @@ Views.tweets =
if status.allowed && status.reactions_count > 0
status.loading = true
superagent
- .get "/i/" + status.id_str + "/responses"
+ .get "/i/api/tweets/responses?id=" + status.id_str
.accept "json"
.end (rerr, rres) ->
rjson = rres.body
diff --git a/app/controllers/tweets_controller.rb b/app/controllers/tweets_controller.rb
index d994a0f..8708898 100644
--- a/app/controllers/tweets_controller.rb
+++ b/app/controllers/tweets_controller.rb
@@ -15,7 +15,7 @@ class TweetsController < ApplicationController
redirect_to tweet
end
- def responses
+ def i_responses
authorize! @tweet = Tweet.find(params[:id])
end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index fa0de47..0f659ba 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -17,15 +17,14 @@ class UsersController < ApplicationController
@sidebars = [:user]
end
+ def stats
+ user = User.find(screen_name: params[:screen_name])
+ render json: user.stats.to_h
+ end
+
def i_suggest_screen_name
- 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
- user = User.find(screen_name: params[:screen_name])
- render json: user.stats.to_h
- end
end
diff --git a/app/views/tweets/responses.json.jbuilder b/app/views/tweets/i_responses.json.jbuilder
index 62de683..62de683 100644
--- a/app/views/tweets/responses.json.jbuilder
+++ b/app/views/tweets/i_responses.json.jbuilder
diff --git a/config/routes.rb b/config/routes.rb
index 2acd4d3..92fd145 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -10,7 +10,6 @@ Rails.application.routes.draw do
get "/i/logout" => "sessions#destroy", as: "logout"
get "/i/:id" => "tweets#show", as: "tweet", constraints: { id: /\d+/ }
- get "/i/:id/responses" => "tweets#responses", as: "responses", constraints: { id: /\d+/ }
post "/i/:id/import" => "tweets#import", as: "import", constraints: { id: /\d+/ }
get "/i/settings" => "settings#index", as: "settings"
@@ -22,6 +21,7 @@ Rails.application.routes.draw do
get "/i/timeline" => "tweets#all_timeline", as: "timeline"
get "/i/filter" => "tweets#filter", as: "filter"
+ get "/i/api/tweets/responses" => "tweets#i_responses", as: "responses"
get "/i/api/users/suggest_screen_name" => "users#i_suggest_screen_name"
get "/i/api/users/stats" => "users#i_stats"