diff --git a/daemon.py b/daemon.py index e16aa8bd..805f82b7 100644 --- a/daemon.py +++ b/daemon.py @@ -4291,7 +4291,7 @@ class PubServer(BaseHTTPRequestHandler): if msg: msg = rss2Header(httpPrefix, 'news', domainFull, - 'News', translate) + msg + rss2Footer() + 'Site', translate) + msg + rss2Footer() msg = msg.encode('utf-8') self._set_headers('text/xml', len(msg), diff --git a/newswire.py b/newswire.py index 2d3045b2..169d8165 100644 --- a/newswire.py +++ b/newswire.py @@ -26,14 +26,17 @@ def rss2Header(httpPrefix: str, rssStr = "" rssStr += "" rssStr += '' + if title.startswith('News'): rssStr += ' Newswire' - else: - rssStr += ' ' + translate[title] + '' - if title.startswith('News'): rssStr += ' ' + httpPrefix + '://' + domainFull + \ '/newswire.xml' + '' + elif title.startswith('Site'): + rssStr += ' ' + domainFull + '' + rssStr += ' ' + httpPrefix + '://' + domainFull + \ + '/blogs/rss.xml' + '' else: + rssStr += ' ' + translate[title] + '' rssStr += ' ' + httpPrefix + '://' + domainFull + \ '/users/' + nickname + '/rss.xml' + '' return rssStr