From 613b1f0e0a630853767597248f74502c24c2c263 Mon Sep 17 00:00:00 2001
From: echarp <manu@echarp.org>
Date: Sat, 14 Jul 2018 18:17:21 +0200
Subject: [PATCH] Sometimes we use the domain name as part of a global ID, now
 this domain name comes from request.domain

---
 app/views/events/index.ics.haml      | 4 +---
 app/views/events/index.rss.builder   | 3 +--
 app/views/versions/index.rss.builder | 3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/views/events/index.ics.haml b/app/views/events/index.ics.haml
index 06890d21..b318f032 100644
--- a/app/views/events/index.ics.haml
+++ b/app/views/events/index.ics.haml
@@ -1,12 +1,10 @@
 :ruby
-  domain = root_url.gsub(/www/, '').gsub(/http.?:../, '').gsub(/:.*/, '')
-
   # Create a calendar with an event (standard method)
   cal = Icalendar::Calendar.new
   @events.each do |event|
     cal.event do |e|
       e.dtstamp     = Icalendar::Values::DateTime.new event.decision_time
-      e.uid         = "#{event.id}@#{domain}"
+      e.uid         = "#{event.id}@#{request.domain}"
       e.dtstart     = Icalendar::Values::DateTime.new event.start_time
       e.dtend       = Icalendar::Values::DateTime.new event.end_time
       e.summary     = event.title
diff --git a/app/views/events/index.rss.builder b/app/views/events/index.rss.builder
index 2a52496b..c80718d0 100644
--- a/app/views/events/index.rss.builder
+++ b/app/views/events/index.rss.builder
@@ -1,6 +1,5 @@
 def meta(xml, event)
-  domain = root_url.gsub(/www/, '').gsub(/http.?:../, '').gsub(/:.*/, '')
-  xml.dc :identifier, "#{event.id}@#{domain}"
+  xml.dc :identifier, "#{event.id}@#{request.domain}"
   xml.dc :date, l(event.start_time, format: :xml)
 
   return unless event.latitude || event.longitude
diff --git a/app/views/versions/index.rss.builder b/app/views/versions/index.rss.builder
index 74ca07cb..07154c90 100644
--- a/app/views/versions/index.rss.builder
+++ b/app/views/versions/index.rss.builder
@@ -66,8 +66,7 @@ xml.rdf :RDF,
     xml.item 'rdf:about' => url do
       xml.title "#{version.event} - #{object}"
       xml.link url
-      domain = root_url.gsub(/www/, '').gsub(/http.?:../, '').gsub(/:.*/, '')
-      xml.dc :identifier, "version_#{version.id}@#{domain}"
+      xml.dc :identifier, "version_#{version.id}@#{request.domain}"
       xml.dc :date, version.created_at.iso8601
 
       if object.try(:description)