Clean up rss and rdf feed. The items list was missing and host names were hard coded

2 files changed, 15 insertions, 7 deletions

diff --git a/app/views/rss/updates.rdf.builder b/app/views/rss/updates.rdf.builder
index 699e9c87..496fb108 100644
--- a/app/views/rss/updates.rdf.builder
+++ b/app/views/rss/updates.rdf.builder
@@ -2,17 +2,25 @@ xml.instruct!
 xml.tag!("rdf:RDF", "xmlns:rdf" => "http://www.w3.org/1999/02/22-rdf-syntax-ns#", "xmlns:dc"  => "http://purl.org/dc/elements/1.1/", "xmlns" => "http://purl.org/rss/1.0/") do
   xml.tag!( "rdf:Description",  "rdf:about" => "http://www.w3.org/TR/rdf-syntax-grammar", "dc:title"=>"RDF/XML Syntax Specification (Revised)")
 
-  xml.channel( "rdf:about" => "https://www.ccc.de/de/rss/updates.xml" ) do
+  xml.channel( "rdf:about" => rss_feed_url(:format => "rdf")) do
     xml.title("Chaos Computer Club: Updates")
-    xml.link("https://www.ccc.de")
+    xml.link("#{@host}")
     xml.description("Kabelsalat ist gesund.")
     xml.tag!("dc:date", @items.first&.published_at&.xmlschema) if @items.any?
+    xml.items do
+      xml.tag!("rdf:Seq") do
+        @items.each do |item|
+          xml.tag!("rdf:li", "rdf:resource" => content_url(:page_path => item.node.unique_path))
+        end
+      end
+    end
+    xml.image("rdf:resource" => "#{@host}/images/chaosknoten.gif")
   end
 
-  xml.image( "rdf:about" => "https://www.ccc.de/images/chaosknoten.gif") do
+  xml.image( "rdf:about" => "#{@host}/images/chaosknoten.gif") do
     xml.title("Chaos Computer Club (Chaosknoten)")
-    xml.link("https://www.ccc.de")
-    xml.url("https://www.ccc.de/images/chaosknoten.gif")
+    xml.link("#{@host}")
+    xml.url("#{@host}/images/chaosknoten.gif")
   end
 
   @items.each do |item|
diff --git a/app/views/rss/updates.xml.builder b/app/views/rss/updates.xml.builder
index f09d6a74..f5cad621 100644
--- a/app/views/rss/updates.xml.builder
+++ b/app/views/rss/updates.xml.builder
@@ -2,13 +2,13 @@ xml.instruct!
 
 xml.feed(:xmlns => "http://www.w3.org/2005/Atom", "xml:base" => @host) do
   xml.title("Chaos Computer Club Updates")
-  xml.link(:href => "https://www.ccc.de/")
+  xml.link(:href => "#{@host}")
   xml.link(:rel => "self", :href => "#{@host}/rss/updates.xml")
   xml.updated((@items.map(&:updated_at).compact.max || Time.now).xmlschema)
   xml.author do
     xml.name("Chaos Computer Club e.V.")
   end
-  xml.id("https://www.ccc.de/rss/updates")
+  xml.id("#{@host}/rss/updates")
   
   @items.each do |item|
     xml.entry do