varia
/
bots
13
1
Fork 1
Code Issues 24 Releases Activity
Browse Source

rename feed.rss to feed.rss.xml

master
manetta 3 years ago
parent
ac459224a8
commit
2d0391c5e5
3 changed files with 9 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      LogBot/logbot.py
  2. 2
      LogBot/template.html
  3. 4
      LogBot/template.rss

10
LogBot/logbot.py
View File

@ -107,13 +107,13 @@ class Logbot(Bot):
folder_name = self.db[message.room]["folder"] folder_name = self.db[message.room]["folder"]
if "@" in folder_name: # hacky if "@" in folder_name: # hacky
folder_name = self._parse_room_name(folder_name) folder_name = self._parse_room_name(folder_name)
feed_path = os.path.join(self.output, folder_name, "feed.rss") feed_path = os.path.join(self.output, folder_name, "feed.rss.xml")
date = datetime.now() date = datetime.now()
template = jinja2.Template(open("template.rss").read()) # self.feedtemplate would be useful to have in the conf template = jinja2.Template(open("template.rss").read()) # self.feedtemplate would be useful to have in the conf
with open(feed_path, "w") as out: with open(feed_path, "w") as out:
feed = template.render( feed = template.render(
log_path=os.path.join("https://vvvvvvaria.org/logs/", folder_name, "index.html"), # hardcoding the url now, self.baseurl would be helpful to have in the conf log_path=os.path.join("https://vvvvvvaria.org/logs/", folder_name, "index.html"), # hardcoding the url now, self.baseurl would be helpful to have in the conf
feed_path=os.path.join("https://vvvvvvaria.org/logs/", folder_name, "feed.rss"), # hardcoding the url again feed_path=os.path.join("https://vvvvvvaria.org/logs/", folder_name, "feed.rss.xml"), # hardcoding the url again
title=self.db[message.room]["title"], title=self.db[message.room]["title"],
db=self.db[message.room], db=self.db[message.room],
date=date.strftime("%a, %d %b %Y %H:%M:%S +0100") # timezone is hardcoded now date=date.strftime("%a, %d %b %Y %H:%M:%S +0100") # timezone is hardcoded now
@ -132,17 +132,17 @@ class Logbot(Bot):
new_key = str(int(keys[-1]) + 1) new_key = str(int(keys[-1]) + 1)
if media_post: if media_post:
self.db[message.room]["messages"][new_key] = {} self.db[message.room]["messages"][new_key] = {}
self.db[message.room]["messages"][new_key]['post'] = media_post self.db[message.room]["messages"][new_key]['post'] = bleach.clean(media_post)
self.db[message.room]["messages"][new_key]['date'] = date
self.db[message.room]["messages"][new_key]['media'] = {} self.db[message.room]["messages"][new_key]['media'] = {}
self.db[message.room]["messages"][new_key]['media']['type'] = media_type 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']['url'] = os.path.join("https://vvvvvvaria.org/logs/", media_url)
self.db[message.room]["messages"][new_key]['media']['size'] = media_size self.db[message.room]["messages"][new_key]['media']['size'] = media_size
self.db[message.room]["messages"][new_key]['date'] = date
else: else:
post = message.content.replace("@add ", "") post = message.content.replace("@add ", "")
post = self._href_wrap(post) post = self._href_wrap(post)
self.db[message.room]["messages"][new_key] = {} self.db[message.room]["messages"][new_key] = {}
self.db[message.room]["messages"][new_key]['post'] = post self.db[message.room]["messages"][new_key]['post'] = bleach.clean(post)
self.db[message.room]["messages"][new_key]['date'] = date self.db[message.room]["messages"][new_key]['date'] = date
self.db._dumps() self.db._dumps()

2
LogBot/template.html
View File

@ -8,7 +8,7 @@
</head> </head>
<body> <body>
<h1>{{ title }}</h1> <h1>{{ title }}</h1>
(Follow this log: <a href="./feed.rss">RSS</a>) (Follow this log: <a href="./feed.rss.xml">RSS</a>)
<div id="container"> <div id="container">
{% for num in sorted_numbering | reverse %} {% for num in sorted_numbering | reverse %}
<div id="{{ num }}" class="post"> <div id="{{ num }}" class="post">

4
LogBot/template.rss
View File

@ -11,7 +11,9 @@
<title>{{ title }} #{{ x }}</title> <title>{{ title }} #{{ x }}</title>
<link>{{ log_path }}#{{ x }}</link> <link>{{ log_path }}#{{ x }}</link>
<guid>{{ log_path }}#{{ x }}</guid> <guid>{{ log_path }}#{{ x }}</guid>
<description><![CDATA[{{ 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 %} {% 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> <dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">LogBot</dc:creator>
<pubDate>{{ post.date }}</pubDate> <pubDate>{{ post.date }}</pubDate>

Write Preview
Loading…
Cancel
Save