consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5994 from consuldemocracy/remove-legacy-ahoy-patch

Browse Source 
Remove Ahoy ensure_uuid logic and uuidtools dependency
This commit is contained in:
Sebastia
2025-06-11 16:10:45 +02:00
committed by GitHub
parent 1d61f332c1 f45f5fe98f
commit 304055edbd
3 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
config/initializers/ahoy.rb
View File

@@ -8,17 +8,17 @@ class Ahoy::Store < Ahoy::DatabaseStore
end
def track_visit(data)
data[:id] = ensure_uuid(data.delete(:visit_token))
data[:visitor_id] = ensure_uuid(data.delete(:visitor_token))
data[:id] = ahoy.visit_token
data[:visitor_id] = ahoy.visitor_token
super(data)
end
def visit
unless defined?(@visit)
if ahoy.send(:existing_visit_token) || ahoy.instance_variable_get(:@visit_token)
@visit = visit_model.where(id: ensure_uuid(ahoy.visit_token)).take if ahoy.visit_token
@visit = visit_model.where(id: ahoy.visit_token).take if ahoy.visit_token
elsif !Ahoy.cookies? && ahoy.visitor_token
@visit = visit_model.where(visitor_id: ensure_uuid(ahoy.visitor_token))
@visit = visit_model.where(visitor_id: ahoy.visitor_token)
.where(started_at: Ahoy.visit_duration.ago..)
.order(started_at: :desc)
.first
@@ -34,12 +34,6 @@ class Ahoy::Store < Ahoy::DatabaseStore
Visit
end
def ensure_uuid(id)
UUIDTools::UUID.parse(id).to_s
rescue
UUIDTools::UUID.sha1_create(UUIDTools::UUID.parse(Ahoy::Tracker::UUID_NAMESPACE), id).to_s
end
def exclude?
false
end