Move undo bookmark button to its own method

daemon.py

@@ -4610,6 +4610,96 @@ class PubServer(BaseHTTPRequestHandler):
                                   'unlike shown done',
                                   'bookmark shown')
 
+    def _undoBookmarkButton(self, callingDomain: str, path: str,
+                            baseDir: str, httpPrefix: str,
+                            domain: str, domainFull: str, port: int,
+                            onionDomain: str, i2pDomain: str,
+                            GETstartTime, GETtimings: {},
+                            proxyType: str, cookie: str,
+                            debug: str):
+        """Button pressed to undo a bookmark
+        """
+        pageNumber = 1
+        bookmarkUrl = path.split('?unbookmark=')[1]
+        if '?' in bookmarkUrl:
+            bookmarkUrl = bookmarkUrl.split('?')[0]
+        timelineBookmark = ''
+        if '?bm=' in path:
+            timelineBookmark = path.split('?bm=')[1]
+            if '?' in timelineBookmark:
+                timelineBookmark = timelineBookmark.split('?')[0]
+            timelineBookmark = '#' + timelineBookmark
+        if '?page=' in path:
+            pageNumberStr = path.split('?page=')[1]
+            if '?' in pageNumberStr:
+                pageNumberStr = pageNumberStr.split('?')[0]
+            if '#' in pageNumberStr:
+                pageNumberStr = pageNumberStr.split('#')[0]
+            if pageNumberStr.isdigit():
+                pageNumber = int(pageNumberStr)
+        timelineStr = 'inbox'
+        if '?tl=' in path:
+            timelineStr = path.split('?tl=')[1]
+            if '?' in timelineStr:
+                timelineStr = timelineStr.split('?')[0]
+        actor = path.split('?unbookmark=')[0]
+        self.postToNickname = getNicknameFromActor(actor)
+        if not self.postToNickname:
+            print('WARN: unable to find nickname in ' + actor)
+            self.server.GETbusy = False
+            actorAbsolute = \
+                httpPrefix + '://' + domainFull + actor
+            if callingDomain.endswith('.onion') and onionDomain:
+                actorAbsolute = 'http://' + onionDomain + actor
+            elif callingDomain.endswith('.i2p') and i2pDomain:
+                actorAbsolute = 'http://' + i2pDomain + actor
+            self._redirect_headers(actorAbsolute + '/' + timelineStr +
+                                   '?page=' + str(pageNumber), cookie,
+                                   callingDomain)
+            return
+        if not self.server.session:
+            print('Starting new session during undo bookmark')
+            self.server.session = createSession(proxyType)
+            if not self.server.session:
+                print('ERROR: GET failed to create session ' +
+                      'during undo bookmark')
+                self._404()
+                self.server.GETbusy = False
+                return
+        undoActor = \
+            httpPrefix + '://' + domainFull + '/users/' + self.postToNickname
+        ccList = []
+        undoBookmark(self.server.recentPostsCache,
+                     self.server.session,
+                     baseDir,
+                     self.server.federationList,
+                     self.postToNickname,
+                     domain, port,
+                     ccList,
+                     httpPrefix,
+                     bookmarkUrl, undoActor, False,
+                     self.server.sendThreads,
+                     self.server.postLog,
+                     self.server.personCache,
+                     self.server.cachedWebfingers,
+                     debug,
+                     self.server.projectVersion)
+        # self._postToOutbox(undoBookmarkJson, self.server.projectVersion)
+        self.server.GETbusy = False
+        actorAbsolute = \
+            httpPrefix + '://' + domainFull + actor
+        if callingDomain.endswith('.onion') and onionDomain:
+            actorAbsolute = 'http://' + onionDomain + actor
+        elif callingDomain.endswith('.i2p') and i2pDomain:
+            actorAbsolute = 'http://' + i2pDomain + actor
+        self._redirect_headers(actorAbsolute + '/' + timelineStr +
+                               '?page=' + str(pageNumber) +
+                               timelineBookmark, cookie,
+                               callingDomain)
+        self._benchmarkGETtimings(GETstartTime, GETtimings,
+                                  'bookmark shown done',
+                                  'unbookmark shown')
+
     def do_GET(self):
         callingDomain = self.server.domainFull
         if self.headers.get('Host'):
@@ -5928,93 +6018,17 @@ class PubServer(BaseHTTPRequestHandler):
 
         # undo a bookmark from the web interface icon
         if htmlGET and '?unbookmark=' in self.path:
