aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorre4k <re4k@re4k.info>2013-04-03 16:37:31 +0900
committerre4k <re4k@re4k.info>2013-04-03 16:37:31 +0900
commit532f0445a5812259a547cda32ac78ebd79d2bc77 (patch)
tree6f5d2abf9ee90419f46e8c012f25041c52447d21 /config
parentc5290eafc803266f1d7f48f7c229f6024b3dbaa6 (diff)
downloadaclog-532f0445a5812259a547cda32ac78ebd79d2bc77.tar.gz
auto pager, refactor models, favs notification
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb3
-rw-r--r--config/settings.yml9
2 files changed, 11 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 7faac83..5529210 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -64,6 +64,9 @@ Aclog::Application.routes.draw do
get "/users/:screen_name/most_favorited" => redirect("/%{screen_name}/favorite"), :constraints => constraints
get "/users/:screen_name/most_retweeted" => redirect("/%{screen_name}/retweet"), :constraints => constraints
get "/users/:screen_name/discovered" => redirect("/%{screen_name}/discovered"), :constraints => constraints
+ get "/users/:screen_name/favorited" => redirect("/%{screen_name}/discovered/favorite"), :constraints => constraints
+ get "/users/:screen_name/given" => redirect("/%{screen_name}/discovered/favorite"), :constraints => constraints
+ get "/users/:screen_name/retweeted" => redirect("/%{screen_name}/discovered/retweet"), :constraints => constraints
get "/users/:screen_name/recent" => redirect("/%{screen_name}/timeline"), :constraints => constraints
get "/users/:screen_name/favs_from" => redirect("/%{screen_name}/favorited_by"), :constraints => constraints
get "/users/:screen_name/favs_from/:screen_name_b" => redirect("/%{screen_name}/favorited_by/%{screen_name_b}"), :constraints => constraints
diff --git a/config/settings.yml b/config/settings.yml
index 8c3650f..2ccc55f 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -2,8 +2,15 @@
# - key: <%= ENV["CONSUMER_KEY"] %>
# secret: <%= ENV["CONSUMER_SECRET"] %>
consumer_version: 1
-page_per: <%= ENV["ACLOG_PAGE_PER"] %>
worker_count: <%= ENV["ACLOG_WORKER_COUNT"] %>
secret_key: <%= ENV["ACLOG_SECRET_KEY"] %>
db_proxy_port: <%= ENV["ACLOG_DB_PROXY_PORT"] %>
register_server_path: <%= ENV["ACLOG_REGISTER_SERVER_PATH"] %>
+tweet_url: <%= ENV["ACLOG_TWEET_URL"] %>
+#notification:
+# consumer:
+# key: <%= ENV["ACLOG_NOTIFICATION_CONSUMER_KEY"] %>
+# secret: <%= ENV["ACLOG_NOTIFICATION_CONSUMER_SECRET"] %>
+# token:
+# token: <%= ENV["ACLOG_NOTIFICATION_OAUTH_TOKEN"] %>
+# secret: <%= ENV["ACLOG_NOTIFICATION_OAUTH_TOKEN_SECRET"] %>