From e43580f3f9b9906b4eb4eec8f60bdb087a7c8ecf Mon Sep 17 00:00:00 2001
From: Pablo Ferreiro <me@pabloferreiro.es>
Date: Thu, 27 Apr 2023 20:22:55 +0200
Subject: [PATCH] RSS TextExtra and Gallery support

---
 composer.json                                 |  2 +-
 composer.lock                                 |  2 +-
 .../components/themes/common/content.latte    | 36 +++++++++++--------
 templates/views/rss.latte                     |  3 +-
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/composer.json b/composer.json
index 54a5a1c..3c5d0a7 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "pablouser1/proxitok",
     "description": "An alternative frontend for TikTok",
-    "version": "2.4.9.0",
+    "version": "2.4.9.1",
     "license": "AGPL-3.0-or-later",
     "type": "project",
     "authors": [
diff --git a/composer.lock b/composer.lock
index 2e001aa..405d55e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d8e56c687ca265b350f34789ce3cf82b",
+    "content-hash": "790ea9098323ef66c520cfe44b92b7d3",
     "packages": [
         {
             "name": "bramus/router",
diff --git a/templates/components/themes/common/content.latte b/templates/components/themes/common/content.latte
index 35a2482..0257da5 100644
--- a/templates/components/themes/common/content.latte
+++ b/templates/components/themes/common/content.latte
@@ -3,19 +3,25 @@
 	<source src="{url_stream($item->video->playAddr)}" type="video/mp4" />
 </video>
 {else}
-<section class="carousel" aria-label="carousel" Tabindex="0">
-  <div class="slides">
-		{foreach $item->imagePost->images as $i => $image}
-		<div class="slides-item" id="{$item->id}-image{$i + 1}" tabindex="0">
-			<img src="{url_stream($image->imageURL->urlList[0])}" />
-		</div>
-		{/foreach}
-  </div>
-  <div class="carousel__nav">
-		{for $i = 0; $i < count($item->imagePost->images); $i++}
-		<a class="slider-nav" href="#{$item->id}-image{$i + 1}">{$i + 1}</a>
-		{/for}
-  </div>
-  <div class="carousel__skip-message" id="skip-link" tabindex="0"></div>
-</section>
+{if isset($isSimple)}
+	{foreach $item->imagePost->images as $i => $image}
+		<img src="{url_stream($image->imageURL->urlList[0])}" />
+	{/foreach}
+{else}
+	<section class="carousel" aria-label="carousel" Tabindex="0">
+	  <div class="slides">
+			{foreach $item->imagePost->images as $i => $image}
+			<div class="slides-item" id="{$item->id}-image{$i + 1}" tabindex="0">
+				<img src="{url_stream($image->imageURL->urlList[0])}" />
+			</div>
+			{/foreach}
+	  </div>
+	  <div class="carousel__nav">
+			{for $i = 0; $i < count($item->imagePost->images); $i++}
+			<a class="slider-nav" href="#{$item->id}-image{$i + 1}">{$i + 1}</a>
+			{/for}
+	  </div>
+	  <div class="carousel__skip-message" id="skip-link" tabindex="0"></div>
+	</section>
+	{/if}
 {/if}
diff --git a/templates/views/rss.latte b/templates/views/rss.latte
index bf48f59..bd70d97 100644
--- a/templates/views/rss.latte
+++ b/templates/views/rss.latte
@@ -1,4 +1,3 @@
-{contentType application/rss+xml}
 <?xml version="1.0" encoding="utf-8" ?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
 	<channel>
@@ -9,7 +8,7 @@
 		{foreach $items as $item}
 			<item>
 				<title>{$item->desc}</title>
-				<description><![CDATA[<p>{$item->desc}</p><video controls="controls" preload="auto" src="{url_stream($item->video->playAddr)}"></video>]]></description>
+				<description><![CDATA[<p n:ifcontent>{render_desc($item->desc, $item->textExtra ?? [])|noescape}</p>{include '../components/themes/common/content.latte', item: $item, isAutoplay: false, isSimple: true}]]></description>
 				<link>{url_video_internal($item->author->uniqueId, $item->id)}</link>
 				<pubDate>{date('r', $item->createTime)}</pubDate>
 				<guid isPermaLink="false">{$item->id}</guid>