-            pageNumber = 1
+            self._undoBookmarkButton(callingDomain, self.path,
-            bookmarkUrl = self.path.split('?unbookmark=')[1]
+                                     self.server.baseDir,
-            if '?' in bookmarkUrl:
+                                     self.server.httpPrefix,
-                bookmarkUrl = bookmarkUrl.split('?')[0]
+                                     self.server.domain,
-            timelineBookmark = ''
+                                     self.server.domainFull,
-            if '?bm=' in self.path:
+                                     self.server.port,
-                timelineBookmark = self.path.split('?bm=')[1]
+                                     self.server.onionDomain,
-                if '?' in timelineBookmark:
+                                     self.server.i2pDomain,
-                    timelineBookmark = timelineBookmark.split('?')[0]
+                                     GETstartTime, GETtimings,
-                timelineBookmark = '#' + timelineBookmark
+                                     self.server.proxyType, cookie,
-            if '?page=' in self.path:
+                                     self.server.debug)
-                pageNumberStr = self.path.split('?page=')[1]
-                if '?' in pageNumberStr:
-                    pageNumberStr = pageNumberStr.split('?')[0]
-                if '#' in pageNumberStr:
-                    pageNumberStr = pageNumberStr.split('#')[0]
-                if pageNumberStr.isdigit():
-                    pageNumber = int(pageNumberStr)
-            timelineStr = 'inbox'
-            if '?tl=' in self.path:
-                timelineStr = self.path.split('?tl=')[1]
-                if '?' in timelineStr:
-                    timelineStr = timelineStr.split('?')[0]
-            actor = self.path.split('?unbookmark=')[0]
-            self.postToNickname = getNicknameFromActor(actor)
-            if not self.postToNickname:
-                print('WARN: unable to find nickname in ' + actor)
-                self.server.GETbusy = False
-                actorAbsolute = \
-                    self.server.httpPrefix + '://' + \
-                    self.server.domainFull + actor
-                if callingDomain.endswith('.onion') and \
-                   self.server.onionDomain:
-                    actorAbsolute = 'http://' + \
-                        self.server.onionDomain + actor
-                elif (callingDomain.endswith('.i2p') and
-                      self.server.i2pDomain):
-                    actorAbsolute = 'http://' + self.server.i2pDomain + actor
-                self._redirect_headers(actorAbsolute + '/' + timelineStr +
-                                       '?page=' + str(pageNumber), cookie,
-                                       callingDomain)
-                return
-            if not self.server.session:
-                print('Starting new session during undo bookmark')
-                self.server.session = createSession(self.server.proxyType)
-                if not self.server.session:
-                    print('ERROR: GET failed to create session ' +
-                          'during undo bookmark')
-                    self._404()
-                    self.server.GETbusy = False
-                    return
-            undoActor = \
-                self.server.httpPrefix + '://' + \
-                self.server.domainFull + '/users/' + self.postToNickname
-            ccList = []
-            undoBookmark(self.server.recentPostsCache,
-                         self.server.session,
-                         self.server.baseDir,
-                         self.server.federationList,
-                         self.postToNickname,
-                         self.server.domain, self.server.port,
-                         ccList,
-                         self.server.httpPrefix,
-                         bookmarkUrl, undoActor, False,
-                         self.server.sendThreads,
-                         self.server.postLog,
-                         self.server.personCache,
-                         self.server.cachedWebfingers,
-                         self.server.debug,
-                         self.server.projectVersion)
-            # self._postToOutbox(undoBookmarkJson, self.server.projectVersion)
-            self.server.GETbusy = False
-            actorAbsolute = \
-                self.server.httpPrefix + '://' + self.server.domainFull + actor
-            if callingDomain.endswith('.onion') and \
-               self.server.onionDomain:
-                actorAbsolute = 'http://' + self.server.onionDomain + actor
-            elif (callingDomain.endswith('.i2p') and
-                  self.server.i2pDomain):
-                actorAbsolute = 'http://' + self.server.i2pDomain + actor
-            self._redirect_headers(actorAbsolute + '/' + timelineStr +
-                                   '?page=' + str(pageNumber) +
-                                   timelineBookmark, cookie,
-                                   callingDomain)
-            self._benchmarkGETtimings(GETstartTime, GETtimings,
-                                      'bookmark shown done',
-                                      'unbookmark shown')
             return
 
         self._benchmarkGETtimings(GETstartTime, GETtimings,