Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: TopicViewItem: do not store IP of logged in users

This commit is contained in:
riking 2018-05-21 11:38:29 -07:00 committed by Sam
parent 4b2e2ea8ef
commit 94f70c7b5c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/topic_view_item.rb
View File

@ -7,7 +7,7 @@ class TopicViewItem < ActiveRecord::Base
validates_presence_of :topic_id, :ip_address, :viewed_at validates_presence_of :topic_id, :ip_address, :viewed_at
def self.add(topic_id, ip, user_id = nil, at = nil, skip_redis = false) def self.add(topic_id, ip, user_id = nil, at = nil, skip_redis = false)
# Only store a view once per day per thing per user per ip # Only store a view once per day per thing per (user || ip)
at ||= Date.today at ||= Date.today
redis_key = "view:#{topic_id}:#{at}" redis_key = "view:#{topic_id}:#{at}"
if user_id if user_id
@ -34,6 +34,7 @@ class TopicViewItem < ActiveRecord::Base
builder.where("ip_address = :ip_address AND topic_id = :topic_id AND user_id IS NULL") builder.where("ip_address = :ip_address AND topic_id = :topic_id AND user_id IS NULL")
else else
builder.where("user_id = :user_id AND topic_id = :topic_id") builder.where("user_id = :user_id AND topic_id = :topic_id")
ip = nil # do not store IP of logged in users
end end
result = builder.exec(topic_id: topic_id, ip_address: ip, viewed_at: at, user_id: user_id) result = builder.exec(topic_id: topic_id, ip_address: ip, viewed_at: at, user_id: user_id)