From c5c9b130b0b21c774c397b2e7878cce3a929f732 Mon Sep 17 00:00:00 2001
From: Yassine Guedidi <yassine@guedidi.com>
Date: Sat, 11 Jan 2025 02:11:44 +0100
Subject: [PATCH] Use wallabag_url in entries.xml

---
 src/Controller/FeedController.php | 2 --
 templates/Entry/entries.xml.twig  | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Controller/FeedController.php b/src/Controller/FeedController.php
index 70b9de359..9dea3c2c6 100644
--- a/src/Controller/FeedController.php
+++ b/src/Controller/FeedController.php
@@ -150,7 +150,6 @@ class FeedController extends AbstractController
                 'url' => $url,
                 'entries' => $entries,
                 'user' => $user->getUsername(),
-                'domainName' => $this->getParameter('domain_name'),
                 'version' => $this->getParameter('wallabag.version'),
                 'tag' => $tag->getSlug(),
                 'updated' => $this->prepareFeedUpdatedDate($entries, $sort),
@@ -231,7 +230,6 @@ class FeedController extends AbstractController
             'url' => $url,
             'entries' => $entries,
             'user' => $user->getUsername(),
-            'domainName' => $this->getParameter('domain_name'),
             'version' => $this->getParameter('wallabag.version'),
             'updated' => $this->prepareFeedUpdatedDate($entries),
         ], new Response('', 200, ['Content-Type' => 'application/atom+xml']));
diff --git a/templates/Entry/entries.xml.twig b/templates/Entry/entries.xml.twig
index 783a1c947..b286517b7 100644
--- a/templates/Entry/entries.xml.twig
+++ b/templates/Entry/entries.xml.twig
@@ -3,10 +3,10 @@
     {% if type != 'tag' %}
         <title>wallabag — {{ type }} feed</title>
         <subtitle type="html">Atom feed for {{ type }} entries</subtitle>
-        <id>wallabag:{{ domainName|removeScheme|removeWww }}:{{ user }}:{{ type }}</id>
+        <id>wallabag:{{ wallabag_url|removeScheme|removeWww }}:{{ user }}:{{ type }}</id>
         <link rel="alternate" type="text/html" href="{{ url(type) }}"/>
     {% else %}
-        <id>wallabag:{{ domainName|removeScheme|removeWww }}:{{ user }}:{{ type }}:{{ tag }}</id>
+        <id>wallabag:{{ wallabag_url|removeScheme|removeWww }}:{{ user }}:{{ type }}:{{ tag }}</id>
         <link rel="alternate" type="text/html" href="{{ url('tag_entries', {'slug': tag}) }}"/>
         <title>wallabag — {{ type }} {{ tag }} feed</title>
         <subtitle type="html">Atom feed for entries tagged with {{ tag }}</subtitle>
@@ -34,7 +34,7 @@
         <link rel="alternate" href="{{ entry.url }}"/>
         <link rel="via" type="text/html"
               href="{{ url('view', {'id': entry.id}) }}"/>
-        <id>wallabag:{{ domainName|removeScheme|removeWww }}:{{ user }}:entry:{{ entry.id }}</id>
+        <id>wallabag:{{ wallabag_url|removeScheme|removeWww }}:{{ user }}:entry:{{ entry.id }}</id>
         <updated>{{ entry.updatedAt|date('c') }}</updated>
         <published>{{ entry.createdAt|date('c') }}</published>
         {% for tag in entry.tags %}