From 023b05e216b82f4ed9facfb499f5c7e3df59e105 Mon Sep 17 00:00:00 2001 From: Ryan Barrett Date: Thu, 12 Oct 2023 06:55:51 -0700 Subject: [PATCH] RSS feed bug fix fixes https://console.cloud.google.com/errors/detail/CJe5pdyJufvpHQ;time=P30D?project=bridgy-federated --- pages.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pages.py b/pages.py index 3fae339..4c88674 100644 --- a/pages.py +++ b/pages.py @@ -216,11 +216,6 @@ def serve_feed(*, objects, format, title): tasklets.wait_all(gets) - actor = { - 'displayName': id, - 'url': g.user.web_url(), - } - # TODO: inject/merge common.pretty_link into microformats2.render_content # (specifically into hcard_to_html) somehow to convert Mastodon URLs to @-@ # syntax. maybe a fediverse kwarg down through the call chain? @@ -228,12 +223,12 @@ def serve_feed(*, objects, format, title): entries = [microformats2.object_to_html(a) for a in activities] return render_template('feed.html', **TEMPLATE_VARS, **locals()) elif format == 'atom': - body = atom.activities_to_atom(activities, actor=actor, title=title, - request_url=request.url) + body = atom.activities_to_atom(activities, actor=g.user.obj.as1, + title=title, request_url=request.url) return body, {'Content-Type': atom.CONTENT_TYPE} elif format == 'rss': - body = rss.from_activities(activities, actor=actor, title=title, - feed_url=request.url) + body = rss.from_activities(activities, actor=g.user.obj.as1, + title=title, feed_url=request.url) return body, {'Content-Type': rss.CONTENT_TYPE}