From cdcb0a396fea34cba49ae0619e392eb22b5683f7 Mon Sep 17 00:00:00 2001 From: riking Date: Mon, 14 May 2018 14:29:44 -0700 Subject: [PATCH] FIX: IncomingLink: do not log IP of logged-in users --- app/models/incoming_link.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/incoming_link.rb b/app/models/incoming_link.rb index 0b7e7c0ed63..0cc748a9a30 100644 --- a/app/models/incoming_link.rb +++ b/app/models/incoming_link.rb @@ -20,6 +20,7 @@ class IncomingLink < ActiveRecord::Base u = User.select(:id).find_by(username_lower: username.downcase) user_id = u.id if u end + ip_address = opts[:ip_address] if opts[:referer].present? begin @@ -38,6 +39,7 @@ class IncomingLink < ActiveRecord::Base .pluck(:id).first cid = current_user ? (current_user.id) : (nil) + ip_address = nil if cid unless cid && cid == user_id @@ -45,7 +47,7 @@ class IncomingLink < ActiveRecord::Base user_id: user_id, post_id: post_id, current_user_id: cid, - ip_address: opts[:ip_address]) if post_id + ip_address: ip_address) if post_id end end