mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename rss functions with version number

main
Bob Mottram 2020-05-23 09:10:26 +00:00
parent 4830de3249
commit e454377a07
2 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
blog.py
View File

@ -270,12 +270,12 @@ def htmlBlogPostContent(authorized: bool,
return blogStr return blogStr
def htmlBlogPostRSS(authorized: bool, def htmlBlogPostRSS2(authorized: bool,
baseDir: str, httpPrefix: str, translate: {}, baseDir: str, httpPrefix: str, translate: {},
nickname: str, domain: str, domainFull: str, nickname: str, domain: str, domainFull: str,
postJsonObject: {}, postJsonObject: {},
handle: str, restrictToDomain: bool) -> str: handle: str, restrictToDomain: bool) -> str:
"""Returns the RSS feed for a single blog post """Returns the RSS version 2 feed for a single blog post
""" """
messageLink = '' messageLink = ''
if postJsonObject['object'].get('id'): if postJsonObject['object'].get('id'):
@ -416,8 +416,8 @@ def htmlBlogPage(authorized: bool, session,
return None return None
def rssHeader(httpPrefix: str, def rss2Header(httpPrefix: str,
nickname: str, domainFull: str, translate: {}) -> str: nickname: str, domainFull: str, translate: {}) -> str:
rssStr = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" rssStr = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>"
rssStr += "<rss version=\"2.0\">" rssStr += "<rss version=\"2.0\">"
rssStr += '<channel>' rssStr += '<channel>'
@ -427,17 +427,17 @@ def rssHeader(httpPrefix: str,
return rssStr return rssStr
def rssFooter() -> str: def rss2Footer() -> str:
rssStr = '</channel>' rssStr = '</channel>'
rssStr += '</rss>' rssStr += '</rss>'
return rssStr return rssStr
def htmlBlogPageRSS(authorized: bool, session, def htmlBlogPageRSS2(authorized: bool, session,
baseDir: str, httpPrefix: str, translate: {}, baseDir: str, httpPrefix: str, translate: {},
nickname: str, domain: str, port: int, nickname: str, domain: str, port: int,
noOfItems: int, pageNumber: int) -> str: noOfItems: int, pageNumber: int) -> str:
"""Returns an rss feed containing posts """Returns an RSS version 2 feed containing posts
""" """
if ' ' in nickname or '@' in nickname or \ if ' ' in nickname or '@' in nickname or \
'\n' in nickname or '\r' in nickname: '\n' in nickname or '\r' in nickname:
@ -448,12 +448,12 @@ def htmlBlogPageRSS(authorized: bool, session,
if port != 80 and port != 443: if port != 80 and port != 443:
domainFull = domain + ':' + str(port) domainFull = domain + ':' + str(port)
blogRSS = rssHeader(httpPrefix, nickname, domainFull, translate) blogRSS2 = rss2Header(httpPrefix, nickname, domainFull, translate)
blogsIndex = baseDir + '/accounts/' + \ blogsIndex = baseDir + '/accounts/' + \
nickname + '@' + domain + '/tlblogs.index' nickname + '@' + domain + '/tlblogs.index'
if not os.path.isfile(blogsIndex): if not os.path.isfile(blogsIndex):
return blogRSS + rssFooter() return blogRSS2 + rss2Footer()
timelineJson = createBlogsTimeline(session, baseDir, timelineJson = createBlogsTimeline(session, baseDir,
nickname, domain, port, nickname, domain, port,
@ -462,20 +462,21 @@ def htmlBlogPageRSS(authorized: bool, session,
pageNumber) pageNumber)
if not timelineJson: if not timelineJson:
return blogRSS + rssFooter() return blogRSS2 + rss2Footer()
if pageNumber is not None: if pageNumber is not None:
for item in timelineJson['orderedItems']: for item in timelineJson['orderedItems']:
if item['type'] != 'Create': if item['type'] != 'Create':
continue continue
blogRSS += htmlBlogPostRSS(authorized, baseDir, blogRSS2 += \
httpPrefix, translate, htmlBlogPostRSS2(authorized, baseDir,
nickname, domain, httpPrefix, translate,
domainFull, item, nickname, domain,
None, True) domainFull, item,
None, True)
return blogRSS + rssFooter() return blogRSS2 + rss2Footer()
def getBlogIndexesForAccounts(baseDir: str) -> {}: def getBlogIndexesForAccounts(baseDir: str) -> {}:

20
daemon.py
View File

@ -94,7 +94,7 @@ from config import setConfigParam
from config import getConfigParam from config import getConfigParam
from roles import setRole from roles import setRole
from roles import clearModeratorStatus from roles import clearModeratorStatus
from blog import htmlBlogPageRSS from blog import htmlBlogPageRSS2
from blog import htmlBlogView from blog import htmlBlogView
from blog import htmlBlogPage from blog import htmlBlogPage
from blog import htmlBlogPost from blog import htmlBlogPost
@ -1141,15 +1141,15 @@ class PubServer(BaseHTTPRequestHandler):
self.server.session = \ self.server.session = \
createSession(self.server.useTor) createSession(self.server.useTor)
msg = \ msg = \
htmlBlogPageRSS(authorized, htmlBlogPageRSS2(authorized,
self.server.session, self.server.session,
self.server.baseDir, self.server.baseDir,
self.server.httpPrefix, self.server.httpPrefix,
self.server.translate, self.server.translate,
nickname, nickname,
self.server.domain, self.server.domain,
self.server.port, self.server.port,
maxPostsInRSSFeed, 1) maxPostsInRSSFeed, 1)
if msg is not None: if msg is not None:
msg = msg.encode() msg = msg.encode()
self._set_headers('text/xml', len(msg), self._set_headers('text/xml', len(msg),