From 023fe60ce56182f127faa910cc33da2397fd0e8c Mon Sep 17 00:00:00 2001
From: Harm te Molder <mail@harmtemolder.com>
Date: Thu, 29 Dec 2022 21:26:31 +0100
Subject: [PATCH 1/3] Add media:content to atom feed

---
 resources/views/atom/user.blade.php | 40 ++++++++++++++++-------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/resources/views/atom/user.blade.php b/resources/views/atom/user.blade.php
index 792dd7466..0a45c3a30 100644
--- a/resources/views/atom/user.blade.php
+++ b/resources/views/atom/user.blade.php
@@ -3,30 +3,34 @@
 	'<?xml version="1.0" encoding="UTF-8"?>'.PHP_EOL
 ?>
 <feed xmlns="http://www.w3.org/2005/Atom" xmlns:media="http://search.yahoo.com/mrss/">
-  <id>{{$permalink}}</id>
-  <title>{{$profile['username']}} on Pixelfed</title>
-  <subtitle type="html">{{$profile['note']}}</subtitle>
-  <updated>{{$profile['created_at']}}</updated>
-  <author>
-	<uri>{{$profile['url']}}</uri>
-	<name>{{$profile['url']}}</name>
-  </author>
-  <link rel="alternate" type="text/html" href="{{$profile['url']}}"/>
-  <link rel="self" type="application/atom+xml" href="{{$permalink}}"/>
-@foreach($items as $item)       <entry>
-                <title>{{ $item['content'] ? strip_tags($item['content']) : "No caption" }}</title>
-		<link rel="alternate" href="{{ $item['url'] }}" />
+	<id>{{$permalink}}</id>
+	<title>{{$profile['username']}} on Pixelfed</title>
+	<subtitle type="html">{{$profile['note']}}</subtitle>
+	<updated>{{$items[0]['created_at']}</updated>
+	<author>
+		<name>{{$profile['username']}}</name>
+		<uri>{{$profile['url']}}</uri>
+	</author>
+	<link rel="alternate" type="text/html" href="{{$profile['url']}}"/>
+	<link rel="self" type="application/atom+xml" href="{{$permalink}}"/>
+@foreach($items as $item)
+	<entry>
 		<id>{{ $item['url'] }}</id>
+		<title>{{ $item['content_text'] ? $item['content_text'] : "No caption" }}</title>
+		<updated>{{ $item['created_at'] }}</updated>
 		<author>
-			<name> <![CDATA[{{ $profile['username'] }}]]></name>
+			<name>{{$profile['username']}}</name>
+			<uri>{{$profile['url']}}</uri>
 		</author>
-		<summary type="html">
+		<content type="html">
 		<![CDATA[
 			<img id="rss_item_{{$loop->iteration}}" src="{{ $item['media_attachments'][0]['url'] }}" alt="{{ $item['media_attachments'][0]['description'] }}">
 			<p style="padding:10px;">{{ $item['content'] }}</p>
-		  ]]>
-		</summary>
-		<updated>{{ $item['created_at'] }}</updated>
+		]]>
+		</content>
+		<link rel="alternate" href="{{ $item['url'] }}" />
+		<summary>{{ $item['content'] }}</summary>
+		<media:content url="{{ $item['media_attachments'][0]['url'] }}" type="image/png" medium="image">
 	</entry>
 @endforeach
 </feed>

From 31cefa4b9e4116f3c738d1bc1cb997685bdd3dd6 Mon Sep 17 00:00:00 2001
From: Harm te Molder <mail@harmtemolder.com>
Date: Sat, 7 Jan 2023 18:21:21 +0100
Subject: [PATCH 2/3] Fix missing curly brace

---
 resources/views/atom/user.blade.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/resources/views/atom/user.blade.php b/resources/views/atom/user.blade.php
index 0a45c3a30..e38014f55 100644
--- a/resources/views/atom/user.blade.php
+++ b/resources/views/atom/user.blade.php
@@ -1,19 +1,19 @@
 <?=
-	/* Using an echo tag here so the `<? ... ?>` won't get parsed as short tags */
-	'<?xml version="1.0" encoding="UTF-8"?>'.PHP_EOL
+/* Using an echo tag here so the `<? ... ?>` won't get parsed as short tags */
+'<?xml version="1.0" encoding="UTF-8"?>' . PHP_EOL
 ?>
 <feed xmlns="http://www.w3.org/2005/Atom" xmlns:media="http://search.yahoo.com/mrss/">
 	<id>{{$permalink}}</id>
 	<title>{{$profile['username']}} on Pixelfed</title>
 	<subtitle type="html">{{$profile['note']}}</subtitle>
-	<updated>{{$items[0]['created_at']}</updated>
+	<updated>{{$items[0]['created_at']}}</updated>
 	<author>
 		<name>{{$profile['username']}}</name>
 		<uri>{{$profile['url']}}</uri>
 	</author>
-	<link rel="alternate" type="text/html" href="{{$profile['url']}}"/>
-	<link rel="self" type="application/atom+xml" href="{{$permalink}}"/>
-@foreach($items as $item)
+	<link rel="alternate" type="text/html" href="{{$profile['url']}}" />
+	<link rel="self" type="application/atom+xml" href="{{$permalink}}" />
+	@foreach($items as $item)
 	<entry>
 		<id>{{ $item['url'] }}</id>
 		<title>{{ $item['content_text'] ? $item['content_text'] : "No caption" }}</title>
@@ -23,14 +23,14 @@
 			<uri>{{$profile['url']}}</uri>
 		</author>
 		<content type="html">
-		<![CDATA[
+			<![CDATA[
 			<img id="rss_item_{{$loop->iteration}}" src="{{ $item['media_attachments'][0]['url'] }}" alt="{{ $item['media_attachments'][0]['description'] }}">
 			<p style="padding:10px;">{{ $item['content'] }}</p>
-		]]>
+			]]>
 		</content>
 		<link rel="alternate" href="{{ $item['url'] }}" />
-		<summary>{{ $item['content'] }}</summary>
+		<summary type="html">{{ $item['content'] }}</summary>
 		<media:content url="{{ $item['media_attachments'][0]['url'] }}" type="image/png" medium="image">
 	</entry>
-@endforeach
+	@endforeach
 </feed>

From 29ce7af02092efe4798e9395836c5dce6630dab3 Mon Sep 17 00:00:00 2001
From: Harm te Molder <mail@harmtemolder.com>
Date: Sat, 7 Jan 2023 18:46:07 +0100
Subject: [PATCH 3/3] Fix missing closing slash

---
 resources/views/atom/user.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/atom/user.blade.php b/resources/views/atom/user.blade.php
index e38014f55..af7f5de69 100644
--- a/resources/views/atom/user.blade.php
+++ b/resources/views/atom/user.blade.php
@@ -30,7 +30,7 @@
 		</content>
 		<link rel="alternate" href="{{ $item['url'] }}" />
 		<summary type="html">{{ $item['content'] }}</summary>
-		<media:content url="{{ $item['media_attachments'][0]['url'] }}" type="image/png" medium="image">
+		<media:content url="{{ $item['media_attachments'][0]['url'] }}" type="image/png" medium="image" />
 	</entry>
 	@endforeach
 </feed>