From e454377a076ecf1795f651fa4354bbdb53cd8c4d Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 23 May 2020 09:10:26 +0000
Subject: [PATCH] Rename rss functions with version number

---
 blog.py   | 47 ++++++++++++++++++++++++-----------------------
 daemon.py | 20 ++++++++++----------
 2 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/blog.py b/blog.py
index a2a438a1..a4e4ed50 100644
--- a/blog.py
+++ b/blog.py
@@ -270,12 +270,12 @@ def htmlBlogPostContent(authorized: bool,
     return blogStr
 
 
-def htmlBlogPostRSS(authorized: bool,
-                    baseDir: str, httpPrefix: str, translate: {},
-                    nickname: str, domain: str, domainFull: str,
-                    postJsonObject: {},
-                    handle: str, restrictToDomain: bool) -> str:
-    """Returns the RSS feed for a single blog post
+def htmlBlogPostRSS2(authorized: bool,
+                     baseDir: str, httpPrefix: str, translate: {},
+                     nickname: str, domain: str, domainFull: str,
+                     postJsonObject: {},
+                     handle: str, restrictToDomain: bool) -> str:
+    """Returns the RSS version 2 feed for a single blog post
     """
     messageLink = ''
     if postJsonObject['object'].get('id'):
@@ -416,8 +416,8 @@ def htmlBlogPage(authorized: bool, session,
     return None
 
 
-def rssHeader(httpPrefix: str,
-              nickname: str, domainFull: str, translate: {}) -> str:
+def rss2Header(httpPrefix: str,
+               nickname: str, domainFull: str, translate: {}) -> str:
     rssStr = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>"
     rssStr += "<rss version=\"2.0\">"
     rssStr += '<channel>'
@@ -427,17 +427,17 @@ def rssHeader(httpPrefix: str,
     return rssStr
 
 
-def rssFooter() -> str:
+def rss2Footer() -> str:
     rssStr = '</channel>'
     rssStr += '</rss>'
     return rssStr
 
 
-def htmlBlogPageRSS(authorized: bool, session,
-                    baseDir: str, httpPrefix: str, translate: {},
-                    nickname: str, domain: str, port: int,
-                    noOfItems: int, pageNumber: int) -> str:
-    """Returns an rss feed containing posts
+def htmlBlogPageRSS2(authorized: bool, session,
+                     baseDir: str, httpPrefix: str, translate: {},
+                     nickname: str, domain: str, port: int,
+                     noOfItems: int, pageNumber: int) -> str:
+    """Returns an RSS version 2 feed containing posts
     """
     if ' ' in nickname or '@' in nickname or \
        '\n' in nickname or '\r' in nickname:
@@ -448,12 +448,12 @@ def htmlBlogPageRSS(authorized: bool, session,
         if port != 80 and port != 443:
             domainFull = domain + ':' + str(port)
 
-    blogRSS = rssHeader(httpPrefix, nickname, domainFull, translate)
+    blogRSS2 = rss2Header(httpPrefix, nickname, domainFull, translate)
 
     blogsIndex = baseDir + '/accounts/' + \
         nickname + '@' + domain + '/tlblogs.index'
     if not os.path.isfile(blogsIndex):
-        return blogRSS + rssFooter()
+        return blogRSS2 + rss2Footer()
 
     timelineJson = createBlogsTimeline(session, baseDir,
                                        nickname, domain, port,
@@ -462,20 +462,21 @@ def htmlBlogPageRSS(authorized: bool, session,
                                        pageNumber)
 
     if not timelineJson:
-        return blogRSS + rssFooter()
+        return blogRSS2 + rss2Footer()
 
     if pageNumber is not None:
         for item in timelineJson['orderedItems']:
             if item['type'] != 'Create':
                 continue
 
-            blogRSS += htmlBlogPostRSS(authorized, baseDir,
-                                       httpPrefix, translate,
-                                       nickname, domain,
-                                       domainFull, item,
-                                       None, True)
+            blogRSS2 += \
+                htmlBlogPostRSS2(authorized, baseDir,
+                                 httpPrefix, translate,
+                                 nickname, domain,
+                                 domainFull, item,
+                                 None, True)
 
-    return blogRSS + rssFooter()
+    return blogRSS2 + rss2Footer()
 
 
 def getBlogIndexesForAccounts(baseDir: str) -> {}:
diff --git a/daemon.py b/daemon.py
index 7e318388..4b6afc1f 100644
--- a/daemon.py
+++ b/daemon.py
@@ -94,7 +94,7 @@ from config import setConfigParam
 from config import getConfigParam
 from roles import setRole
 from roles import clearModeratorStatus
-from blog import htmlBlogPageRSS
+from blog import htmlBlogPageRSS2
 from blog import htmlBlogView
 from blog import htmlBlogPage
 from blog import htmlBlogPost
@@ -1141,15 +1141,15 @@ class PubServer(BaseHTTPRequestHandler):
                         self.server.session = \
                             createSession(self.server.useTor)
                     msg = \
-                        htmlBlogPageRSS(authorized,
-                                        self.server.session,
-                                        self.server.baseDir,
-                                        self.server.httpPrefix,
-                                        self.server.translate,
-                                        nickname,
-                                        self.server.domain,
-                                        self.server.port,
-                                        maxPostsInRSSFeed, 1)
+                        htmlBlogPageRSS2(authorized,
+                                         self.server.session,
+                                         self.server.baseDir,
+                                         self.server.httpPrefix,
+                                         self.server.translate,
+                                         nickname,
+                                         self.server.domain,
+                                         self.server.port,
+                                         maxPostsInRSSFeed, 1)
                     if msg is not None:
                         msg = msg.encode()
                         self._set_headers('text/xml', len(msg),