From 810f4986c96ac28d5908163004f8b5bf9b9306bb Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 27 Jun 2021 15:58:54 +0100
Subject: [PATCH 01/20] Simplify the main new post construction function

---
 posts.py | 301 +++++++++++++++++++++++++++----------------------------
 1 file changed, 145 insertions(+), 156 deletions(-)

diff --git a/posts.py b/posts.py
index 22bb0cf4a..4376684d9 100644
--- a/posts.py
+++ b/posts.py
@@ -762,50 +762,6 @@ def _addSchedulePost(baseDir: str, nickname: str, domain: str,
             scheduleFile.write(indexStr + '\n')
 
 
-def _appendEventFields(newPost: {},
-                       eventUUID: str, eventStatus: str,
-                       anonymousParticipationEnabled: bool,
-                       repliesModerationOption: str,
-                       category: str,
-                       joinMode: str,
-                       eventDateStr: str,
-                       endDateStr: str,
-                       location: str,
-                       maximumAttendeeCapacity: int,
-                       ticketUrl: str,
-                       subject: str) -> None:
-    """Appends Mobilizon-type event fields to a post
-    """
-    if not eventUUID:
-        return
-
-    # add attributes for Mobilizon-type events
-    newPost['uuid'] = eventUUID
-    if eventStatus:
-        newPost['ical:status'] = eventStatus
-    if anonymousParticipationEnabled:
-        newPost['anonymousParticipationEnabled'] = \
-            anonymousParticipationEnabled
-    if repliesModerationOption:
-        newPost['repliesModerationOption'] = repliesModerationOption
-    if category:
-        newPost['category'] = category
-    if joinMode:
-        newPost['joinMode'] = joinMode
-    newPost['startTime'] = eventDateStr
-    newPost['endTime'] = endDateStr
-    if location:
-        newPost['location'] = location
-    if maximumAttendeeCapacity:
-        newPost['maximumAttendeeCapacity'] = maximumAttendeeCapacity
-    if ticketUrl:
-        newPost['ticketUrl'] = ticketUrl
-    if subject:
-        newPost['name'] = subject
-        newPost['summary'] = None
-        newPost['sensitive'] = False
-
-
 def validContentWarning(cw: str) -> str:
     """Returns a validated content warning
     """
@@ -876,6 +832,131 @@ def _createPostCWFromReply(baseDir: str, nickname: str, domain: str,
     return sensitive, summary
 
 
+def _createPostS2S(baseDir: str, nickname: str, domain: str, port: int,
+                   httpPrefix: str, content: str, statusNumber: str,
+                   published: str, newPostId: str, postContext: {},
+                   toRecipients: [], toCC: [], inReplyTo: str,
+                   sensitive: bool, commentsEnabled: bool,
+                   tags: {}, attachImageFilename: str,
+                   mediaType: str, imageDescription: str, city: str,
+                   postObjectType: str, summary: str,
+                   inReplyToAtomUri: str) -> {}:
+    """Creates a new server-to-server post
+    """
+    actorUrl = httpPrefix + '://' + domain + '/users/' + nickname
+    idStr = \
+        httpPrefix + '://' + domain + '/users/' + nickname + \
+        '/statuses/' + statusNumber + '/replies'
+    newPostUrl = \
+        httpPrefix + '://' + domain + '/@' + nickname + '/' + statusNumber
+    newPostAttributedTo = \
+        httpPrefix + '://' + domain + '/users/' + nickname
+    newPost = {
+        '@context': postContext,
+        'id': newPostId + '/activity',
+        'type': 'Create',
+        'actor': actorUrl,
+        'published': published,
+        'to': toRecipients,
+        'cc': toCC,
+        'object': {
+            'id': newPostId,
+            'type': postObjectType,
+            'summary': summary,
+            'inReplyTo': inReplyTo,
+            'published': published,
+            'url': newPostUrl,
+            'attributedTo': newPostAttributedTo,
+            'to': toRecipients,
+            'cc': toCC,
+            'sensitive': sensitive,
+            'atomUri': newPostId,
+            'inReplyToAtomUri': inReplyToAtomUri,
+            'commentsEnabled': commentsEnabled,
+            'rejectReplies': not commentsEnabled,
+            'mediaType': 'text/html',
+            'content': content,
+            'contentMap': {
+                'en': content
+            },
+            'attachment': [],
+            'tag': tags,
+            'replies': {
+                'id': idStr,
+                'type': 'Collection',
+                'first': {
+                    'type': 'CollectionPage',
+                    'partOf': idStr,
+                    'items': []
+                }
+            }
+        }
+    }
+    if attachImageFilename:
+        newPost['object'] = \
+            attachMedia(baseDir, httpPrefix, nickname, domain, port,
+                        newPost['object'], attachImageFilename,
+                        mediaType, imageDescription, city)
+    return newPost
+
+
+def _createPostC2S(baseDir: str, nickname: str, domain: str, port: int,
+                   httpPrefix: str, content: str, statusNumber: str,
+                   published: str, newPostId: str, postContext: {},
+                   toRecipients: [], toCC: [], inReplyTo: str,
+                   sensitive: bool, commentsEnabled: bool,
+                   tags: {}, attachImageFilename: str,
+                   mediaType: str, imageDescription: str, city: str,
+                   postObjectType: str, summary: str,
+                   inReplyToAtomUri: str) -> {}:
+    """Creates a new client-to-server post
+    """
+    idStr = \
+        httpPrefix + '://' + domain + '/users/' + nickname + \
+        '/statuses/' + statusNumber + '/replies'
+    newPostUrl = \
+        httpPrefix + '://' + domain + '/@' + nickname + '/' + statusNumber
+    newPost = {
+        "@context": postContext,
+        'id': newPostId,
+        'type': postObjectType,
+        'summary': summary,
+        'inReplyTo': inReplyTo,
+        'published': published,
+        'url': newPostUrl,
+        'attributedTo': httpPrefix + '://' + domain + '/users/' + nickname,
+        'to': toRecipients,
+        'cc': toCC,
+        'sensitive': sensitive,
+        'atomUri': newPostId,
+        'inReplyToAtomUri': inReplyToAtomUri,
+        'commentsEnabled': commentsEnabled,
+        'rejectReplies': not commentsEnabled,
+        'mediaType': 'text/html',
+        'content': content,
+        'contentMap': {
+            'en': content
+        },
+        'attachment': [],
+        'tag': tags,
+        'replies': {
+            'id': idStr,
+            'type': 'Collection',
+            'first': {
+                'type': 'CollectionPage',
+                'partOf': idStr,
+                'items': []
+            }
+        }
+    }
+    if attachImageFilename:
+        newPost = \
+            attachMedia(baseDir, httpPrefix, nickname, domain, port,
+                        newPost, attachImageFilename,
+                        mediaType, imageDescription, city)
+    return newPost
+
+
 def _createPostBase(baseDir: str, nickname: str, domain: str, port: int,
                     toUrl: str, ccUrl: str, httpPrefix: str, content: str,
                     followersOnly: bool, saveToFile: bool,
@@ -1059,119 +1140,27 @@ def _createPostBase(baseDir: str, nickname: str, domain: str, port: int,
         postObjectType = 'Article'
 
     if not clientToServer:
-        actorUrl = httpPrefix + '://' + domain + '/users/' + nickname
-
-        idStr = \
-            httpPrefix + '://' + domain + '/users/' + nickname + \
-            '/statuses/' + statusNumber + '/replies'
-        newPostUrl = \
-            httpPrefix + '://' + domain + '/@' + nickname + '/' + statusNumber
-        newPostAttributedTo = \
-            httpPrefix + '://' + domain + '/users/' + nickname
-        newPost = {
-            '@context': postContext,
-            'id': newPostId + '/activity',
-            'type': 'Create',
-            'actor': actorUrl,
-            'published': published,
-            'to': toRecipients,
-            'cc': toCC,
-            'object': {
-                'id': newPostId,
-                'type': postObjectType,
-                'summary': summary,
-                'inReplyTo': inReplyTo,
-                'published': published,
-                'url': newPostUrl,
-                'attributedTo': newPostAttributedTo,
-                'to': toRecipients,
-                'cc': toCC,
-                'sensitive': sensitive,
-                'atomUri': newPostId,
-                'inReplyToAtomUri': inReplyToAtomUri,
-                'commentsEnabled': commentsEnabled,
-                'rejectReplies': not commentsEnabled,
-                'mediaType': 'text/html',
-                'content': content,
-                'contentMap': {
-                    'en': content
-                },
-                'attachment': [],
-                'tag': tags,
-                'replies': {
-                    'id': idStr,
-                    'type': 'Collection',
-                    'first': {
-                        'type': 'CollectionPage',
-                        'partOf': idStr,
-                        'items': []
-                    }
-                }
-            }
-        }
-        if attachImageFilename:
-            newPost['object'] = \
-                attachMedia(baseDir, httpPrefix, nickname, domain, port,
-                            newPost['object'], attachImageFilename,
-                            mediaType, imageDescription, city)
-        _appendEventFields(newPost['object'], eventUUID, eventStatus,
-                           anonymousParticipationEnabled,
-                           repliesModerationOption,
-                           category, joinMode,
-                           eventDateStr, endDateStr,
-                           location, maximumAttendeeCapacity,
-                           ticketUrl, subject)
+        newPost = \
+            _createPostS2S(baseDir, nickname, domain, port,
+                           httpPrefix, content, statusNumber,
+                           published, newPostId, postContext,
+                           toRecipients, toCC, inReplyTo,
+                           sensitive, commentsEnabled,
+                           tags, attachImageFilename,
+                           mediaType, imageDescription, city,
+                           postObjectType, summary,
+                           inReplyToAtomUri)
     else:
-        idStr = \
-            httpPrefix + '://' + domain + '/users/' + nickname + \
-            '/statuses/' + statusNumber + '/replies'
-        newPostUrl = \
-            httpPrefix + '://' + domain + '/@' + nickname + '/' + statusNumber
-        newPost = {
-            "@context": postContext,
-            'id': newPostId,
-            'type': postObjectType,
-            'summary': summary,
-            'inReplyTo': inReplyTo,
-            'published': published,
-            'url': newPostUrl,
-            'attributedTo': httpPrefix + '://' + domain + '/users/' + nickname,
-            'to': toRecipients,
-            'cc': toCC,
-            'sensitive': sensitive,
-            'atomUri': newPostId,
-            'inReplyToAtomUri': inReplyToAtomUri,
-            'commentsEnabled': commentsEnabled,
-            'rejectReplies': not commentsEnabled,
-            'mediaType': 'text/html',
-            'content': content,
-            'contentMap': {
-                'en': content
-            },
-            'attachment': [],
-            'tag': tags,
-            'replies': {
-                'id': idStr,
-                'type': 'Collection',
-                'first': {
-                    'type': 'CollectionPage',
-                    'partOf': idStr,
-                    'items': []
-                }
-            }
-        }
-        if attachImageFilename:
-            newPost = \
-                attachMedia(baseDir, httpPrefix, nickname, domain, port,
-                            newPost, attachImageFilename,
-                            mediaType, imageDescription, city)
-        _appendEventFields(newPost, eventUUID, eventStatus,
-                           anonymousParticipationEnabled,
-                           repliesModerationOption,
-                           category, joinMode,
-                           eventDateStr, endDateStr,
-                           location, maximumAttendeeCapacity,
-                           ticketUrl, subject)
+        newPost = \
+            _createPostC2S(baseDir, nickname, domain, port,
+                           httpPrefix, content, statusNumber,
+                           published, newPostId, postContext,
+                           toRecipients, toCC, inReplyTo,
+                           sensitive, commentsEnabled,
+                           tags, attachImageFilename,
+                           mediaType, imageDescription, city,
+                           postObjectType, summary,
+                           inReplyToAtomUri)
     if ccUrl:
         if len(ccUrl) > 0:
             newPost['cc'] = [ccUrl]

From 3d67188634f80f63a04a3cc61a37b17218165c19 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 27 Jun 2021 15:59:45 +0100
Subject: [PATCH 02/20] tags is a list

---
 posts.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/posts.py b/posts.py
index 4376684d9..c887e149e 100644
--- a/posts.py
+++ b/posts.py
@@ -837,7 +837,7 @@ def _createPostS2S(baseDir: str, nickname: str, domain: str, port: int,
                    published: str, newPostId: str, postContext: {},
                    toRecipients: [], toCC: [], inReplyTo: str,
                    sensitive: bool, commentsEnabled: bool,
-                   tags: {}, attachImageFilename: str,
+                   tags: [], attachImageFilename: str,
                    mediaType: str, imageDescription: str, city: str,
                    postObjectType: str, summary: str,
                    inReplyToAtomUri: str) -> {}:
@@ -905,7 +905,7 @@ def _createPostC2S(baseDir: str, nickname: str, domain: str, port: int,
                    published: str, newPostId: str, postContext: {},
                    toRecipients: [], toCC: [], inReplyTo: str,
                    sensitive: bool, commentsEnabled: bool,
-                   tags: {}, attachImageFilename: str,
+                   tags: [], attachImageFilename: str,
                    mediaType: str, imageDescription: str, city: str,
                    postObjectType: str, summary: str,
                    inReplyToAtomUri: str) -> {}:

From 8d4879818a116c0e4ebd5709a6429b5da846900e Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 27 Jun 2021 16:48:02 +0100
Subject: [PATCH 03/20] Separate function for adding place and time to new post

---
 posts.py | 110 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 63 insertions(+), 47 deletions(-)

diff --git a/posts.py b/posts.py
index c887e149e..ab14d9276 100644
--- a/posts.py
+++ b/posts.py
@@ -957,6 +957,64 @@ def _createPostC2S(baseDir: str, nickname: str, domain: str, port: int,
     return newPost
 
 
+def _createPostPlaceAndTime(eventDate: str, endDate: str,
+                            eventTime: str, endTime: str,
+                            summary: str, content: str,
+                            schedulePost: bool,
+                            eventUUID: str,
+                            location: str,
+                            tags: []) -> str:
+    """Adds a place and time to the tags on a new post
+    """
+    endDateStr = None
+    if endDate:
+        eventName = summary
+        if not eventName:
+            eventName = content
+        endDateStr = endDate
+        if endTime:
+            if endTime.endswith('Z'):
+                endDateStr = endDate + 'T' + endTime
+            else:
+                endDateStr = endDate + 'T' + endTime + \
+                    ':00' + strftime("%z", gmtime())
+        else:
+            endDateStr = endDate + 'T12:00:00Z'
+
+    # get the starting date and time
+    eventDateStr = None
+    if eventDate:
+        eventName = summary
+        if not eventName:
+            eventName = content
+        eventDateStr = eventDate
+        if eventTime:
+            if eventTime.endswith('Z'):
+                eventDateStr = eventDate + 'T' + eventTime
+            else:
+                eventDateStr = eventDate + 'T' + eventTime + \
+                    ':00' + strftime("%z", gmtime())
+        else:
+            eventDateStr = eventDate + 'T12:00:00Z'
+        if not endDateStr:
+            endDateStr = eventDateStr
+        if not schedulePost and not eventUUID:
+            tags.append({
+                "@context": "https://www.w3.org/ns/activitystreams",
+                "type": "Event",
+                "name": eventName,
+                "startTime": eventDateStr,
+                "endTime": endDateStr
+            })
+    if location and not eventUUID:
+        tags.append({
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "type": "Place",
+            "name": location
+        })
+    return eventDateStr
+
+
 def _createPostBase(baseDir: str, nickname: str, domain: str, port: int,
                     toUrl: str, ccUrl: str, httpPrefix: str, content: str,
                     followersOnly: bool, saveToFile: bool,
@@ -1061,53 +1119,11 @@ def _createPostBase(baseDir: str, nickname: str, domain: str, port: int,
         _createPostCWFromReply(baseDir, nickname, domain,
                                inReplyTo, sensitive, summary)
 
-    # get the ending date and time
-    endDateStr = None
-    if endDate:
-        eventName = summary
-        if not eventName:
-            eventName = content
-        endDateStr = endDate
-        if endTime:
-            if endTime.endswith('Z'):
-                endDateStr = endDate + 'T' + endTime
-            else:
-                endDateStr = endDate + 'T' + endTime + \
-                    ':00' + strftime("%z", gmtime())
-        else:
-            endDateStr = endDate + 'T12:00:00Z'
-
-    # get the starting date and time
-    eventDateStr = None
-    if eventDate:
-        eventName = summary
-        if not eventName:
-            eventName = content
-        eventDateStr = eventDate
-        if eventTime:
-            if eventTime.endswith('Z'):
-                eventDateStr = eventDate + 'T' + eventTime
-            else:
-                eventDateStr = eventDate + 'T' + eventTime + \
-                    ':00' + strftime("%z", gmtime())
-        else:
-            eventDateStr = eventDate + 'T12:00:00Z'
-        if not endDateStr:
-            endDateStr = eventDateStr
-        if not schedulePost and not eventUUID:
-            tags.append({
-                "@context": "https://www.w3.org/ns/activitystreams",
-                "type": "Event",
-                "name": eventName,
-                "startTime": eventDateStr,
-                "endTime": endDateStr
-            })
-    if location and not eventUUID:
-        tags.append({
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "type": "Place",
-            "name": location
-        })
+    eventDateStr = \
+        _createPostPlaceAndTime(eventDate, endDate,
+                                eventTime, endTime,
+                                summary, content, schedulePost,
+                                eventUUID, location, tags)
 
     postContext = [
         'https://www.w3.org/ns/activitystreams',

From 9907ad65f17180b061c92cd0dcabdcc2a753d255 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 27 Jun 2021 17:12:10 +0100
Subject: [PATCH 04/20] Moderation report for new post

---
 posts.py | 70 ++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 45 insertions(+), 25 deletions(-)

diff --git a/posts.py b/posts.py
index ab14d9276..8280ccc8c 100644
--- a/posts.py
+++ b/posts.py
@@ -1015,6 +1015,49 @@ def _createPostPlaceAndTime(eventDate: str, endDate: str,
     return eventDateStr
 
 
+def _createPostMentions(ccUrl: str, newPost: {},
+                        toRecipients: [], tags: []) -> None:
+    """Updates mentions for a new post
+    """
+    if not ccUrl:
+        return
+    if len(ccUrl) == 0:
+        return
+    newPost['cc'] = [ccUrl]
+    if newPost.get('object'):
+        newPost['object']['cc'] = [ccUrl]
+
+        # if this is a public post then include any mentions in cc
+        toCC = newPost['object']['cc']
+        if len(toRecipients) != 1:
+            return
+        if toRecipients[0].endswith('#Public') and \
+           ccUrl.endswith('/followers'):
+            for tag in tags:
+                if tag['type'] != 'Mention':
+                    continue
+                if tag['href'] not in toCC:
+                    newPost['object']['cc'].append(tag['href'])
+
+
+def _createPostModReport(baseDir: str,
+                         isModerationReport: bool, newPost: {},
+                         newPostId: str) -> None:
+    """ if this is a moderation report then add a status
+    """
+    if not isModerationReport:
+        return
+    # add status
+    if newPost.get('object'):
+        newPost['object']['moderationStatus'] = 'pending'
+    else:
+        newPost['moderationStatus'] = 'pending'
+    # save to index file
+    moderationIndexFile = baseDir + '/accounts/moderation.txt'
+    with open(moderationIndexFile, 'a+') as modFile:
+        modFile.write(newPostId + '\n')
+
+
 def _createPostBase(baseDir: str, nickname: str, domain: str, port: int,
                     toUrl: str, ccUrl: str, httpPrefix: str, content: str,
                     followersOnly: bool, saveToFile: bool,
@@ -1177,33 +1220,10 @@ def _createPostBase(baseDir: str, nickname: str, domain: str, port: int,
                            mediaType, imageDescription, city,
                            postObjectType, summary,
                            inReplyToAtomUri)
-    if ccUrl:
-        if len(ccUrl) > 0:
-            newPost['cc'] = [ccUrl]
-            if newPost.get('object'):
-                newPost['object']['cc'] = [ccUrl]
 
-                # if this is a public post then include any mentions in cc
-                toCC = newPost['object']['cc']
-                if len(toRecipients) == 1:
-                    if toRecipients[0].endswith('#Public') and \
-                       ccUrl.endswith('/followers'):
-                        for tag in tags:
-                            if tag['type'] == 'Mention':
-                                if tag['href'] not in toCC:
-                                    toCC.append(tag['href'])
+    _createPostMentions(ccUrl, newPost, toRecipients, tags)
 
-    # if this is a moderation report then add a status
-    if isModerationReport:
-        # add status
-        if newPost.get('object'):
-            newPost['object']['moderationStatus'] = 'pending'
-        else:
-            newPost['moderationStatus'] = 'pending'
-        # save to index file
-        moderationIndexFile = baseDir + '/accounts/moderation.txt'
-        with open(moderationIndexFile, 'a+') as modFile:
-            modFile.write(newPostId + '\n')
+    _createPostModReport(baseDir, isModerationReport, newPost, newPostId)
 
     # If a patch has been posted - i.e. the output from
     # git format-patch - then convert the activitypub type

From cc4918f08167b309bf05967c1dff4f1d825ba6c4 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 27 Jun 2021 17:17:43 +0100
Subject: [PATCH 05/20] Create default variables

---
 webapp_profile.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/webapp_profile.py b/webapp_profile.py
index 28247ded8..721deabd0 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -1054,6 +1054,8 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
     ssbAddress = ''
     blogAddress = ''
     toxAddress = ''
+    jamiAddress = ''
+    cwtchAddress = ''
     briarAddress = ''
     manuallyApprovesFollowers = ''
     movedTo = ''

From de56a843cb037b8045134aa8e893b5fa20b3cbba Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 27 Jun 2021 17:22:55 +0100
Subject: [PATCH 06/20] Fewer lines

---
 webapp_profile.py | 32 ++++++++------------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/webapp_profile.py b/webapp_profile.py
index 721deabd0..3439a4fd7 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -1034,31 +1034,15 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
     bannerFile, bannerFilename = \
         getBannerFile(baseDir, nickname, domain, theme)
 
-    isBot = ''
-    isGroup = ''
-    followDMs = ''
-    removeTwitter = ''
-    notifyLikes = ''
-    hideLikeButton = ''
-    mediaInstanceStr = ''
-    blogsInstanceStr = ''
-    newsInstanceStr = ''
     displayNickname = nickname
-    bioStr = ''
-    donateUrl = ''
-    emailAddress = ''
-    PGPpubKey = ''
-    PGPfingerprint = ''
-    xmppAddress = ''
-    matrixAddress = ''
-    ssbAddress = ''
-    blogAddress = ''
-    toxAddress = ''
-    jamiAddress = ''
-    cwtchAddress = ''
-    briarAddress = ''
-    manuallyApprovesFollowers = ''
-    movedTo = ''
+    isBot = isGroup = followDMs = removeTwitter = ''
+    notifyLikes = hideLikeButton = mediaInstanceStr = ''
+    blogsInstanceStr = newsInstanceStr = movedTo = ''
+    bioStr = donateUrl = emailAddress = PGPpubKey = ''
+    PGPfingerprint = xmppAddress = matrixAddress = ''
+    ssbAddress = blogAddress = toxAddress = jamiAddress = ''
+    cwtchAddress = briarAddress = manuallyApprovesFollowers = ''
+
     actorJson = loadJson(actorFilename)
     if actorJson:
         if actorJson.get('movedTo'):

From 48240a38bbf4262191114a0868f3550f906e3f3e Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 27 Jun 2021 17:24:12 +0100
Subject: [PATCH 07/20] Fewer lines

---
 webapp_profile.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/webapp_profile.py b/webapp_profile.py
index 3439a4fd7..60b285c29 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -1096,22 +1096,19 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
     if mediaInstance:
         if mediaInstance is True:
             mediaInstanceStr = 'checked'
-            blogsInstanceStr = ''
-            newsInstanceStr = ''
+            blogsInstanceStr = newsInstanceStr = ''
 
     newsInstance = getConfigParam(baseDir, "newsInstance")
     if newsInstance:
         if newsInstance is True:
             newsInstanceStr = 'checked'
-            blogsInstanceStr = ''
-            mediaInstanceStr = ''
+            blogsInstanceStr = mediaInstanceStr = ''
 
     blogsInstance = getConfigParam(baseDir, "blogsInstance")
     if blogsInstance:
         if blogsInstance is True:
             blogsInstanceStr = 'checked'
-            mediaInstanceStr = ''
-            newsInstanceStr = ''
+            mediaInstanceStr = newsInstanceStr = ''
 
     filterStr = ''
     filterFilename = \

From f62dc618184cdf4d34d1408e2ca02c90ff38ed41 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 27 Jun 2021 18:59:46 +0100
Subject: [PATCH 08/20] Themes dropdown function

---
 webapp_profile.py | 87 +++++++++++++++++++++++++----------------------
 1 file changed, 47 insertions(+), 40 deletions(-)

diff --git a/webapp_profile.py b/webapp_profile.py
index 60b285c29..a56ebd0a3 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -1008,6 +1008,52 @@ def _htmlProfileShares(actor: str, translate: {},
     return profileStr
 
 
+def _grayscaleEnabled(baseDir: str) -> bool:
+    """Is grayscale UI enabled?
+    """
+    return os.path.isfile(baseDir + '/accounts/.grayscale')
+
+
+def _htmlThemesDropdown(baseDir: str, translate: {}) -> str:
+    """Returns the html for theme selection dropdown
+    """
+    # Themes section
+    themes = getThemesList(baseDir)
+    themesDropdown = '  <label class="labels">' + \
+        translate['Theme'] + '</label><br>\n'
+    grayscale = ''
+    if _grayscaleEnabled(baseDir):
+        grayscale = 'checked'
+    themesDropdown += \
+        '      <input type="checkbox" class="profilecheckbox" ' + \
+        'name="grayscale" ' + grayscale + \
+        '> ' + translate['Grayscale'] + '<br>'
+    themesDropdown += '  <select id="themeDropdown" ' + \
+        'name="themeDropdown" class="theme">'
+    for themeName in themes:
+        translatedThemeName = themeName
+        if translate.get(themeName):
+            translatedThemeName = translate[themeName]
+        themesDropdown += '    <option value="' + \
+            themeName.lower() + '">' + \
+            translatedThemeName + '</option>'
+    themesDropdown += '  </select><br>'
+    if os.path.isfile(baseDir + '/fonts/custom.woff') or \
+       os.path.isfile(baseDir + '/fonts/custom.woff2') or \
+       os.path.isfile(baseDir + '/fonts/custom.otf') or \
+       os.path.isfile(baseDir + '/fonts/custom.ttf'):
+        themesDropdown += \
+            '      <input type="checkbox" class="profilecheckbox" ' + \
+            'name="removeCustomFont"> ' + \
+            translate['Remove the custom font'] + '<br>'
+    themeName = getConfigParam(baseDir, 'theme')
+    themesDropdown = \
+        themesDropdown.replace('<option value="' + themeName + '">',
+                               '<option value="' + themeName +
+                               '" selected>')
+    return themesDropdown
+
+
 def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
                     domain: str, port: int, httpPrefix: str,
                     defaultTimeline: str, theme: str,
@@ -1204,7 +1250,6 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
     if os.path.isfile(baseDir + '/epicyon.css'):
         cssFilename = baseDir + '/epicyon.css'
 
-    themesDropdown = ''
     instanceStr = ''
     roleAssignStr = ''
     peertubeStr = ''
@@ -1216,45 +1261,7 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
         graphicsStr = '<details><summary class="cw">' + \
             translate['Graphic Design'] + '</summary>\n'
         graphicsStr += '<div class="container">'
-
-        # Themes section
-        themes = getThemesList(baseDir)
-        themesDropdown += '  <label class="labels">' + \
-            translate['Theme'] + '</label><br>\n'
-        grayscaleFilename = \
-            baseDir + '/accounts/.grayscale'
-        grayscale = ''
-        if os.path.isfile(grayscaleFilename):
-            grayscale = 'checked'
-        themesDropdown += \
-            '      <input type="checkbox" class="profilecheckbox" ' + \
-            'name="grayscale" ' + grayscale + \
-            '> ' + translate['Grayscale'] + '<br>'
-        themesDropdown += '  <select id="themeDropdown" ' + \
-            'name="themeDropdown" class="theme">'
-        for themeName in themes:
-            translatedThemeName = themeName
-            if translate.get(themeName):
-                translatedThemeName = translate[themeName]
-            themesDropdown += '    <option value="' + \
-                themeName.lower() + '">' + \
-                translatedThemeName + '</option>'
-        themesDropdown += '  </select><br>'
-        if os.path.isfile(baseDir + '/fonts/custom.woff') or \
-           os.path.isfile(baseDir + '/fonts/custom.woff2') or \
-           os.path.isfile(baseDir + '/fonts/custom.otf') or \
-           os.path.isfile(baseDir + '/fonts/custom.ttf'):
-            themesDropdown += \
-                '      <input type="checkbox" class="profilecheckbox" ' + \
-                'name="removeCustomFont"> ' + \
-                translate['Remove the custom font'] + '<br>'
-        themeName = getConfigParam(baseDir, 'theme')
-        themesDropdown = \
-            themesDropdown.replace('<option value="' + themeName + '">',
-                                   '<option value="' + themeName +
-                                   '" selected>')
-        graphicsStr += themesDropdown
-
+        graphicsStr += _htmlThemesDropdown(baseDir, translate)
         graphicsStr += \
             '      <label class="labels">' + \
             translate['Import Theme'] + '</label>\n'

From 800d927d5b17123fc56e52aae56604f024f54809 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 27 Jun 2021 19:12:22 +0100
Subject: [PATCH 09/20] Function for edit profile graphic design section

---
 webapp_profile.py | 46 +++++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/webapp_profile.py b/webapp_profile.py
index a56ebd0a3..117305c64 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -1054,6 +1054,32 @@ def _htmlThemesDropdown(baseDir: str, translate: {}) -> str:
     return themesDropdown
 
 
+def _htmlEditProfileGraphicDesign(baseDir: str, translate: {}) -> str:
+    """Graphic design section on Edit Profile screen
+    """
+    themeFormats = '.zip, .gz'
+
+    graphicsStr = '<details><summary class="cw">' + \
+        translate['Graphic Design'] + '</summary>\n'
+    graphicsStr += '<div class="container">'
+    graphicsStr += _htmlThemesDropdown(baseDir, translate)
+    graphicsStr += \
+        '      <label class="labels">' + \
+        translate['Import Theme'] + '</label>\n'
+    graphicsStr += '      <input type="file" id="importTheme" '
+    graphicsStr += 'name="submitImportTheme" '
+    graphicsStr += 'accept="' + themeFormats + '">\n'
+    graphicsStr += \
+        '      <label class="labels">' + \
+        translate['Export Theme'] + '</label><br>\n'
+    graphicsStr += \
+        '      <button type="submit" class="button" ' + \
+        'name="submitExportTheme">➤</button>\n'
+
+    graphicsStr += '    </div></details>\n'
+    return graphicsStr
+
+
 def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
                     domain: str, port: int, httpPrefix: str,
                     defaultTimeline: str, theme: str,
@@ -1063,7 +1089,6 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
     """Shows the edit profile screen
     """
     imageFormats = getImageFormats()
-    themeFormats = '.zip, .gz'
     path = path.replace('/inbox', '').replace('/outbox', '')
     path = path.replace('/shares', '')
     nickname = getNicknameFromActor(path)
@@ -1258,24 +1283,7 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
 
     if isArtist(baseDir, nickname) or \
        path.startswith('/users/' + str(adminNickname) + '/'):
-        graphicsStr = '<details><summary class="cw">' + \
-            translate['Graphic Design'] + '</summary>\n'
-        graphicsStr += '<div class="container">'
-        graphicsStr += _htmlThemesDropdown(baseDir, translate)
-        graphicsStr += \
-            '      <label class="labels">' + \
-            translate['Import Theme'] + '</label>\n'
-        graphicsStr += '      <input type="file" id="importTheme" '
-        graphicsStr += 'name="submitImportTheme" '
-        graphicsStr += 'accept="' + themeFormats + '">\n'
-        graphicsStr += \
-            '      <label class="labels">' + \
-            translate['Export Theme'] + '</label><br>\n'
-        graphicsStr += \
-            '      <button type="submit" class="button" ' + \
-            'name="submitExportTheme">➤</button>\n'
-
-        graphicsStr += '    </div></details>\n'
+        graphicsStr = _htmlEditProfileGraphicDesign(baseDir, translate)
 
     if adminNickname:
         if path.startswith('/users/' + adminNickname + '/'):

From 599cba64095626178d74c03218d807d87800193c Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 27 Jun 2021 19:46:21 +0100
Subject: [PATCH 10/20] Edit profile function for instance settings

---
 webapp_profile.py | 479 ++++++++++++++++++++++++----------------------
 1 file changed, 249 insertions(+), 230 deletions(-)

diff --git a/webapp_profile.py b/webapp_profile.py
index 117305c64..687e63325 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -1080,6 +1080,249 @@ def _htmlEditProfileGraphicDesign(baseDir: str, translate: {}) -> str:
     return graphicsStr
 
 
+def _htmlEditProfileInstance(baseDir: str, translate: {},
+                             peertubeInstances: [],
+                             mediaInstanceStr: str,
+                             blogsInstanceStr: str,
+                             newsInstanceStr: str) -> (str, str, str):
+    """Edit profile instance settings
+    """
+    imageFormats = getImageFormats()
+
+    # Instance details section
+    instanceDescription = \
+        getConfigParam(baseDir, 'instanceDescription')
+    customSubmitText = \
+        getConfigParam(baseDir, 'customSubmitText')
+    instanceDescriptionShort = \
+        getConfigParam(baseDir, 'instanceDescriptionShort')
+    instanceTitle = \
+        getConfigParam(baseDir, 'instanceTitle')
+
+    instanceStr = '<details><summary class="cw">' + \
+        translate['Instance Settings'] + '</summary>\n'
+    instanceStr += '<div class="container">'
+    instanceStr += \
+        '  <label class="labels">' + \
+        translate['Instance Title'] + '</label>'
+    if instanceTitle:
+        instanceStr += \
+            '  <input type="text" name="instanceTitle" value="' + \
+            instanceTitle + '"><br>'
+    else:
+        instanceStr += \
+            '  <input type="text" name="instanceTitle" value=""><br>'
+    instanceStr += \
+        '  <label class="labels">' + \
+        translate['Instance Short Description'] + '</label>'
+    if instanceDescriptionShort:
+        instanceStr += \
+            '  <input type="text" ' + \
+            'name="instanceDescriptionShort" value="' + \
+            instanceDescriptionShort + '"><br>'
+    else:
+        instanceStr += \
+            '  <input type="text" ' + \
+            'name="instanceDescriptionShort" value=""><br>'
+    instanceStr += \
+        '  <label class="labels">' + \
+        translate['Instance Description'] + '</label>'
+    if instanceDescription:
+        instanceStr += \
+            '  <textarea id="message" name="instanceDescription" ' + \
+            'style="height:200px" spellcheck="true">' + \
+            instanceDescription + '</textarea>'
+    else:
+        instanceStr += \
+            '  <textarea id="message" name="instanceDescription" ' + \
+            'style="height:200px" spellcheck="true"></textarea>'
+
+    instanceStr += \
+        '  <label class="labels">' + \
+        translate['Custom post submit button text'] + '</label>'
+    if customSubmitText:
+        instanceStr += \
+            '  <input type="text" ' + \
+            'name="customSubmitText" value="' + \
+            customSubmitText + '"><br>'
+    else:
+        instanceStr += \
+            '  <input type="text" ' + \
+            'name="customSubmitText" value=""><br>'
+
+    instanceStr += \
+        '  <label class="labels">' + \
+        translate['Instance Logo'] + '</label>'
+    instanceStr += \
+        '  <input type="file" id="instanceLogo" name="instanceLogo"'
+    instanceStr += '      accept="' + imageFormats + '"><br>\n'
+
+    instanceStr += \
+        '  <br><label class="labels">' + \
+        translate['Security'] + '</label><br>\n'
+
+    nodeInfoStr = \
+        translate['Show numbers of accounts within instance metadata']
+    if getConfigParam(baseDir, "showNodeInfoAccounts"):
+        instanceStr += \
+            '      <input type="checkbox" class="profilecheckbox" ' + \
+            'name="showNodeInfoAccounts" checked> ' + \
+            nodeInfoStr + '<br>\n'
+    else:
+        instanceStr += \
+            '      <input type="checkbox" class="profilecheckbox" ' + \
+            'name="showNodeInfoAccounts"> ' + \
+            nodeInfoStr + '<br>\n'
+
+    nodeInfoStr = \
+        translate['Show version number within instance metadata']
+    if getConfigParam(baseDir, "showNodeInfoVersion"):
+        instanceStr += \
+            '      <input type="checkbox" class="profilecheckbox" ' + \
+            'name="showNodeInfoVersion" checked> ' + \
+            nodeInfoStr + '<br>\n'
+    else:
+        instanceStr += \
+            '      <input type="checkbox" class="profilecheckbox" ' + \
+            'name="showNodeInfoVersion"> ' + \
+            nodeInfoStr + '<br>\n'
+
+    if getConfigParam(baseDir, "verifyAllSignatures"):
+        instanceStr += \
+            '      <input type="checkbox" class="profilecheckbox" ' + \
+            'name="verifyallsignatures" checked> ' + \
+            translate['Verify all signatures'] + '<br>\n'
+    else:
+        instanceStr += \
+            '      <input type="checkbox" class="profilecheckbox" ' + \
+            'name="verifyallsignatures"> ' + \
+            translate['Verify all signatures'] + '<br>\n'
+
+    instanceStr += translate['Enabling broch mode'] + '<br>\n'
+    if getConfigParam(baseDir, "brochMode"):
+        instanceStr += \
+            '      <input type="checkbox" class="profilecheckbox" ' + \
+            'name="brochMode" checked> ' + \
+            translate['Broch mode'] + '<br>\n'
+    else:
+        instanceStr += \
+            '      <input type="checkbox" class="profilecheckbox" ' + \
+            'name="brochMode"> ' + \
+            translate['Broch mode'] + '<br>\n'
+    # Instance type
+    instanceStr += \
+        '  <br><label class="labels">' + \
+        translate['Type of instance'] + '</label><br>\n'
+    instanceStr += \
+        '      <input type="checkbox" class="profilecheckbox" ' + \
+        'name="mediaInstance" ' + mediaInstanceStr + '> ' + \
+        translate['This is a media instance'] + '<br>\n'
+    instanceStr += \
+        '      <input type="checkbox" class="profilecheckbox" ' + \
+        'name="blogsInstance" ' + blogsInstanceStr + '> ' + \
+        translate['This is a blogging instance'] + '<br>\n'
+    instanceStr += \
+        '      <input type="checkbox" class="profilecheckbox" ' + \
+        'name="newsInstance" ' + newsInstanceStr + '> ' + \
+        translate['This is a news instance'] + '<br>\n'
+    instanceStr += '    </div></details>\n'
+
+    # Role assignments section
+    moderators = ''
+    moderatorsFile = baseDir + '/accounts/moderators.txt'
+    if os.path.isfile(moderatorsFile):
+        with open(moderatorsFile, "r") as f:
+            moderators = f.read()
+    # site moderators
+    roleAssignStr = '<details><summary class="cw">' + \
+        translate['Role Assignment'] + '</summary>\n'
+    roleAssignStr += '<div class="container">'
+    roleAssignStr += '  <b><label class="labels">' + \
+        translate['Moderators'] + '</label></b><br>\n'
+    roleAssignStr += '  ' + \
+        translate['A list of moderator nicknames. One per line.']
+    roleAssignStr += \
+        '  <textarea id="message" name="moderators" placeholder="' + \
+        translate['List of moderator nicknames'] + \
+        '..." style="height:200px" spellcheck="false">' + \
+        moderators + '</textarea>'
+
+    # site editors
+    editors = ''
+    editorsFile = baseDir + '/accounts/editors.txt'
+    if os.path.isfile(editorsFile):
+        with open(editorsFile, "r") as f:
+            editors = f.read()
+    roleAssignStr += '  <b><label class="labels">' + \
+        translate['Site Editors'] + '</label></b><br>\n'
+    roleAssignStr += '  ' + \
+        translate['A list of editor nicknames. One per line.']
+    roleAssignStr += \
+        '  <textarea id="message" name="editors" placeholder="" ' + \
+        'style="height:200px" spellcheck="false">' + \
+        editors + '</textarea>'
+
+    # counselors
+    counselors = ''
+    counselorsFile = baseDir + '/accounts/counselors.txt'
+    if os.path.isfile(counselorsFile):
+        with open(counselorsFile, "r") as f:
+            counselors = f.read()
+    roleAssignStr += '  <b><label class="labels">' + \
+        translate['Counselors'] + '</label></b><br>\n'
+    roleAssignStr += \
+        '  <textarea id="message" name="counselors" ' + \
+        'placeholder="" ' + \
+        'style="height:200px" spellcheck="false">' + \
+        counselors + '</textarea>'
+
+    # artists
+    artists = ''
+    artistsFile = baseDir + '/accounts/artists.txt'
+    if os.path.isfile(artistsFile):
+        with open(artistsFile, "r") as f:
+            artists = f.read()
+    roleAssignStr += '  <b><label class="labels">' + \
+        translate['Artists'] + '</label></b><br>\n'
+    roleAssignStr += \
+        '  <textarea id="message" name="artists" ' + \
+        'placeholder="" ' + \
+        'style="height:200px" spellcheck="false">' + \
+        artists + '</textarea>'
+    roleAssignStr += '    </div></details>\n'
+
+    # Video section
+    peertubeStr = '    <details><summary class="cw">' + \
+        translate['Video Settings'] + '</summary>\n'
+    peertubeStr += '    <div class="container">\n'
+    peertubeStr += \
+        '      <b><label class="labels">' + \
+        translate['Peertube Instances'] + '</label></b>\n'
+    idx = 'Show video previews for the following Peertube sites.'
+    peertubeStr += \
+        '      <br><label class="labels">' + \
+        translate[idx] + '</label>\n'
+    peertubeInstancesStr = ''
+    for url in peertubeInstances:
+        peertubeInstancesStr += url + '\n'
+    peertubeStr += \
+        '      <textarea id="message" name="ptInstances" ' + \
+        'style="height:200px" spellcheck="false">' + \
+        peertubeInstancesStr + '</textarea>\n'
+    peertubeStr += \
+        '      <br><b><label class="labels">' + \
+        translate['YouTube Replacement Domain'] + '</label></b>\n'
+    YTReplacementDomain = getConfigParam(baseDir, "youtubedomain")
+    if not YTReplacementDomain:
+        YTReplacementDomain = ''
+    peertubeStr += \
+        '      <input type="text" name="ytdomain" value="' + \
+        YTReplacementDomain + '">\n'
+    peertubeStr += '    </div></details>\n'
+
+    return instanceStr, roleAssignStr, peertubeStr
+
+
 def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
                     domain: str, port: int, httpPrefix: str,
                     defaultTimeline: str, theme: str,
@@ -1287,236 +1530,12 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
 
     if adminNickname:
         if path.startswith('/users/' + adminNickname + '/'):
-            # Instance details section
-            instanceDescription = \
-                getConfigParam(baseDir, 'instanceDescription')
-            customSubmitText = \
-                getConfigParam(baseDir, 'customSubmitText')
-            instanceDescriptionShort = \
-                getConfigParam(baseDir, 'instanceDescriptionShort')
-            instanceTitle = \
-                getConfigParam(baseDir, 'instanceTitle')
-
-            instanceStr = '<details><summary class="cw">' + \
-                translate['Instance Settings'] + '</summary>\n'
-            instanceStr += '<div class="container">'
-            instanceStr += \
-                '  <label class="labels">' + \
-                translate['Instance Title'] + '</label>'
-            if instanceTitle:
-                instanceStr += \
-                    '  <input type="text" name="instanceTitle" value="' + \
-                    instanceTitle + '"><br>'
-            else:
-                instanceStr += \
-                    '  <input type="text" name="instanceTitle" value=""><br>'
-            instanceStr += \
-                '  <label class="labels">' + \
-                translate['Instance Short Description'] + '</label>'
-            if instanceDescriptionShort:
-                instanceStr += \
-                    '  <input type="text" ' + \
-                    'name="instanceDescriptionShort" value="' + \
-                    instanceDescriptionShort + '"><br>'
-            else:
-                instanceStr += \
-                    '  <input type="text" ' + \
-                    'name="instanceDescriptionShort" value=""><br>'
-            instanceStr += \
-                '  <label class="labels">' + \
-                translate['Instance Description'] + '</label>'
-            if instanceDescription:
-                instanceStr += \
-                    '  <textarea id="message" name="instanceDescription" ' + \
-                    'style="height:200px" spellcheck="true">' + \
-                    instanceDescription + '</textarea>'
-            else:
-                instanceStr += \
-                    '  <textarea id="message" name="instanceDescription" ' + \
-                    'style="height:200px" spellcheck="true"></textarea>'
-
-            instanceStr += \
-                '  <label class="labels">' + \
-                translate['Custom post submit button text'] + '</label>'
-            if customSubmitText:
-                instanceStr += \
-                    '  <input type="text" ' + \
-                    'name="customSubmitText" value="' + \
-                    customSubmitText + '"><br>'
-            else:
-                instanceStr += \
-                    '  <input type="text" ' + \
-                    'name="customSubmitText" value=""><br>'
-
-            instanceStr += \
-                '  <label class="labels">' + \
-                translate['Instance Logo'] + '</label>'
-            instanceStr += \
-                '  <input type="file" id="instanceLogo" name="instanceLogo"'
-            instanceStr += '      accept="' + imageFormats + '"><br>\n'
-
-            instanceStr += \
-                '  <br><label class="labels">' + \
-                translate['Security'] + '</label><br>\n'
-
-            nodeInfoStr = \
-                translate['Show numbers of accounts within instance metadata']
-            if getConfigParam(baseDir, "showNodeInfoAccounts"):
-                instanceStr += \
-                    '      <input type="checkbox" class="profilecheckbox" ' + \
-                    'name="showNodeInfoAccounts" checked> ' + \
-                    nodeInfoStr + '<br>\n'
-            else:
-                instanceStr += \
-                    '      <input type="checkbox" class="profilecheckbox" ' + \
-                    'name="showNodeInfoAccounts"> ' + \
-                    nodeInfoStr + '<br>\n'
-
-            nodeInfoStr = \
-                translate['Show version number within instance metadata']
-            if getConfigParam(baseDir, "showNodeInfoVersion"):
-                instanceStr += \
-                    '      <input type="checkbox" class="profilecheckbox" ' + \
-                    'name="showNodeInfoVersion" checked> ' + \
-                    nodeInfoStr + '<br>\n'
-            else:
-                instanceStr += \
-                    '      <input type="checkbox" class="profilecheckbox" ' + \
-                    'name="showNodeInfoVersion"> ' + \
-                    nodeInfoStr + '<br>\n'
-
-            if getConfigParam(baseDir, "verifyAllSignatures"):
-                instanceStr += \
-                    '      <input type="checkbox" class="profilecheckbox" ' + \
-                    'name="verifyallsignatures" checked> ' + \
-                    translate['Verify all signatures'] + '<br>\n'
-            else:
-                instanceStr += \
-                    '      <input type="checkbox" class="profilecheckbox" ' + \
-                    'name="verifyallsignatures"> ' + \
-                    translate['Verify all signatures'] + '<br>\n'
-
-            instanceStr += translate['Enabling broch mode'] + '<br>\n'
-            if getConfigParam(baseDir, "brochMode"):
-                instanceStr += \
-                    '      <input type="checkbox" class="profilecheckbox" ' + \
-                    'name="brochMode" checked> ' + \
-                    translate['Broch mode'] + '<br>\n'
-            else:
-                instanceStr += \
-                    '      <input type="checkbox" class="profilecheckbox" ' + \
-                    'name="brochMode"> ' + \
-                    translate['Broch mode'] + '<br>\n'
-            # Instance type
-            instanceStr += \
-                '  <br><label class="labels">' + \
-                translate['Type of instance'] + '</label><br>\n'
-            instanceStr += \
-                '      <input type="checkbox" class="profilecheckbox" ' + \
-                'name="mediaInstance" ' + mediaInstanceStr + '> ' + \
-                translate['This is a media instance'] + '<br>\n'
-            instanceStr += \
-                '      <input type="checkbox" class="profilecheckbox" ' + \
-                'name="blogsInstance" ' + blogsInstanceStr + '> ' + \
-                translate['This is a blogging instance'] + '<br>\n'
-            instanceStr += \
-                '      <input type="checkbox" class="profilecheckbox" ' + \
-                'name="newsInstance" ' + newsInstanceStr + '> ' + \
-                translate['This is a news instance'] + '<br>\n'
-            instanceStr += '    </div></details>\n'
-
-            # Role assignments section
-            moderators = ''
-            moderatorsFile = baseDir + '/accounts/moderators.txt'
-            if os.path.isfile(moderatorsFile):
-                with open(moderatorsFile, "r") as f:
-                    moderators = f.read()
-            # site moderators
-            roleAssignStr = '<details><summary class="cw">' + \
-                translate['Role Assignment'] + '</summary>\n'
-            roleAssignStr += '<div class="container">'
-            roleAssignStr += '  <b><label class="labels">' + \
-                translate['Moderators'] + '</label></b><br>\n'
-            roleAssignStr += '  ' + \
-                translate['A list of moderator nicknames. One per line.']
-            roleAssignStr += \
-                '  <textarea id="message" name="moderators" placeholder="' + \
-                translate['List of moderator nicknames'] + \
-                '..." style="height:200px" spellcheck="false">' + \
-                moderators + '</textarea>'
-
-            # site editors
-            editors = ''
-            editorsFile = baseDir + '/accounts/editors.txt'
-            if os.path.isfile(editorsFile):
-                with open(editorsFile, "r") as f:
-                    editors = f.read()
-            roleAssignStr += '  <b><label class="labels">' + \
-                translate['Site Editors'] + '</label></b><br>\n'
-            roleAssignStr += '  ' + \
-                translate['A list of editor nicknames. One per line.']
-            roleAssignStr += \
-                '  <textarea id="message" name="editors" placeholder="" ' + \
-                'style="height:200px" spellcheck="false">' + \
-                editors + '</textarea>'
-
-            # counselors
-            counselors = ''
-            counselorsFile = baseDir + '/accounts/counselors.txt'
-            if os.path.isfile(counselorsFile):
-                with open(counselorsFile, "r") as f:
-                    counselors = f.read()
-            roleAssignStr += '  <b><label class="labels">' + \
-                translate['Counselors'] + '</label></b><br>\n'
-            roleAssignStr += \
-                '  <textarea id="message" name="counselors" ' + \
-                'placeholder="" ' + \
-                'style="height:200px" spellcheck="false">' + \
-                counselors + '</textarea>'
-
-            # artists
-            artists = ''
-            artistsFile = baseDir + '/accounts/artists.txt'
-            if os.path.isfile(artistsFile):
-                with open(artistsFile, "r") as f:
-                    artists = f.read()
-            roleAssignStr += '  <b><label class="labels">' + \
-                translate['Artists'] + '</label></b><br>\n'
-            roleAssignStr += \
-                '  <textarea id="message" name="artists" ' + \
-                'placeholder="" ' + \
-                'style="height:200px" spellcheck="false">' + \
-                artists + '</textarea>'
-            roleAssignStr += '    </div></details>\n'
-
-            # Video section
-            peertubeStr = '    <details><summary class="cw">' + \
-                translate['Video Settings'] + '</summary>\n'
-            peertubeStr += '    <div class="container">\n'
-            peertubeStr += \
-                '      <b><label class="labels">' + \
-                translate['Peertube Instances'] + '</label></b>\n'
-            idx = 'Show video previews for the following Peertube sites.'
-            peertubeStr += \
-                '      <br><label class="labels">' + \
-                translate[idx] + '</label>\n'
-            peertubeInstancesStr = ''
-            for url in peertubeInstances:
-                peertubeInstancesStr += url + '\n'
-            peertubeStr += \
-                '      <textarea id="message" name="ptInstances" ' + \
-                'style="height:200px" spellcheck="false">' + \
-                peertubeInstancesStr + '</textarea>\n'
-            peertubeStr += \
-                '      <br><b><label class="labels">' + \
-                translate['YouTube Replacement Domain'] + '</label></b>\n'
-            YTReplacementDomain = getConfigParam(baseDir, "youtubedomain")
-            if not YTReplacementDomain:
-                YTReplacementDomain = ''
-            peertubeStr += \
-                '      <input type="text" name="ytdomain" value="' + \
-                YTReplacementDomain + '">\n'
-            peertubeStr += '    </div></details>\n'
+            instanceStr, roleAssignStr, peertubeStr = \
+                _htmlEditProfileInstance(baseDir, translate,
+                                         peertubeInstances,
+                                         mediaInstanceStr,
+                                         blogsInstanceStr,
+                                         newsInstanceStr)
 
     instanceTitle = \
         getConfigParam(baseDir, 'instanceTitle')

From 180b9c621a123e66ff2ecc3085e999d89fc29b98 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 27 Jun 2021 20:03:52 +0100
Subject: [PATCH 11/20] Danger zone function for edit profile screen

---
 webapp_profile.py | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/webapp_profile.py b/webapp_profile.py
index 687e63325..6d0726822 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -1323,6 +1323,22 @@ def _htmlEditProfileInstance(baseDir: str, translate: {},
     return instanceStr, roleAssignStr, peertubeStr
 
 
+def _htmlEditProfileDangerZone(translate: {}) -> str:
+    """danger zone section of Edit Profile screen
+    """
+    editProfileForm = '    <details><summary class="cw">' + \
+        translate['Danger Zone'] + '</summary>\n'
+    editProfileForm += '    <div class="container">\n'
+    editProfileForm += '      <b><label class="labels">' + \
+        translate['Danger Zone'] + '</label></b><br>\n'
+    editProfileForm += \
+        '      <input type="checkbox" class=dangercheckbox" ' + \
+        'name="deactivateThisAccount"> ' + \
+        translate['Deactivate this account'] + '<br>\n'
+    editProfileForm += '    </div></details>\n'
+    return editProfileForm
+
+
 def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
                     domain: str, port: int, httpPrefix: str,
                     defaultTimeline: str, theme: str,
@@ -1945,16 +1961,7 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
     editProfileForm += roleAssignStr + peertubeStr + graphicsStr + instanceStr
 
     # danger zone section
-    editProfileForm += '    <details><summary class="cw">' + \
-        translate['Danger Zone'] + '</summary>\n'
-    editProfileForm += '    <div class="container">\n'
-    editProfileForm += '      <b><label class="labels">' + \
-        translate['Danger Zone'] + '</label></b><br>\n'
-    editProfileForm += \
-        '      <input type="checkbox" class=dangercheckbox" ' + \
-        'name="deactivateThisAccount"> ' + \
-        translate['Deactivate this account'] + '<br>\n'
-    editProfileForm += '    </div></details>\n'
+    editProfileForm += _htmlEditProfileDangerZone(translate)
 
     editProfileForm += '    <div class="container">\n'
     editProfileForm += \

From 43e6f9d0d64f7b1f9d4ef2f177aa6b9d297e48b9 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 27 Jun 2021 20:24:13 +0100
Subject: [PATCH 12/20] Skills function for edit profile screen

---
 webapp_profile.py | 89 ++++++++++++++++++++++++++---------------------
 1 file changed, 50 insertions(+), 39 deletions(-)

diff --git a/webapp_profile.py b/webapp_profile.py
index 6d0726822..fb5992eb3 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -1339,6 +1339,53 @@ def _htmlEditProfileDangerZone(translate: {}) -> str:
     return editProfileForm
 
 
+def _htmlEditProfileSkills(baseDir: str, nickname: str, domain: str,
+                           translate: {}) -> str:
+    """skills section of Edit Profile screen
+    """
+    skills = getSkills(baseDir, nickname, domain)
+    skillsStr = ''
+    skillCtr = 1
+    if skills:
+        for skillDesc, skillValue in skills.items():
+            if isFiltered(baseDir, nickname, domain, skillDesc):
+                continue
+            skillsStr += \
+                '<p><input type="text" placeholder="' + translate['Skill'] + \
+                ' ' + str(skillCtr) + '" name="skillName' + str(skillCtr) + \
+                '" value="' + skillDesc + '" style="width:40%">'
+            skillsStr += \
+                '<input type="range" min="1" max="100" ' + \
+                'class="slider" name="skillValue' + \
+                str(skillCtr) + '" value="' + str(skillValue) + '"></p>'
+            skillCtr += 1
+
+    skillsStr += \
+        '<p><input type="text" placeholder="Skill ' + str(skillCtr) + \
+        '" name="skillName' + str(skillCtr) + \
+        '" value="" style="width:40%">'
+    skillsStr += \
+        '<input type="range" min="1" max="100" ' + \
+        'class="slider" name="skillValue' + \
+        str(skillCtr) + '" value="50"></p>'
+    skillsStr += '    </div></details>\n'
+
+    editProfileForm = '<details><summary class="cw">' + \
+        translate['Skills'] + '</summary>\n'
+    editProfileForm += '    <div class="container">\n'
+    editProfileForm += \
+        '      <b><label class="labels">' + \
+        translate['Skills'] + '</label></b><br>\n'
+    idx = 'If you want to participate within organizations then you ' + \
+        'can indicate some skills that you have and approximate ' + \
+        'proficiency levels. This helps organizers to construct ' + \
+        'teams with an appropriate combination of skills.'
+    editProfileForm += '      <label class="labels">' + \
+        translate[idx] + '</label>\n'
+    editProfileForm += skillsStr
+    return editProfileForm
+
+
 def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
                     domain: str, port: int, httpPrefix: str,
                     defaultTimeline: str, theme: str,
@@ -1503,33 +1550,6 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
         with open(gitProjectsFilename, 'r') as gitProjectsFile:
             gitProjectsStr = gitProjectsFile.read()
 
-    skills = getSkills(baseDir, nickname, domain)
-    skillsStr = ''
-    skillCtr = 1
-    if skills:
-        for skillDesc, skillValue in skills.items():
-            if isFiltered(baseDir, nickname, domain, skillDesc):
-                continue
-            skillsStr += \
-                '<p><input type="text" placeholder="' + translate['Skill'] + \
-                ' ' + str(skillCtr) + '" name="skillName' + str(skillCtr) + \
-                '" value="' + skillDesc + '" style="width:40%">'
-            skillsStr += \
-                '<input type="range" min="1" max="100" ' + \
-                'class="slider" name="skillValue' + \
-                str(skillCtr) + '" value="' + str(skillValue) + '"></p>'
-            skillCtr += 1
-
-    skillsStr += \
-        '<p><input type="text" placeholder="Skill ' + str(skillCtr) + \
-        '" name="skillName' + str(skillCtr) + \
-        '" value="" style="width:40%">'
-    skillsStr += \
-        '<input type="range" min="1" max="100" ' + \
-        'class="slider" name="skillValue' + \
-        str(skillCtr) + '" value="50"></p>'
-    skillsStr += '    </div></details>\n'
-
     cssFilename = baseDir + '/epicyon-profile.css'
     if os.path.isfile(baseDir + '/epicyon.css'):
         cssFilename = baseDir + '/epicyon.css'
@@ -1930,6 +1950,7 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
 
     editProfileForm += '    </div></details>\n'
 
+    # git projects section
     editProfileForm += '<details><summary class="cw">' + \
         translate['Git Projects'] + '</summary>\n'
     editProfileForm += '    <div class="container">\n'
@@ -1945,19 +1966,9 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
     editProfileForm += '    </div></details>\n'
 
     # Skills section
-    editProfileForm += '<details><summary class="cw">' + \
-        translate['Skills'] + '</summary>\n'
-    editProfileForm += '    <div class="container">\n'
     editProfileForm += \
-        '      <b><label class="labels">' + \
-        translate['Skills'] + '</label></b><br>\n'
-    idx = 'If you want to participate within organizations then you ' + \
-        'can indicate some skills that you have and approximate ' + \
-        'proficiency levels. This helps organizers to construct ' + \
-        'teams with an appropriate combination of skills.'
-    editProfileForm += '      <label class="labels">' + \
-        translate[idx] + '</label>\n'
-    editProfileForm += skillsStr
+        _htmlEditProfileSkills(baseDir, nickname, domain, translate)
+
     editProfileForm += roleAssignStr + peertubeStr + graphicsStr + instanceStr
 
     # danger zone section

From aaa71b542e35fe0a6acabba89c31067183b22b26 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 27 Jun 2021 20:33:07 +0100
Subject: [PATCH 13/20] Function for git projects section of edit profile
 screen

---
 webapp_profile.py | 48 +++++++++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/webapp_profile.py b/webapp_profile.py
index fb5992eb3..8d6b46c22 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -1386,6 +1386,33 @@ def _htmlEditProfileSkills(baseDir: str, nickname: str, domain: str,
     return editProfileForm
 
 
+def _htmlEditProfileGitProjects(baseDir: str, nickname: str, domain: str,
+                                translate: {}) -> str:
+    """git projects section of edit profile screen
+    """
+    gitProjectsStr = ''
+    gitProjectsFilename = \
+        baseDir + '/accounts/' + \
+        nickname + '@' + domain + '/gitprojects.txt'
+    if os.path.isfile(gitProjectsFilename):
+        with open(gitProjectsFilename, 'r') as gitProjectsFile:
+            gitProjectsStr = gitProjectsFile.read()
+
+    editProfileForm = '<details><summary class="cw">' + \
+        translate['Git Projects'] + '</summary>\n'
+    editProfileForm += '    <div class="container">\n'
+    idx = 'List of project names that you wish to receive git patches for'
+    editProfileForm += \
+        '      <label class="labels">' + \
+        translate[idx] + '</label>\n'
+    editProfileForm += \
+        '      <textarea id="message" name="gitProjects" ' + \
+        'style="height:100px" spellcheck="false">' + \
+        gitProjectsStr + '</textarea>\n'
+    editProfileForm += '    </div></details>\n'
+    return editProfileForm
+
+
 def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
                     domain: str, port: int, httpPrefix: str,
                     defaultTimeline: str, theme: str,
@@ -1542,14 +1569,6 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
         with open(allowedInstancesFilename, 'r') as allowedInstancesFile:
             allowedInstancesStr = allowedInstancesFile.read()
 
-    gitProjectsStr = ''
-    gitProjectsFilename = \
-        baseDir + '/accounts/' + \
-        nickname + '@' + domain + '/gitprojects.txt'
-    if os.path.isfile(gitProjectsFilename):
-        with open(gitProjectsFilename, 'r') as gitProjectsFile:
-            gitProjectsStr = gitProjectsFile.read()
-
     cssFilename = baseDir + '/epicyon-profile.css'
     if os.path.isfile(baseDir + '/epicyon.css'):
         cssFilename = baseDir + '/epicyon.css'
@@ -1951,19 +1970,8 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
     editProfileForm += '    </div></details>\n'
 
     # git projects section
-    editProfileForm += '<details><summary class="cw">' + \
-        translate['Git Projects'] + '</summary>\n'
-    editProfileForm += '    <div class="container">\n'
-    idx = 'List of project names that you wish to receive git patches for'
     editProfileForm += \
-        '      <label class="labels">' + \
-        translate[idx] + '</label>\n'
-    editProfileForm += \
-        '      <textarea id="message" name="gitProjects" ' + \
-        'style="height:100px" spellcheck="false">' + \
-        gitProjectsStr + '</textarea>\n'
-
-    editProfileForm += '    </div></details>\n'
+        _htmlEditProfileGitProjects(baseDir, nickname, domain, translate)
 
     # Skills section
     editProfileForm += \

From 6a8148d703fbbbd8990c3883f977cd4aa69afbb3 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 27 Jun 2021 20:44:57 +0100
Subject: [PATCH 14/20] Function for filtering section of edit profile screen

---
 webapp_profile.py | 337 ++++++++++++++++++++++++----------------------
 1 file changed, 173 insertions(+), 164 deletions(-)

diff --git a/webapp_profile.py b/webapp_profile.py
index 8d6b46c22..2f1a5fe5d 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -1413,6 +1413,178 @@ def _htmlEditProfileGitProjects(baseDir: str, nickname: str, domain: str,
     return editProfileForm
 
 
+def _htmlEditProfileFiltering(baseDir: str, nickname: str, domain: str,
+                              translate: {}) -> str:
+    """Filtering and blocking section of edit profile screen
+    """
+    filterStr = ''
+    filterFilename = \
+        baseDir + '/accounts/' + nickname + '@' + domain + '/filters.txt'
+    if os.path.isfile(filterFilename):
+        with open(filterFilename, 'r') as filterfile:
+            filterStr = filterfile.read()
+
+    switchStr = ''
+    switchFilename = \
+        baseDir + '/accounts/' + \
+        nickname + '@' + domain + '/replacewords.txt'
+    if os.path.isfile(switchFilename):
+        with open(switchFilename, 'r') as switchfile:
+            switchStr = switchfile.read()
+
+    autoTags = ''
+    autoTagsFilename = \
+        baseDir + '/accounts/' + \
+        nickname + '@' + domain + '/autotags.txt'
+    if os.path.isfile(autoTagsFilename):
+        with open(autoTagsFilename, 'r') as autoTagsFile:
+            autoTags = autoTagsFile.read()
+
+    autoCW = ''
+    autoCWFilename = \
+        baseDir + '/accounts/' + \
+        nickname + '@' + domain + '/autocw.txt'
+    if os.path.isfile(autoCWFilename):
+        with open(autoCWFilename, 'r') as autoCWFile:
+            autoCW = autoCWFile.read()
+
+    blockedStr = ''
+    blockedFilename = \
+        baseDir + '/accounts/' + \
+        nickname + '@' + domain + '/blocking.txt'
+    if os.path.isfile(blockedFilename):
+        with open(blockedFilename, 'r') as blockedfile:
+            blockedStr = blockedfile.read()
+
+    dmAllowedInstancesStr = ''
+    dmAllowedInstancesFilename = \
+        baseDir + '/accounts/' + \
+        nickname + '@' + domain + '/dmAllowedInstances.txt'
+    if os.path.isfile(dmAllowedInstancesFilename):
+        with open(dmAllowedInstancesFilename, 'r') as dmAllowedInstancesFile:
+            dmAllowedInstancesStr = dmAllowedInstancesFile.read()
+
+    allowedInstancesStr = ''
+    allowedInstancesFilename = \
+        baseDir + '/accounts/' + \
+        nickname + '@' + domain + '/allowedinstances.txt'
+    if os.path.isfile(allowedInstancesFilename):
+        with open(allowedInstancesFilename, 'r') as allowedInstancesFile:
+            allowedInstancesStr = allowedInstancesFile.read()
+
+    editProfileForm = '<details><summary class="cw">' + \
+        translate['Filtering and Blocking'] + '</summary>\n'
+    editProfileForm += '    <div class="container">\n'
+
+    editProfileForm += \
+        '<label class="labels">' + \
+        translate['City for spoofed GPS image metadata'] + \
+        '</label><br>\n'
+
+    cityFilename = baseDir + '/accounts/' + \
+        nickname + '@' + domain + '/city.txt'
+    if os.path.isfile(cityFilename):
+        with open(cityFilename, 'r') as fp:
+            city = fp.read().replace('\n', '')
+    locationsFilename = baseDir + '/custom_locations.txt'
+    if not os.path.isfile(locationsFilename):
+        locationsFilename = baseDir + '/locations.txt'
+    cities = []
+    with open(locationsFilename, "r") as f:
+        cities = f.readlines()
+        cities.sort()
+    editProfileForm += '  <select id="cityDropdown" ' + \
+        'name="cityDropdown" class="theme">\n'
+    city = city.lower()
+    for cityName in cities:
+        if ':' not in cityName:
+            continue
+        citySelected = ''
+        cityName = cityName.split(':')[0]
+        cityName = cityName.lower()
+        if city in cityName:
+            citySelected = ' selected'
+        editProfileForm += \
+            '    <option value="' + cityName + \
+            '"' + citySelected.title() + '>' + \
+            cityName + '</option>\n'
+    editProfileForm += '  </select><br>\n'
+
+    editProfileForm += \
+        '      <b><label class="labels">' + \
+        translate['Filtered words'] + '</label></b>\n'
+    editProfileForm += '      <br><label class="labels">' + \
+        translate['One per line'] + '</label>\n'
+    editProfileForm += '      <textarea id="message" ' + \
+        'name="filteredWords" style="height:200px" spellcheck="false">' + \
+        filterStr + '</textarea>\n'
+
+    editProfileForm += \
+        '      <br><b><label class="labels">' + \
+        translate['Word Replacements'] + '</label></b>\n'
+    editProfileForm += '      <br><label class="labels">A -> B</label>\n'
+    editProfileForm += \
+        '      <textarea id="message" name="switchWords" ' + \
+        'style="height:200px" spellcheck="false">' + \
+        switchStr + '</textarea>\n'
+
+    editProfileForm += \
+        '      <br><b><label class="labels">' + \
+        translate['Autogenerated Hashtags'] + '</label></b>\n'
+    editProfileForm += '      <br><label class="labels">A -> #B</label>\n'
+    editProfileForm += \
+        '      <textarea id="message" name="autoTags" ' + \
+        'style="height:200px" spellcheck="false">' + \
+        autoTags + '</textarea>\n'
+
+    editProfileForm += \
+        '      <br><b><label class="labels">' + \
+        translate['Autogenerated Content Warnings'] + '</label></b>\n'
+    editProfileForm += '      <br><label class="labels">A -> B</label>\n'
+    editProfileForm += \
+        '      <textarea id="message" name="autoCW" ' + \
+        'style="height:200px" spellcheck="true">' + autoCW + '</textarea>\n'
+
+    editProfileForm += \
+        '      <br><b><label class="labels">' + \
+        translate['Blocked accounts'] + '</label></b>\n'
+    idx = 'Blocked accounts, one per line, in the form ' + \
+        'nickname@domain or *@blockeddomain'
+    editProfileForm += \
+        '      <br><label class="labels">' + translate[idx] + '</label>\n'
+    editProfileForm += \
+        '      <textarea id="message" name="blocked" style="height:200px" ' + \
+        'spellcheck="false">' + blockedStr + '</textarea>\n'
+
+    editProfileForm += \
+        '      <br><b><label class="labels">' + \
+        translate['Direct Message permitted instances'] + '</label></b>\n'
+    idx = 'Direct messages are always allowed from these instances.'
+    editProfileForm += \
+        '      <br><label class="labels">' + \
+        translate[idx] + '</label>\n'
+    editProfileForm += \
+        '      <textarea id="message" name="dmAllowedInstances" ' + \
+        'style="height:200px" spellcheck="false">' + \
+        dmAllowedInstancesStr + '</textarea>\n'
+
+    editProfileForm += \
+        '      <br><b><label class="labels">' + \
+        translate['Federation list'] + '</label></b>\n'
+    idx = 'Federate only with a defined set of instances. ' + \
+        'One domain name per line.'
+    editProfileForm += \
+        '      <br><label class="labels">' + \
+        translate[idx] + '</label>\n'
+    editProfileForm += \
+        '      <textarea id="message" name="allowedInstances" ' + \
+        'style="height:200px" spellcheck="false">' + \
+        allowedInstancesStr + '</textarea>\n'
+
+    editProfileForm += '    </div></details>\n'
+    return editProfileForm
+
+
 def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
                     domain: str, port: int, httpPrefix: str,
                     defaultTimeline: str, theme: str,
@@ -1514,61 +1686,6 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
             blogsInstanceStr = 'checked'
             mediaInstanceStr = newsInstanceStr = ''
 
-    filterStr = ''
-    filterFilename = \
-        baseDir + '/accounts/' + nickname + '@' + domain + '/filters.txt'
-    if os.path.isfile(filterFilename):
-        with open(filterFilename, 'r') as filterfile:
-            filterStr = filterfile.read()
-
-    switchStr = ''
-    switchFilename = \
-        baseDir + '/accounts/' + \
-        nickname + '@' + domain + '/replacewords.txt'
-    if os.path.isfile(switchFilename):
-        with open(switchFilename, 'r') as switchfile:
-            switchStr = switchfile.read()
-
-    autoTags = ''
-    autoTagsFilename = \
-        baseDir + '/accounts/' + \
-        nickname + '@' + domain + '/autotags.txt'
-    if os.path.isfile(autoTagsFilename):
-        with open(autoTagsFilename, 'r') as autoTagsFile:
-            autoTags = autoTagsFile.read()
-
-    autoCW = ''
-    autoCWFilename = \
-        baseDir + '/accounts/' + \
-        nickname + '@' + domain + '/autocw.txt'
-    if os.path.isfile(autoCWFilename):
-        with open(autoCWFilename, 'r') as autoCWFile:
-            autoCW = autoCWFile.read()
-
-    blockedStr = ''
-    blockedFilename = \
-        baseDir + '/accounts/' + \
-        nickname + '@' + domain + '/blocking.txt'
-    if os.path.isfile(blockedFilename):
-        with open(blockedFilename, 'r') as blockedfile:
-            blockedStr = blockedfile.read()
-
-    dmAllowedInstancesStr = ''
-    dmAllowedInstancesFilename = \
-        baseDir + '/accounts/' + \
-        nickname + '@' + domain + '/dmAllowedInstances.txt'
-    if os.path.isfile(dmAllowedInstancesFilename):
-        with open(dmAllowedInstancesFilename, 'r') as dmAllowedInstancesFile:
-            dmAllowedInstancesStr = dmAllowedInstancesFile.read()
-
-    allowedInstancesStr = ''
-    allowedInstancesFilename = \
-        baseDir + '/accounts/' + \
-        nickname + '@' + domain + '/allowedinstances.txt'
-    if os.path.isfile(allowedInstancesFilename):
-        with open(allowedInstancesFilename, 'r') as allowedInstancesFile:
-            allowedInstancesStr = allowedInstancesFile.read()
-
     cssFilename = baseDir + '/epicyon-profile.css'
     if os.path.isfile(baseDir + '/epicyon.css'):
         cssFilename = baseDir + '/epicyon.css'
@@ -1858,116 +1975,8 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
     editProfileForm += '    </div></details>\n'
 
     # Filtering and blocking section
-    editProfileForm += '<details><summary class="cw">' + \
-        translate['Filtering and Blocking'] + '</summary>\n'
-    editProfileForm += '    <div class="container">\n'
-
     editProfileForm += \
-        '<label class="labels">' + \
-        translate['City for spoofed GPS image metadata'] + \
-        '</label><br>\n'
-
-    cityFilename = baseDir + '/accounts/' + \
-        nickname + '@' + domain + '/city.txt'
-    if os.path.isfile(cityFilename):
-        with open(cityFilename, 'r') as fp:
-            city = fp.read().replace('\n', '')
-    locationsFilename = baseDir + '/custom_locations.txt'
-    if not os.path.isfile(locationsFilename):
-        locationsFilename = baseDir + '/locations.txt'
-    cities = []
-    with open(locationsFilename, "r") as f:
-        cities = f.readlines()
-        cities.sort()
-    editProfileForm += '  <select id="cityDropdown" ' + \
-        'name="cityDropdown" class="theme">\n'
-    city = city.lower()
-    for cityName in cities:
-        if ':' not in cityName:
-            continue
-        citySelected = ''
-        cityName = cityName.split(':')[0]
-        cityName = cityName.lower()
-        if city in cityName:
-            citySelected = ' selected'
-        editProfileForm += \
-            '    <option value="' + cityName + \
-            '"' + citySelected.title() + '>' + \
-            cityName + '</option>\n'
-    editProfileForm += '  </select><br>\n'
-
-    editProfileForm += \
-        '      <b><label class="labels">' + \
-        translate['Filtered words'] + '</label></b>\n'
-    editProfileForm += '      <br><label class="labels">' + \
-        translate['One per line'] + '</label>\n'
-    editProfileForm += '      <textarea id="message" ' + \
-        'name="filteredWords" style="height:200px" spellcheck="false">' + \
-        filterStr + '</textarea>\n'
-
-    editProfileForm += \
-        '      <br><b><label class="labels">' + \
-        translate['Word Replacements'] + '</label></b>\n'
-    editProfileForm += '      <br><label class="labels">A -> B</label>\n'
-    editProfileForm += \
-        '      <textarea id="message" name="switchWords" ' + \
-        'style="height:200px" spellcheck="false">' + \
-        switchStr + '</textarea>\n'
-
-    editProfileForm += \
-        '      <br><b><label class="labels">' + \
-        translate['Autogenerated Hashtags'] + '</label></b>\n'
-    editProfileForm += '      <br><label class="labels">A -> #B</label>\n'
-    editProfileForm += \
-        '      <textarea id="message" name="autoTags" ' + \
-        'style="height:200px" spellcheck="false">' + \
-        autoTags + '</textarea>\n'
-
-    editProfileForm += \
-        '      <br><b><label class="labels">' + \
-        translate['Autogenerated Content Warnings'] + '</label></b>\n'
-    editProfileForm += '      <br><label class="labels">A -> B</label>\n'
-    editProfileForm += \
-        '      <textarea id="message" name="autoCW" ' + \
-        'style="height:200px" spellcheck="true">' + autoCW + '</textarea>\n'
-
-    editProfileForm += \
-        '      <br><b><label class="labels">' + \
-        translate['Blocked accounts'] + '</label></b>\n'
-    idx = 'Blocked accounts, one per line, in the form ' + \
-        'nickname@domain or *@blockeddomain'
-    editProfileForm += \
-        '      <br><label class="labels">' + translate[idx] + '</label>\n'
-    editProfileForm += \
-        '      <textarea id="message" name="blocked" style="height:200px" ' + \
-        'spellcheck="false">' + blockedStr + '</textarea>\n'
-
-    editProfileForm += \
-        '      <br><b><label class="labels">' + \
-        translate['Direct Message permitted instances'] + '</label></b>\n'
-    idx = 'Direct messages are always allowed from these instances.'
-    editProfileForm += \
-        '      <br><label class="labels">' + \
-        translate[idx] + '</label>\n'
-    editProfileForm += \
-        '      <textarea id="message" name="dmAllowedInstances" ' + \
-        'style="height:200px" spellcheck="false">' + \
-        dmAllowedInstancesStr + '</textarea>\n'
-
-    editProfileForm += \
-        '      <br><b><label class="labels">' + \
-        translate['Federation list'] + '</label></b>\n'
-    idx = 'Federate only with a defined set of instances. ' + \
-        'One domain name per line.'
-    editProfileForm += \
-        '      <br><label class="labels">' + \
-        translate[idx] + '</label>\n'
-    editProfileForm += \
-        '      <textarea id="message" name="allowedInstances" ' + \
-        'style="height:200px" spellcheck="false">' + \
-        allowedInstancesStr + '</textarea>\n'
-
-    editProfileForm += '    </div></details>\n'
+        _htmlEditProfileFiltering(baseDir, nickname, domain, translate)
 
     # git projects section
     editProfileForm += \

From 4be19bba4a5aff0dcc2bb97c38dc327a20b43c0c Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 27 Jun 2021 20:54:36 +0100
Subject: [PATCH 15/20] Function for changing password on edit profile screen

---
 webapp_profile.py | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/webapp_profile.py b/webapp_profile.py
index 2f1a5fe5d..848c131db 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -1585,6 +1585,26 @@ def _htmlEditProfileFiltering(baseDir: str, nickname: str, domain: str,
     return editProfileForm
 
 
+def _htmlEditProfileChangePassword(translate: {}) -> str:
+    """Change password section of edit profile screen
+    """
+    editProfileForm = '    <details><summary class="cw">' + \
+        translate['Change Password'] + '</summary>\n'
+    editProfileForm += '    <div class="container">\n'
+    editProfileForm += \
+        '<label class="labels">' + translate['Change Password'] + \
+        '</label><br>\n'
+    editProfileForm += '      <input type="text" name="password" ' + \
+        'value=""><br>\n'
+    editProfileForm += \
+        '<label class="labels">' + translate['Confirm Password'] + \
+        '</label><br>\n'
+    editProfileForm += \
+        '      <input type="text" name="passwordconfirm" value="">\n'
+    editProfileForm += '    </div></details>\n'
+    return editProfileForm
+
+
 def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
                     domain: str, port: int, httpPrefix: str,
                     defaultTimeline: str, theme: str,
@@ -1959,20 +1979,8 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
     editProfileForm += '    </div></details>\n'
 
     # Change password
-    editProfileForm += '    <details><summary class="cw">' + \
-        translate['Change Password'] + '</summary>\n'
-    editProfileForm += '    <div class="container">\n'
     editProfileForm += \
-        '<label class="labels">' + translate['Change Password'] + \
-        '</label><br>\n'
-    editProfileForm += '      <input type="text" name="password" ' + \
-        'value=""><br>\n'
-    editProfileForm += \
-        '<label class="labels">' + translate['Confirm Password'] + \
-        '</label><br>\n'
-    editProfileForm += \
-        '      <input type="text" name="passwordconfirm" value="">\n'
-    editProfileForm += '    </div></details>\n'
+        _htmlEditProfileChangePassword(translate)
 
     # Filtering and blocking section
     editProfileForm += \

From 59f0eea000608525a3c2d2c01440f4a2631bec35 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 27 Jun 2021 21:01:43 +0100
Subject: [PATCH 16/20] Function for background images on edit profile screen

---
 webapp_profile.py | 89 +++++++++++++++++++++++++----------------------
 1 file changed, 48 insertions(+), 41 deletions(-)

diff --git a/webapp_profile.py b/webapp_profile.py
index 848c131db..b548e9524 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -1605,6 +1605,52 @@ def _htmlEditProfileChangePassword(translate: {}) -> str:
     return editProfileForm
 
 
+def _htmlEditProfileBackground(newsInstance: bool, translate: {}) -> str:
+    """Background images section of edit profile screen
+    """
+    editProfileForm = '    <details><summary class="cw">' + \
+        translate['Background Images'] + '</summary>\n'
+    editProfileForm += '    <div class="container">\n'
+    idx = 'The files attached below should be no larger than ' + \
+        '10MB in total uploaded at once.'
+    editProfileForm += \
+        '      <label class="labels">' + translate[idx] + '</label><br><br>\n'
+
+    if not newsInstance:
+        imageFormats = getImageFormats()
+        editProfileForm += \
+            '      <label class="labels">' + \
+            translate['Background image'] + '</label>\n'
+        editProfileForm += '      <input type="file" id="image" name="image"'
+        editProfileForm += '            accept="' + imageFormats + '">\n'
+
+        editProfileForm += '      <br><label class="labels">' + \
+            translate['Timeline banner image'] + '</label>\n'
+        editProfileForm += '      <input type="file" id="banner" name="banner"'
+        editProfileForm += '            accept="' + imageFormats + '">\n'
+
+        editProfileForm += '      <br><label class="labels">' + \
+            translate['Search banner image'] + '</label>\n'
+        editProfileForm += '      <input type="file" id="search_banner" '
+        editProfileForm += 'name="search_banner"'
+        editProfileForm += '            accept="' + imageFormats + '">\n'
+
+        editProfileForm += '      <br><label class="labels">' + \
+            translate['Left column image'] + '</label>\n'
+        editProfileForm += '      <input type="file" id="left_col_image" '
+        editProfileForm += 'name="left_col_image"'
+        editProfileForm += '            accept="' + imageFormats + '">\n'
+
+        editProfileForm += '      <br><label class="labels">' + \
+            translate['Right column image'] + '</label>\n'
+        editProfileForm += '      <input type="file" id="right_col_image" '
+        editProfileForm += 'name="right_col_image"'
+        editProfileForm += '            accept="' + imageFormats + '">\n'
+
+    editProfileForm += '    </div></details>\n'
+    return editProfileForm
+
+
 def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
                     domain: str, port: int, httpPrefix: str,
                     defaultTimeline: str, theme: str,
@@ -1938,49 +1984,10 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
     editProfileForm += '    </div></details>\n'
 
     # Customize images and banners
-    editProfileForm += '    <details><summary class="cw">' + \
-        translate['Background Images'] + '</summary>\n'
-    editProfileForm += '    <div class="container">\n'
-    idx = 'The files attached below should be no larger than ' + \
-        '10MB in total uploaded at once.'
-    editProfileForm += \
-        '      <label class="labels">' + translate[idx] + '</label><br><br>\n'
-
-    if not newsInstance:
-        editProfileForm += \
-            '      <label class="labels">' + \
-            translate['Background image'] + '</label>\n'
-        editProfileForm += '      <input type="file" id="image" name="image"'
-        editProfileForm += '            accept="' + imageFormats + '">\n'
-
-        editProfileForm += '      <br><label class="labels">' + \
-            translate['Timeline banner image'] + '</label>\n'
-        editProfileForm += '      <input type="file" id="banner" name="banner"'
-        editProfileForm += '            accept="' + imageFormats + '">\n'
-
-        editProfileForm += '      <br><label class="labels">' + \
-            translate['Search banner image'] + '</label>\n'
-        editProfileForm += '      <input type="file" id="search_banner" '
-        editProfileForm += 'name="search_banner"'
-        editProfileForm += '            accept="' + imageFormats + '">\n'
-
-        editProfileForm += '      <br><label class="labels">' + \
-            translate['Left column image'] + '</label>\n'
-        editProfileForm += '      <input type="file" id="left_col_image" '
-        editProfileForm += 'name="left_col_image"'
-        editProfileForm += '            accept="' + imageFormats + '">\n'
-
-        editProfileForm += '      <br><label class="labels">' + \
-            translate['Right column image'] + '</label>\n'
-        editProfileForm += '      <input type="file" id="right_col_image" '
-        editProfileForm += 'name="right_col_image"'
-        editProfileForm += '            accept="' + imageFormats + '">\n'
-
-    editProfileForm += '    </div></details>\n'
+    editProfileForm += _htmlEditProfileBackground(newsInstance, translate)
 
     # Change password
-    editProfileForm += \
-        _htmlEditProfileChangePassword(translate)
+    editProfileForm += _htmlEditProfileChangePassword(translate)
 
     # Filtering and blocking section
     editProfileForm += \

From d2381eb389a65b8bf45f79228e22481f840ef8e1 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 27 Jun 2021 21:11:41 +0100
Subject: [PATCH 17/20] Function for contact info on edit profile screen

---
 webapp_profile.py | 147 +++++++++++++++++++++++++++-------------------
 1 file changed, 88 insertions(+), 59 deletions(-)

diff --git a/webapp_profile.py b/webapp_profile.py
index b548e9524..27fb2e562 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -1651,6 +1651,88 @@ def _htmlEditProfileBackground(newsInstance: bool, translate: {}) -> str:
     return editProfileForm
 
 
+def _htmlEditProfileContactInfo(nickname: str,
+                                emailAddress: str,
+                                xmppAddress: str,
+                                matrixAddress: str,
+                                ssbAddress: str,
+                                toxAddress: str,
+                                briarAddress: str,
+                                jamiAddress: str,
+                                cwtchAddress: str,
+                                PGPfingerprint: str,
+                                PGPpubKey: str,
+                                translate: {}) -> str:
+    """Contact Information section of edit profile screen
+    """
+    editProfileForm = '    <details><summary class="cw">' + \
+        translate['Contact Details'] + '</summary>\n'
+    editProfileForm += '<div class="container">'
+    editProfileForm += '<label class="labels">' + \
+        translate['Email'] + '</label><br>\n'
+    editProfileForm += \
+        '      <input type="text" name="email" value="' + emailAddress + '">\n'
+    editProfileForm += \
+        '<label class="labels">' + translate['XMPP'] + '</label><br>\n'
+    editProfileForm += \
+        '      <input type="text" name="xmppAddress" value="' + \
+        xmppAddress + '">\n'
+    editProfileForm += '<label class="labels">' + \
+        translate['Matrix'] + '</label><br>\n'
+    editProfileForm += \
+        '      <input type="text" name="matrixAddress" value="' + \
+        matrixAddress + '">\n'
+
+    editProfileForm += '<label class="labels">SSB</label><br>\n'
+    editProfileForm += \
+        '      <input type="text" name="ssbAddress" value="' + \
+        ssbAddress + '">\n'
+
+    editProfileForm += '<label class="labels">Tox</label><br>\n'
+    editProfileForm += \
+        '      <input type="text" name="toxAddress" value="' + \
+        toxAddress + '">\n'
+
+    editProfileForm += '<label class="labels">Briar</label><br>\n'
+    editProfileForm += \
+        '      <input type="text" name="briarAddress" value="' + \
+        briarAddress + '">\n'
+
+    editProfileForm += '<label class="labels">Jami</label><br>\n'
+    editProfileForm += \
+        '      <input type="text" name="jamiAddress" value="' + \
+        jamiAddress + '">\n'
+
+    editProfileForm += '<label class="labels">Cwtch</label><br>\n'
+    editProfileForm += \
+        '      <input type="text" name="cwtchAddress" value="' + \
+        cwtchAddress + '">\n'
+
+    editProfileForm += \
+        '<label class="labels">' + \
+        translate['PGP Fingerprint'] + '</label><br>\n'
+    editProfileForm += \
+        '      <input type="text" name="openpgp" value="' + \
+        PGPfingerprint + '">\n'
+    editProfileForm += \
+        '<label class="labels">' + translate['PGP'] + '</label><br>\n'
+    editProfileForm += \
+        '      <textarea id="message" placeholder=' + \
+        '"-----BEGIN PGP PUBLIC KEY BLOCK-----" name="pgp" ' + \
+        'style="height:600px" spellcheck="false">' + \
+        PGPpubKey + '</textarea>\n'
+    editProfileForm += '<a href="/users/' + nickname + \
+        '/followingaccounts"><label class="labels">' + \
+        translate['Following'] + '</label></a><br>\n'
+    editProfileForm += '    </div></details>\n'
+    return editProfileForm
+
+
+def _htmlEditProfileOptions(translate: {}) -> str:
+    """option checkboxes section of edit profile screen
+    """
+
+
 def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
                     domain: str, port: int, httpPrefix: str,
                     defaultTimeline: str, theme: str,
@@ -1922,66 +2004,13 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
     editProfileForm += '    </div>\n'
 
     # Contact information
-    editProfileForm += '    <details><summary class="cw">' + \
-        translate['Contact Details'] + '</summary>\n'
-    editProfileForm += '<div class="container">'
-    editProfileForm += '<label class="labels">' + \
-        translate['Email'] + '</label><br>\n'
     editProfileForm += \
-        '      <input type="text" name="email" value="' + emailAddress + '">\n'
-    editProfileForm += \
-        '<label class="labels">' + translate['XMPP'] + '</label><br>\n'
-    editProfileForm += \
-        '      <input type="text" name="xmppAddress" value="' + \
-        xmppAddress + '">\n'
-    editProfileForm += '<label class="labels">' + \
-        translate['Matrix'] + '</label><br>\n'
-    editProfileForm += \
-        '      <input type="text" name="matrixAddress" value="' + \
-        matrixAddress + '">\n'
-
-    editProfileForm += '<label class="labels">SSB</label><br>\n'
-    editProfileForm += \
-        '      <input type="text" name="ssbAddress" value="' + \
-        ssbAddress + '">\n'
-
-    editProfileForm += '<label class="labels">Tox</label><br>\n'
-    editProfileForm += \
-        '      <input type="text" name="toxAddress" value="' + \
-        toxAddress + '">\n'
-
-    editProfileForm += '<label class="labels">Briar</label><br>\n'
-    editProfileForm += \
-        '      <input type="text" name="briarAddress" value="' + \
-        briarAddress + '">\n'
-
-    editProfileForm += '<label class="labels">Jami</label><br>\n'
-    editProfileForm += \
-        '      <input type="text" name="jamiAddress" value="' + \
-        jamiAddress + '">\n'
-
-    editProfileForm += '<label class="labels">Cwtch</label><br>\n'
-    editProfileForm += \
-        '      <input type="text" name="cwtchAddress" value="' + \
-        cwtchAddress + '">\n'
-
-    editProfileForm += \
-        '<label class="labels">' + \
-        translate['PGP Fingerprint'] + '</label><br>\n'
-    editProfileForm += \
-        '      <input type="text" name="openpgp" value="' + \
-        PGPfingerprint + '">\n'
-    editProfileForm += \
-        '<label class="labels">' + translate['PGP'] + '</label><br>\n'
-    editProfileForm += \
-        '      <textarea id="message" placeholder=' + \
-        '"-----BEGIN PGP PUBLIC KEY BLOCK-----" name="pgp" ' + \
-        'style="height:600px" spellcheck="false">' + \
-        PGPpubKey + '</textarea>\n'
-    editProfileForm += '<a href="/users/' + nickname + \
-        '/followingaccounts"><label class="labels">' + \
-        translate['Following'] + '</label></a><br>\n'
-    editProfileForm += '    </div></details>\n'
+        _htmlEditProfileContactInfo(nickname, emailAddress,
+                                    xmppAddress, matrixAddress,
+                                    ssbAddress, toxAddress,
+                                    briarAddress, jamiAddress,
+                                    cwtchAddress, PGPfingerprint,
+                                    PGPpubKey, translate)
 
     # Customize images and banners
     editProfileForm += _htmlEditProfileBackground(newsInstance, translate)

From a96094235fae4faf8b96b113f9003a278a9474f6 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 27 Jun 2021 21:18:15 +0100
Subject: [PATCH 18/20] Function for checkboxes on edit profile screen

---
 webapp_profile.py | 69 ++++++++++++++++++++++++++---------------------
 1 file changed, 39 insertions(+), 30 deletions(-)

diff --git a/webapp_profile.py b/webapp_profile.py
index 27fb2e562..785ab5a16 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -1728,9 +1728,44 @@ def _htmlEditProfileContactInfo(nickname: str,
     return editProfileForm
 
 
-def _htmlEditProfileOptions(translate: {}) -> str:
+def _htmlEditProfileOptions(manuallyApprovesFollowers: str,
+                            isBot: str, isGroup: str,
+                            followDMs: str, removeTwitter: str,
+                            notifyLikes: str, hideLikeButton: str,
+                            translate: {}) -> str:
     """option checkboxes section of edit profile screen
     """
+    editProfileForm = '    <div class="container">\n'
+    editProfileForm += \
+        '      <input type="checkbox" class="profilecheckbox" ' + \
+        'name="approveFollowers" ' + manuallyApprovesFollowers + \
+        '> ' + translate['Approve follower requests'] + '<br>\n'
+    editProfileForm += \
+        '      <input type="checkbox" ' + \
+        'class="profilecheckbox" name="isBot" ' + \
+        isBot + '> ' + translate['This is a bot account'] + '<br>\n'
+    editProfileForm += \
+        '      <input type="checkbox" ' + \
+        'class="profilecheckbox" name="isGroup" ' + isGroup + '> ' + \
+        translate['This is a group account'] + '<br>\n'
+    editProfileForm += \
+        '      <input type="checkbox" class="profilecheckbox" ' + \
+        'name="followDMs" ' + followDMs + '> ' + \
+        translate['Only people I follow can send me DMs'] + '<br>\n'
+    editProfileForm += \
+        '      <input type="checkbox" class="profilecheckbox" ' + \
+        'name="removeTwitter" ' + removeTwitter + '> ' + \
+        translate['Remove Twitter posts'] + '<br>\n'
+    editProfileForm += \
+        '      <input type="checkbox" class="profilecheckbox" ' + \
+        'name="notifyLikes" ' + notifyLikes + '> ' + \
+        translate['Notify when posts are liked'] + '<br>\n'
+    editProfileForm += \
+        '      <input type="checkbox" class="profilecheckbox" ' + \
+        'name="hideLikeButton" ' + hideLikeButton + '> ' + \
+        translate["Don't show the Like button"] + '<br>\n'
+    editProfileForm += '    </div>\n'
+    return editProfileForm
 
 
 def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
@@ -1972,36 +2007,10 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
     editProfileForm += '    </div>\n'
 
     # Option checkboxes
-    editProfileForm += '    <div class="container">\n'
     editProfileForm += \
-        '      <input type="checkbox" class="profilecheckbox" ' + \
-        'name="approveFollowers" ' + manuallyApprovesFollowers + \
-        '> ' + translate['Approve follower requests'] + '<br>\n'
-    editProfileForm += \
-        '      <input type="checkbox" ' + \
-        'class="profilecheckbox" name="isBot" ' + \
-        isBot + '> ' + translate['This is a bot account'] + '<br>\n'
-    editProfileForm += \
-        '      <input type="checkbox" ' + \
-        'class="profilecheckbox" name="isGroup" ' + isGroup + '> ' + \
-        translate['This is a group account'] + '<br>\n'
-    editProfileForm += \
-        '      <input type="checkbox" class="profilecheckbox" ' + \
-        'name="followDMs" ' + followDMs + '> ' + \
-        translate['Only people I follow can send me DMs'] + '<br>\n'
-    editProfileForm += \
-        '      <input type="checkbox" class="profilecheckbox" ' + \
-        'name="removeTwitter" ' + removeTwitter + '> ' + \
-        translate['Remove Twitter posts'] + '<br>\n'
-    editProfileForm += \
-        '      <input type="checkbox" class="profilecheckbox" ' + \
-        'name="notifyLikes" ' + notifyLikes + '> ' + \
-        translate['Notify when posts are liked'] + '<br>\n'
-    editProfileForm += \
-        '      <input type="checkbox" class="profilecheckbox" ' + \
-        'name="hideLikeButton" ' + hideLikeButton + '> ' + \
-        translate["Don't show the Like button"] + '<br>\n'
-    editProfileForm += '    </div>\n'
+        _htmlEditProfileOptions(manuallyApprovesFollowers,
+                                isBot, isGroup, followDMs, removeTwitter,
+                                notifyLikes, hideLikeButton, translate)
 
     # Contact information
     editProfileForm += \

From 7d639023ac07560d6a1bbed95d4f69f1c0412dd7 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 27 Jun 2021 21:30:39 +0100
Subject: [PATCH 19/20] Function for main info on edit profile screen

---
 webapp_profile.py | 132 +++++++++++++++++++++++++---------------------
 1 file changed, 73 insertions(+), 59 deletions(-)

diff --git a/webapp_profile.py b/webapp_profile.py
index 785ab5a16..0c68e9d33 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -1768,6 +1768,76 @@ def _htmlEditProfileOptions(manuallyApprovesFollowers: str,
     return editProfileForm
 
 
+def _htmlEditProfileMain(displayNickname: str, bioStr: str,
+                         movedTo: str, donateUrl: str,
+                         blogAddress: str, actorJson: {},
+                         translate: {}) -> str:
+    """main info on edit profile screen
+    """
+    imageFormats = getImageFormats()
+
+    editProfileForm = '    <div class="container">\n'
+    editProfileForm += '      <label class="labels">' + \
+        translate['Nickname'] + '</label>\n'
+    editProfileForm += \
+        '      <input type="text" name="displayNickname" value="' + \
+        displayNickname + '"><br>\n'
+    editProfileForm += \
+        '      <label class="labels">' + translate['Your bio'] + '</label>\n'
+    editProfileForm += \
+        '      <textarea id="message" name="bio" style="height:200px" ' + \
+        'spellcheck="true">' + bioStr + '</textarea>\n'
+    editProfileForm += \
+        '      <label class="labels">' + translate['Avatar image'] + \
+        '</label>\n'
+    editProfileForm += \
+        '      <input type="file" id="avatar" name="avatar"'
+    editProfileForm += '            accept="' + imageFormats + '">\n'
+
+    occupationName = ''
+    if actorJson.get('hasOccupation'):
+        occupationName = getOccupationName(actorJson)
+
+    editProfileForm += '<label class="labels">' + \
+        translate['Occupation'] + ':</label><br>\n'
+    editProfileForm += \
+        '      <input type="text" ' + \
+        'name="occupationName" value="' + occupationName + '">\n'
+
+    alsoKnownAsStr = ''
+    if actorJson.get('alsoKnownAs'):
+        alsoKnownAs = actorJson['alsoKnownAs']
+        ctr = 0
+        for altActor in alsoKnownAs:
+            if ctr > 0:
+                alsoKnownAsStr += ', '
+            ctr += 1
+            alsoKnownAsStr += altActor
+
+    editProfileForm += '<label class="labels">' + \
+        translate['Other accounts'] + ':</label><br>\n'
+    editProfileForm += \
+        '      <input type="text" placeholder="https://..." ' + \
+        'name="alsoKnownAs" value="' + alsoKnownAsStr + '">\n'
+
+    editProfileForm += '<label class="labels">' + \
+        translate['Moved to new account address'] + ':</label><br>\n'
+    editProfileForm += \
+        '      <input type="text" placeholder="https://..." ' + \
+        'name="movedTo" value="' + movedTo + '">\n'
+    editProfileForm += '<label class="labels">' + \
+        translate['Donations link'] + '</label><br>\n'
+    editProfileForm += \
+        '      <input type="text" placeholder="https://..." ' + \
+        'name="donateUrl" value="' + donateUrl + '">\n'
+    editProfileForm += '<label class="labels">Blog</label><br>\n'
+    editProfileForm += \
+        '      <input type="text" name="blogAddress" value="' + \
+        blogAddress + '">\n'
+    editProfileForm += '    </div>\n'
+    return editProfileForm
+
+
 def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
                     domain: str, port: int, httpPrefix: str,
                     defaultTimeline: str, theme: str,
@@ -1776,7 +1846,6 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
                     accessKeys: {}) -> str:
     """Shows the edit profile screen
     """
-    imageFormats = getImageFormats()
     path = path.replace('/inbox', '').replace('/outbox', '')
     path = path.replace('/shares', '')
     nickname = getNicknameFromActor(path)
@@ -1946,65 +2015,10 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
             translate['Remove scheduled posts'] + '<br>\n'
         editProfileForm += '    </div>\n'
 
-    editProfileForm += '    <div class="container">\n'
-    editProfileForm += '      <label class="labels">' + \
-        translate['Nickname'] + '</label>\n'
+    # main info
     editProfileForm += \
-        '      <input type="text" name="displayNickname" value="' + \
-        displayNickname + '"><br>\n'
-    editProfileForm += \
-        '      <label class="labels">' + translate['Your bio'] + '</label>\n'
-    editProfileForm += \
-        '      <textarea id="message" name="bio" style="height:200px" ' + \
-        'spellcheck="true">' + bioStr + '</textarea>\n'
-    editProfileForm += \
-        '      <label class="labels">' + translate['Avatar image'] + \
-        '</label>\n'
-    editProfileForm += \
-        '      <input type="file" id="avatar" name="avatar"'
-    editProfileForm += '            accept="' + imageFormats + '">\n'
-
-    occupationName = ''
-    if actorJson.get('hasOccupation'):
-        occupationName = getOccupationName(actorJson)
-
-    editProfileForm += '<label class="labels">' + \
-        translate['Occupation'] + ':</label><br>\n'
-    editProfileForm += \
-        '      <input type="text" ' + \
-        'name="occupationName" value="' + occupationName + '">\n'
-
-    alsoKnownAsStr = ''
-    if actorJson.get('alsoKnownAs'):
-        alsoKnownAs = actorJson['alsoKnownAs']
-        ctr = 0
-        for altActor in alsoKnownAs:
-            if ctr > 0:
-                alsoKnownAsStr += ', '
-            ctr += 1
-            alsoKnownAsStr += altActor
-
-    editProfileForm += '<label class="labels">' + \
-        translate['Other accounts'] + ':</label><br>\n'
-    editProfileForm += \
-        '      <input type="text" placeholder="https://..." ' + \
-        'name="alsoKnownAs" value="' + alsoKnownAsStr + '">\n'
-
-    editProfileForm += '<label class="labels">' + \
-        translate['Moved to new account address'] + ':</label><br>\n'
-    editProfileForm += \
-        '      <input type="text" placeholder="https://..." ' + \
-        'name="movedTo" value="' + movedTo + '">\n'
-    editProfileForm += '<label class="labels">' + \
-        translate['Donations link'] + '</label><br>\n'
-    editProfileForm += \
-        '      <input type="text" placeholder="https://..." ' + \
-        'name="donateUrl" value="' + donateUrl + '">\n'
-    editProfileForm += '<label class="labels">Blog</label><br>\n'
-    editProfileForm += \
-        '      <input type="text" name="blogAddress" value="' + \
-        blogAddress + '">\n'
-    editProfileForm += '    </div>\n'
+        _htmlEditProfileMain(displayNickname, bioStr, movedTo, donateUrl,
+                             blogAddress, actorJson, translate)
 
     # Option checkboxes
     editProfileForm += \

From 4ad0e7b6b2779958481e5b4d22180884a282f489 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 27 Jun 2021 21:38:41 +0100
Subject: [PATCH 20/20] Function for top banner on edit profile screen

---
 webapp_profile.py | 67 ++++++++++++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 27 deletions(-)

diff --git a/webapp_profile.py b/webapp_profile.py
index 0c68e9d33..3ffcfdca9 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -1838,6 +1838,43 @@ def _htmlEditProfileMain(displayNickname: str, bioStr: str,
     return editProfileForm
 
 
+def _htmlEditProfileTopBanner(baseDir: str,
+                              nickname: str, domain: str, domainFull: str,
+                              defaultTimeline: str, bannerFile: str,
+                              path: str, accessKeys: {}, translate: {}) -> str:
+    """top banner on edit profile screen
+    """
+    editProfileForm = \
+        '<a href="/users/' + nickname + '/' + defaultTimeline + '">'
+    editProfileForm += '<img loading="lazy" class="timeline-banner" src="' + \
+        '/users/' + nickname + '/' + bannerFile + '" alt="" /></a>\n'
+
+    editProfileForm += \
+        '<form enctype="multipart/form-data" method="POST" ' + \
+        'accept-charset="UTF-8" action="' + path + '/profiledata">\n'
+    editProfileForm += '  <div class="vertical-center">\n'
+    editProfileForm += \
+        '    <h1>' + translate['Profile for'] + \
+        ' ' + nickname + '@' + domainFull + '</h1>'
+    editProfileForm += '    <div class="container">\n'
+    editProfileForm += \
+        '      <center>\n' + \
+        '        <input type="submit" name="submitProfile" ' + \
+        'accesskey="' + accessKeys['submitButton'] + '" ' + \
+        'value="' + translate['Submit'] + '">\n' + \
+        '      </center>\n'
+    editProfileForm += '    </div>\n'
+
+    if scheduledPostsExist(baseDir, nickname, domain):
+        editProfileForm += '    <div class="container">\n'
+        editProfileForm += \
+            '      <input type="checkbox" class="profilecheckbox" ' + \
+            'name="removeScheduledPosts"> ' + \
+            translate['Remove scheduled posts'] + '<br>\n'
+        editProfileForm += '    </div>\n'
+    return editProfileForm
+
+
 def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
                     domain: str, port: int, httpPrefix: str,
                     defaultTimeline: str, theme: str,
@@ -1987,33 +2024,9 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
 
     # top banner
     editProfileForm += \
-        '<a href="/users/' + nickname + '/' + defaultTimeline + '">'
-    editProfileForm += '<img loading="lazy" class="timeline-banner" src="' + \
-        '/users/' + nickname + '/' + bannerFile + '" alt="" /></a>\n'
-
-    editProfileForm += \
-        '<form enctype="multipart/form-data" method="POST" ' + \
-        'accept-charset="UTF-8" action="' + path + '/profiledata">\n'
-    editProfileForm += '  <div class="vertical-center">\n'
-    editProfileForm += \
-        '    <h1>' + translate['Profile for'] + \
-        ' ' + nickname + '@' + domainFull + '</h1>'
-    editProfileForm += '    <div class="container">\n'
-    editProfileForm += \
-        '      <center>\n' + \
-        '        <input type="submit" name="submitProfile" ' + \
-        'accesskey="' + accessKeys['submitButton'] + '" ' + \
-        'value="' + translate['Submit'] + '">\n' + \
-        '      </center>\n'
-    editProfileForm += '    </div>\n'
-
-    if scheduledPostsExist(baseDir, nickname, domain):
-        editProfileForm += '    <div class="container">\n'
-        editProfileForm += \
-            '      <input type="checkbox" class="profilecheckbox" ' + \
-            'name="removeScheduledPosts"> ' + \
-            translate['Remove scheduled posts'] + '<br>\n'
-        editProfileForm += '    </div>\n'
+        _htmlEditProfileTopBanner(baseDir, nickname, domain, domainFull,
+                                  defaultTimeline, bannerFile,
+                                  path, accessKeys, translate)
 
     # main info
     editProfileForm += \