From 3aa245d5b99c3e00b17e0eaa16138e32d76760ee Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 10 Dec 2020 10:21:54 +0000
Subject: [PATCH] Regenerate account info screen

---
 daemon.py            | 54 +++++++++++++++++++++++++++++---------------
 webapp_moderation.py | 13 ++++++-----
 2 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/daemon.py b/daemon.py
index d2b0890b8..99c38556d 100644
--- a/daemon.py
+++ b/daemon.py
@@ -8132,10 +8132,6 @@ class PubServer(BaseHTTPRequestHandler):
                         fullWidthTimelineButtonHeader = \
                             self.server.fullWidthTimelineButtonHeader
                         moderationActionStr = ''
-                        if '?modaction=' in nickname:
-                            moderationActionStr = \
-                                nickname.split('?modaction=')[1]
-                            nickname = nickname.split('?modaction=')[0]
                         msg = \
                             htmlModeration(self.server.cssCache,
                                            self.server.defaultTimeline,
@@ -8186,8 +8182,6 @@ class PubServer(BaseHTTPRequestHandler):
                 if debug:
                     nickname = path.replace('/users/', '')
                     nickname = nickname.replace('/moderation', '')
-                    if '?modaction=' in nickname:
-                        nickname = nickname.split('?modaction=')[0]
                     print('DEBUG: ' + nickname +
                           ' was not authorized to access ' + path)
         if debug:
@@ -11004,7 +10998,8 @@ class PubServer(BaseHTTPRequestHandler):
 
         # block a domain from htmlAccountInfo
         if authorized and '/users/' in self.path and \
-           '/accountinfo?blockdomain=' in self.path:
+           '/accountinfo?blockdomain=' in self.path and \
+           '?handle=' in self.path:
             nickname = self.path.split('/users/')[1]
             if '/' in nickname:
                 nickname = nickname.split('/')[0]
@@ -11012,20 +11007,33 @@ class PubServer(BaseHTTPRequestHandler):
                 self._400()
                 return
             blockDomain = self.path.split('/accountinfo?blockdomain=')[1]
+            searchHandle = blockDomain.split('?handle=')[1]
+            blockDomain = blockDomain.split('?handle=')[0]
             blockDomain = urllib.parse.unquote_plus(blockDomain.strip())
-            searchHandle = ''
             if '?' in blockDomain:
-                searchHandle = '?modaction=' + blockDomain.split('?')[1]
                 blockDomain = blockDomain.split('?')[0]
             addGlobalBlock(self.server.baseDir, nickname, blockDomain)
             self.server.GETbusy = False
-            self._redirect_headers('/users/' + nickname + '/moderation' +
-                                   searchHandle, cookie, callingDomain)
+            msg = \
+                htmlAccountInfo(self.server.cssCache,
+                                self.server.translate,
+                                self.server.baseDir,
+                                self.server.httpPrefix,
+                                nickname,
+                                self.server.domain,
+                                self.server.port,
+                                searchHandle,
+                                self.server.debug)
+            msg = msg.encode('utf-8')
+            self._login_headers('text/html',
+                                len(msg), callingDomain)
+            self._write(msg)
             return
 
         # unblock a domain from htmlAccountInfo
         if authorized and '/users/' in self.path and \
-           '/accountinfo?unblockdomain=' in self.path:
+           '/accountinfo?unblockdomain=' in self.path and \
+           '?handle=' in self.path:
             nickname = self.path.split('/users/')[1]
             if '/' in nickname:
                 nickname = nickname.split('/')[0]
@@ -11033,15 +11041,25 @@ class PubServer(BaseHTTPRequestHandler):
                 self._400()
                 return
             blockDomain = self.path.split('/accountinfo?unblockdomain=')[1]
+            searchHandle = blockDomain.split('?handle=')[1]
+            blockDomain = blockDomain.split('?handle=')[0]
             blockDomain = urllib.parse.unquote_plus(blockDomain.strip())
-            searchHandle = ''
-            if '?' in blockDomain:
-                searchHandle = '?modaction=' + blockDomain.split('?')[1]
-                blockDomain = blockDomain.split('?')[0]
             removeGlobalBlock(self.server.baseDir, nickname, blockDomain)
             self.server.GETbusy = False
-            self._redirect_headers('/users/' + nickname + '/moderation' +
-                                   searchHandle, cookie, callingDomain)
+            msg = \
+                htmlAccountInfo(self.server.cssCache,
+                                self.server.translate,
+                                self.server.baseDir,
+                                self.server.httpPrefix,
+                                nickname,
+                                self.server.domain,
+                                self.server.port,
+                                searchHandle,
+                                self.server.debug)
+            msg = msg.encode('utf-8')
+            self._login_headers('text/html',
+                                len(msg), callingDomain)
+            self._write(msg)
             return
 
         # get the bookmarks timeline for a given person
diff --git a/webapp_moderation.py b/webapp_moderation.py
index fcec913c9..0f827c397 100644
--- a/webapp_moderation.py
+++ b/webapp_moderation.py
@@ -68,11 +68,10 @@ def htmlAccountInfo(cssCache: {}, translate: {},
     searchNickname = getNicknameFromActor(searchHandle)
     searchDomain, searchPort = getDomainFromActor(searchHandle)
 
+    searchHandle = searchNickname + '@' + searchDomain
     infoForm += \
-        '<center><h1><a href="/users/' + nickname + '/moderation' + \
-        '?modaction=' + searchHandle + '">' + \
-        translate['Account Information'] + \
-        ': ' + searchNickname + '@' + searchDomain + \
+        '<center><h1><a href="/users/' + nickname + '/moderation">' + \
+        translate['Account Information'] + ': ' + searchHandle + \
         '</a></h1><br>'
 
     infoForm += translate[msgStr1] + '</center><br><br>'
@@ -91,12 +90,14 @@ def htmlAccountInfo(cssCache: {}, translate: {},
             httpPrefix + '://' + postDomain + '">' + postDomain + '</a> '
         if isBlockedDomain(baseDir, postDomain):
             infoForm += \
-                '<a href="' + usersPath + '?unblockdomain=' + postDomain + '">'
+                '<a href="' + usersPath + '?unblockdomain=' + postDomain + \
+                '?handle=' + searchHandle + '">'
             infoForm += '<button class="buttonhighlighted"><span>' + \
                 translate['Unblock'] + '</span></button></a>'
         else:
             infoForm += \
-                '<a href="' + usersPath + '?blockdomain=' + postDomain + '">'
+                '<a href="' + usersPath + '?blockdomain=' + postDomain + \
+                '?handle=' + searchHandle + '">'
             infoForm += '<button class="button"><span>' + \
                 translate['Block'] + '</span></button></a>'
         infoForm += '<br>'