not using tor anymore, add some more bot UAs

This commit is contained in:
joshua stein 2016-11-03 16:19:39 -05:00
parent 092ba42fd9
commit de4df43c7c

View file

@ -29,8 +29,7 @@ class ApplicationController < ActionController::Base
traffic = traffic_kv.value.to_i traffic = traffic_kv.value.to_i
# don't increase traffic counter for bots or api requests # don't increase traffic counter for bots or api requests
unless agent_is_spider? || agent_via_tor? || unless agent_is_spider? || [ "json", "rss" ].include?(params[:format])
[ "json", "rss" ].include?(params[:format])
traffic += 100 traffic += 100
end end
@ -105,11 +104,7 @@ class ApplicationController < ActionController::Base
def agent_is_spider? def agent_is_spider?
ua = request.env["HTTP_USER_AGENT"].to_s ua = request.env["HTTP_USER_AGENT"].to_s
(ua == "" || ua.match(/(Google|bing)bot|Slurp|crawler/)) (ua == "" || ua.match(/(Google|bing|Slack|Twitter)bot|Slurp|crawler|Feedly|FeedParser|RSS/))
end
def agent_via_tor?
request.remote_ip == "127.0.0.1"
end end
def find_user_from_rss_token def find_user_from_rss_token