From 49298b2ae23c06a235b3bcec4c6a57e2f420d159 Mon Sep 17 00:00:00 2001
From: manetta <mail@manettaberends.nl>
Date: Fri, 18 Feb 2022 16:01:25 +0100
Subject: [PATCH] adding media to the general post text, and using CDATA to
 display HTML elements in RSS' <description> element

---
 LogBot/logbot.py    | 11 ++++-------
 LogBot/template.rss |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/LogBot/logbot.py b/LogBot/logbot.py
index 39d0db8..7f75638 100644
--- a/LogBot/logbot.py
+++ b/LogBot/logbot.py
@@ -132,9 +132,8 @@ class Logbot(Bot):
             new_key = str(int(keys[-1]) + 1)
         if media_post:
             self.db[message.room]["messages"][new_key] = {}
-            self.db[message.room]["messages"][new_key]['post'] = ''
+            self.db[message.room]["messages"][new_key]['post'] = media_post
             self.db[message.room]["messages"][new_key]['media'] = {}
-            self.db[message.room]["messages"][new_key]['media']['post'] = media_post
             self.db[message.room]["messages"][new_key]['media']['type'] = media_type
             self.db[message.room]["messages"][new_key]['media']['url'] = os.path.join("https://vvvvvvaria.org/logs/", media_url)
             self.db[message.room]["messages"][new_key]['media']['size'] = media_size
@@ -171,17 +170,15 @@ class Logbot(Bot):
         if "folder" not in self.db[room]:
             self.db[room]["folder"] = self._parse_room_name(room)
         if "stylesheet" not in self.db[room]:
-            self.db[room]["stylesheet"] = "timeline"  # default stylesheet
+            self.db[room]["stylesheet"] = "timeline" # default stylesheet
         if "font" not in self.db[room]:
-            self.db[room]["font"] = "none"  # default font
+            self.db[room]["font"] = "none" # default font
         self.db._dumps()
         self.log.info(f"Added to the database: { room }")
 
         if not os.path.exists(room_path):
             os.mkdir(room_path)
-            stylesheet_path = os.path.join(
-                "stylesheets", self.db[room]["stylesheet"] + ".css"
-            )
+            stylesheet_path = os.path.join("stylesheets", self.db[room]["stylesheet"] + ".css")
             stylesheet_dest_path = os.path.join(room_path, "stylesheet.css")
             shutil.copy(stylesheet_path, stylesheet_dest_path)
             self.log.info(f"Created a folder for: { room }")
diff --git a/LogBot/template.rss b/LogBot/template.rss
index 2d65c3e..8499078 100644
--- a/LogBot/template.rss
+++ b/LogBot/template.rss
@@ -11,7 +11,7 @@
 			<title>{{ x }}</title>
 			<link>{{ log_path }}#{{ x }}</link>
 			<guid>{{ log_path }}#{{ x }}</guid>
-			<description>{{ post.post }}</description>
+			<description><![CDATA[{{ post.post }}]]></description>
 			{% if 'media' in post %}<enclosure url="{{ post.media.url }}" length="{{ post.media.size }}" type="{{ post.media.type }}" />{% endif %}
 			<dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">LogBot</dc:creator>
 			<pubDate>{{ post.date }}</pubDate>