From a11295572dc83117303f08a85c3a1300678bf361 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 31 Aug 2020 16:55:00 +0100
Subject: [PATCH] Move rss3 feed to its own method

---
 daemon.py | 98 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 56 insertions(+), 42 deletions(-)

diff --git a/daemon.py b/daemon.py
index e4607279d..ac1521d0d 100644
--- a/daemon.py
+++ b/daemon.py
@@ -3689,6 +3689,53 @@ class PubServer(BaseHTTPRequestHandler):
                   path + ' ' + callingDomain)
         self._404()
 
+    def _getRSS3feed(self, authorized: bool,
+                     callingDomain: str, path: str,
+                     baseDir: str, httpPrefix: str,
+                     domain: str, port: int, proxyType: str,
+                     GETstartTime, GETtimings: {},
+                     debug: bool):
+        """Returns an RSS3 feed
+        """
+        nickname = path.split('/blog/')[1]
+        if '/' in nickname:
+            nickname = nickname.split('/')[0]
+        if not nickname.startswith('rss.'):
+            if os.path.isdir(baseDir +
+                             '/accounts/' + nickname + '@' + domain):
+                if not self.server.session:
+                    print('Starting new session during RSS3 request')
+                    self.server.session = \
+                        createSession(proxyType)
+                    if not self.server.session:
+                        print('ERROR: GET failed to create session ' +
+                              'during RSS3 request')
+                        self._404()
+                        return
+                msg = \
+                    htmlBlogPageRSS3(authorized,
+                                     self.server.session,
+                                     baseDir, httpPrefix,
+                                     self.server.translate,
+                                     nickname, domain, port,
+                                     maxPostsInRSSFeed, 1)
+                if msg is not None:
+                    msg = msg.encode('utf-8')
+                    self._set_headers('text/plain; charset=utf-8',
+                                      len(msg), None, callingDomain)
+                    self._write(msg)
+                    if self.server.debug:
+                        print('Sent rss3 feed: ' +
+                              path + ' ' + callingDomain)
+                    self._benchmarkGETtimings(GETstartTime, GETtimings,
+                                              'sharedInbox enabled',
+                                              'blog rss3')
+                    return
+        if debug:
+            print('Failed to get rss3 feed: ' +
+                  path + ' ' + callingDomain)
+        self._404()
+
     def do_GET(self):
         callingDomain = self.server.domainFull
         if self.headers.get('Host'):
@@ -3872,48 +3919,15 @@ class PubServer(BaseHTTPRequestHandler):
         # RSS 3.0
         if self.path.startswith('/blog/') and \
            self.path.endswith('/rss.txt'):
-            nickname = self.path.split('/blog/')[1]
-            if '/' in nickname:
-                nickname = nickname.split('/')[0]
-            if not nickname.startswith('rss.'):
-                if os.path.isdir(self.server.baseDir +
-                                 '/accounts/' + nickname +
-                                 '@' + self.server.domain):
-                    if not self.server.session:
-                        print('Starting new session during RSS3 request')
-                        self.server.session = \
-                            createSession(self.server.proxyType)
-                        if not self.server.session:
-                            print('ERROR: GET failed to create session ' +
-                                  'during RSS3 request')
-                            self._404()
-                            return
-                    msg = \
-                        htmlBlogPageRSS3(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('utf-8')
-                        self._set_headers('text/plain; charset=utf-8',
-                                          len(msg), cookie, callingDomain)
-                        self._write(msg)
-                        if self.server.debug:
-                            print('Sent rss3 feed: ' +
-                                  self.path + ' ' + callingDomain)
-                        self._benchmarkGETtimings(GETstartTime, GETtimings,
-                                                  'sharedInbox enabled',
-                                                  'blog rss3')
-                        return
-            if self.server.debug:
-                print('Failed to get rss3 feed: ' +
-                      self.path + ' ' + callingDomain)
-            self._404()
+            self._getRSS3feed(authorized,
+                              callingDomain, self.path,
+                              self.server.baseDir,
+                              self.server.httpPrefix,
+                              self.server.domain,
+                              self.server.port,
+                              self.server.proxyType,
+                              GETstartTime, GETtimings,
+                              self.server.debug)
             return
 
         self._benchmarkGETtimings(GETstartTime, GETtimings,