Ryan Barrett 2023-10-12 06:55:51 -07:00
rodzic 75c68d4c88
commit 023b05e216
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 6BE31FDF4776E9D4
1 zmienionych plików z 4 dodań i 9 usunięć

Wyświetl plik

@ -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}