From afd5f92b997799b87c4b823203a16e00c2092dd7 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 28 Feb 2021 10:22:13 +0000
Subject: [PATCH 01/18] Hacker theme banner

---
 theme/hacker/banner.txt | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/theme/hacker/banner.txt b/theme/hacker/banner.txt
index db5cf9014..e26d52719 100644
--- a/theme/hacker/banner.txt
+++ b/theme/hacker/banner.txt
@@ -1,10 +1,6 @@
-   88888888888               88
-   88                        ""
-   88
-   88aaaaa      8b,dPPYba,   88   ,adPPYba,  8b       d8   ,adPPYba,   8b,dPPYba,
-   88"""""      88P'    "8a  88  a8"     ""  `8b     d8'  a8"     "8a  88P'   `"8a
-   88           88       d8  88  8b           `8b   d8'   8b       d8  88       88
-   88           88b,   ,a8"  88  "8a,   ,aa    `8b,d8'    "8a,   ,a8"  88       88
-   88888888888  88`YbbdP"'   88   `"Ybbd8"'      Y88'      `"YbbdP"'   88       88
-                88                               d8'
-                88                              d8'
+    _____     __   _     __                       _     _           E P I C Y O N
+   |_   _|   /_/  | |   /_/   _ __ ___     __ _  | |_  (_)   __ _   _   _    ___
+     | |    / _ \ | |  / _ \ | '_ ` _ \   / _` | | __| | |  / _` | | | | |  / _ \
+     | |   |  __/ | | |  __/ | | | | | | | (_| | | |_  | | | (_| | | |_| | |  __/
+     |_|    \___| |_|  \___| |_| |_| |_|  \__,_|  \__| |_|  \__, |  \__,_|  \___|
+                                                               |_|

From d4e3fefda1d125b78726c919bdd04580d856c664 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 28 Feb 2021 12:00:47 +0000
Subject: [PATCH 02/18] Debug

---
 daemon.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/daemon.py b/daemon.py
index 0cfd5a2ca..81f5df727 100644
--- a/daemon.py
+++ b/daemon.py
@@ -13792,6 +13792,7 @@ class PubServer(BaseHTTPRequestHandler):
                      "editblogpost", "newreminder", "newevent")
         for currPostType in postTypes:
             if not authorized:
+                print('POST was not authorized')
                 break
 
             postRedirect = self.server.defaultTimeline

From 87ca915e722a81f019f4d0cdf1a62b679df648e8 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 28 Feb 2021 12:04:52 +0000
Subject: [PATCH 03/18] Debug

---
 daemon.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/daemon.py b/daemon.py
index 81f5df727..fd7aef23d 100644
--- a/daemon.py
+++ b/daemon.py
@@ -13806,6 +13806,7 @@ class PubServer(BaseHTTPRequestHandler):
                                      callingDomain, cookie,
                                      authorized)
             if pageNumber:
+                print(currPostType + ' post received')
                 nickname = self.path.split('/users/')[1]
                 if '?' in nickname:
                     nickname = nickname.split('?')[0]

From 2752bddde15da223d4594cd2d3cb39f22324a886 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 28 Feb 2021 12:25:32 +0000
Subject: [PATCH 04/18] Replace semicolons on outgoing posts

---
 outbox.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/outbox.py b/outbox.py
index 11d595c6e..b95a2cd89 100644
--- a/outbox.py
+++ b/outbox.py
@@ -77,6 +77,13 @@ def postMessageToOutbox(messageJson: {}, postToNickname: str,
     if messageJson.get('object'):
         if isinstance(messageJson['object'], dict):
             if messageJson['object'].get('content'):
+                # replace all semicolons, because for mysterious
+                # reasons this appears to create a problem for
+                # webservers receiving the POST
+                if ';' in messageJson['object']['content']:
+                    messageJson['object']['content'] = \
+                        messageJson['object']['content'].replace(';', ',')
+
                 if dangerousMarkup(messageJson['object']['content'],
                                    allowLocalNetworkAccess):
                     print('POST to outbox contains dangerous markup: ' +

From a7095442f453629d68d5848131a35285664089a5 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 28 Feb 2021 12:34:39 +0000
Subject: [PATCH 05/18] Escape code

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

diff --git a/outbox.py b/outbox.py
index b95a2cd89..f45daa74a 100644
--- a/outbox.py
+++ b/outbox.py
@@ -77,12 +77,10 @@ def postMessageToOutbox(messageJson: {}, postToNickname: str,
     if messageJson.get('object'):
         if isinstance(messageJson['object'], dict):
             if messageJson['object'].get('content'):
-                # replace all semicolons, because for mysterious
-                # reasons this appears to create a problem for
-                # webservers receiving the POST
+                # semicolons are disliked, so escape them
                 if ';' in messageJson['object']['content']:
                     messageJson['object']['content'] = \
-                        messageJson['object']['content'].replace(';', ',')
+                        messageJson['object']['content'].replace(';', '%3B')
 
                 if dangerousMarkup(messageJson['object']['content'],
                                    allowLocalNetworkAccess):

From 04b061e5c5c7edae258090bf2dce7dfe16ac7fd8 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 28 Feb 2021 13:44:16 +0000
Subject: [PATCH 06/18] Spell check message text area

---
 webapp_create_post.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webapp_create_post.py b/webapp_create_post.py
index 0a682af4d..d43d64ca0 100644
--- a/webapp_create_post.py
+++ b/webapp_create_post.py
@@ -753,7 +753,8 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {},
 
     newPostForm += \
         '    <textarea id="message" name="message" style="height:' + \
-        str(messageBoxHeight) + 'px"' + selectedStr + '></textarea>\n'
+        str(messageBoxHeight) + 'px"' + selectedStr + ' spellcheck="true">' + \
+        '</textarea>\n'
     newPostForm += extraFields + citationsStr + dateAndLocation
     if not mediaInstance or replyStr:
         newPostForm += newPostImageSection

From 0354674c108e032bb819973b9b488d05235320c4 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 28 Feb 2021 13:52:45 +0000
Subject: [PATCH 07/18] Spell checking on text areas

---
 webapp_profile.py | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/webapp_profile.py b/webapp_profile.py
index dc01f0c98..4a1dff572 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -1260,12 +1260,12 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
             if instanceDescription:
                 instanceStr += \
                     '  <textarea id="message" name="instanceDescription" ' + \
-                    'style="height:200px">' + \
+                    'style="height:200px" spellcheck="true">' + \
                     instanceDescription + '</textarea>'
             else:
                 instanceStr += \
                     '  <textarea id="message" name="instanceDescription" ' + \
-                    'style="height:200px"></textarea>'
+                    'style="height:200px" spellcheck="true"></textarea>'
             instanceStr += \
                 '  <label class="labels">' + \
                 translate['Instance Logo'] + '</label>'
@@ -1306,7 +1306,8 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
             moderatorsStr += \
                 '  <textarea id="message" name="moderators" placeholder="' + \
                 translate['List of moderator nicknames'] + \
-                '..." style="height:200px">' + moderators + '</textarea>'
+                '..." style="height:200px" spellcheck="false">' + \
+                moderators + '</textarea>'
             moderatorsStr += '</div>'
 
             editors = ''
@@ -1320,7 +1321,8 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
                 translate['A list of editor nicknames. One per line.']
             editorsStr += \
                 '  <textarea id="message" name="editors" placeholder="" ' + \
-                'style="height:200px">' + editors + '</textarea>'
+                'style="height:200px" spellcheck="false">' + \
+                editors + '</textarea>'
             editorsStr += '</div>'
 
             themes = getThemesList(baseDir)
@@ -1369,8 +1371,8 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
                 peertubeInstancesStr += url + '\n'
             peertubeStr += \
                 '      <textarea id="message" name="ptInstances" ' + \
-                'style="height:200px">' + peertubeInstancesStr + \
-                '</textarea>\n'
+                'style="height:200px" spellcheck="false">' + \
+                peertubeInstancesStr + '</textarea>\n'
 
     instanceTitle = \
         getConfigParam(baseDir, 'instanceTitle')
@@ -1429,8 +1431,8 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
     editProfileForm += \
         '      <label class="labels">' + translate['Your bio'] + '</label>\n'
     editProfileForm += \
-        '      <textarea id="message" name="bio" style="height:200px">' + \
-        bioStr + '</textarea>\n'
+        '      <textarea id="message" name="bio" style="height:200px" ' + \
+        'spellcheck="true">' + bioStr + '</textarea>\n'
 
     alsoKnownAsStr = ''
     if actorJson.get('alsoKnownAs'):
@@ -1509,7 +1511,8 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
     editProfileForm += \
         '      <textarea id="message" placeholder=' + \
         '"-----BEGIN PGP PUBLIC KEY BLOCK-----" name="pgp" ' + \
-        'style="height:100px">' + PGPpubKey + '</textarea>\n'
+        'style="height:100px" spellcheck="false">' + \
+        PGPpubKey + '</textarea>\n'
     editProfileForm += '<a href="/users/' + nickname + \
         '/followingaccounts"><label class="labels">' + \
         translate['Following'] + '</label></a><br>\n'
@@ -1622,7 +1625,7 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
     editProfileForm += '      <br><label class="labels">' + \
         translate['One per line'] + '</label>\n'
     editProfileForm += '      <textarea id="message" ' + \
-        'name="filteredWords" style="height:200px">' + \
+        'name="filteredWords" style="height:200px" spellcheck="false">' + \
         filterStr + '</textarea>\n'
 
     editProfileForm += \
@@ -1631,7 +1634,8 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
     editProfileForm += '      <br><label class="labels">A -> B</label>\n'
     editProfileForm += \
         '      <textarea id="message" name="switchWords" ' + \
-        'style="height:200px">' + switchStr + '</textarea>\n'
+        'style="height:200px" spellcheck="false">' + \
+        switchStr + '</textarea>\n'
 
     editProfileForm += \
         '      <br><b><label class="labels">' + \
@@ -1639,7 +1643,8 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
     editProfileForm += '      <br><label class="labels">A -> #B</label>\n'
     editProfileForm += \
         '      <textarea id="message" name="autoTags" ' + \
-        'style="height:200px">' + autoTags + '</textarea>\n'
+        'style="height:200px" spellcheck="false">' + \
+        autoTags + '</textarea>\n'
 
     editProfileForm += \
         '      <br><b><label class="labels">' + \
@@ -1647,7 +1652,7 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
     editProfileForm += '      <br><label class="labels">A -> B</label>\n'
     editProfileForm += \
         '      <textarea id="message" name="autoCW" ' + \
-        'style="height:200px">' + autoCW + '</textarea>\n'
+        'style="height:200px" spellcheck="true">' + autoCW + '</textarea>\n'
 
     editProfileForm += \
         '      <br><b><label class="labels">' + \
@@ -1657,8 +1662,8 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
     editProfileForm += \
         '      <br><label class="labels">' + translate[idx] + '</label>\n'
     editProfileForm += \
-        '      <textarea id="message" name="blocked" style="height:200px">' + \
-        blockedStr + '</textarea>\n'
+        '      <textarea id="message" name="blocked" style="height:200px" ' + \
+        'spellcheck="false">' + blockedStr + '</textarea>\n'
 
     editProfileForm += \
         '      <br><b><label class="labels">' + \
@@ -1670,7 +1675,8 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
         translate[idx] + '</label>\n'
     editProfileForm += \
         '      <textarea id="message" name="allowedInstances" ' + \
-        'style="height:200px">' + allowedInstancesStr + '</textarea>\n'
+        'style="height:200px" spellcheck="false">' + \
+        allowedInstancesStr + '</textarea>\n'
 
     editProfileForm += \
         '      <br><b><label class="labels">' + \
@@ -1681,7 +1687,8 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
         translate[idx] + '</label>\n'
     editProfileForm += \
         '      <textarea id="message" name="gitProjects" ' + \
-        'style="height:100px">' + gitProjectsStr + '</textarea>\n'
+        'style="height:100px" spellcheck="false">' + \
+        gitProjectsStr + '</textarea>\n'
 
     editProfileForm += \
         '      <br><b><label class="labels">' + \

From 7acd8f7d8074ac8f2e112295c77432ba8350b8a5 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 28 Feb 2021 14:26:04 +0000
Subject: [PATCH 08/18] Spell checking on textareas

---
 blog.py                   |  3 ++-
 webapp_column_left.py     |  9 ++++++---
 webapp_column_right.py    | 12 +++++++-----
 webapp_create_post.py     |  2 +-
 webapp_moderation.py      |  6 +++---
 webapp_person_options.py  |  2 +-
 webapp_welcome_profile.py |  3 ++-
 7 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/blog.py b/blog.py
index a8dfcbaa8..9235b8e22 100644
--- a/blog.py
+++ b/blog.py
@@ -819,7 +819,8 @@ def htmlEditBlog(mediaInstance: bool, translate: {},
 
     editBlogForm += \
         '    <textarea id="message" name="message" style="height:' + \
-        str(messageBoxHeight) + 'px">' + contentStr + '</textarea>'
+        str(messageBoxHeight) + 'px" spellcheck="true">' + \
+        contentStr + '</textarea>'
     editBlogForm += dateAndLocation
     if not mediaInstance:
         editBlogForm += editBlogImageSection
diff --git a/webapp_column_left.py b/webapp_column_left.py
index 598b53821..e9894f968 100644
--- a/webapp_column_left.py
+++ b/webapp_column_left.py
@@ -401,7 +401,8 @@ def htmlEditLinks(cssCache: {}, translate: {}, baseDir: str, path: str,
         translate['One link per line. Description followed by the link.'] + \
         '<br>'
     editLinksForm += \
-        '  <textarea id="message" name="editedLinks" style="height:80vh">' + \
+        '  <textarea id="message" name="editedLinks" ' + \
+        'style="height:80vh" spellcheck="false">' + \
         linksStr + '</textarea>'
     editLinksForm += \
         '</div>'
@@ -424,7 +425,8 @@ def htmlEditLinks(cssCache: {}, translate: {}, baseDir: str, path: str,
                 '<br>'
             editLinksForm += \
                 '  <textarea id="message" name="editedAbout" ' + \
-                'style="height:100vh">' + aboutStr + '</textarea>'
+                'style="height:100vh" spellcheck="true">' + \
+                aboutStr + '</textarea>'
             editLinksForm += \
                 '</div>'
 
@@ -442,7 +444,8 @@ def htmlEditLinks(cssCache: {}, translate: {}, baseDir: str, path: str,
                 '<br>'
             editLinksForm += \
                 '  <textarea id="message" name="editedTOS" ' + \
-                'style="height:100vh">' + TOSStr + '</textarea>'
+                'style="height:100vh" spellcheck="true">' + \
+                TOSStr + '</textarea>'
             editLinksForm += \
                 '</div>'
 
diff --git a/webapp_column_right.py b/webapp_column_right.py
index 1b4276515..38b955bbb 100644
--- a/webapp_column_right.py
+++ b/webapp_column_right.py
@@ -577,7 +577,8 @@ def htmlEditNewswire(cssCache: {}, translate: {}, baseDir: str, path: str,
         '<br>'
     editNewswireForm += \
         '  <textarea id="message" name="editedNewswire" ' + \
-        'style="height:80vh">' + newswireStr + '</textarea>'
+        'style="height:80vh" spellcheck="false">' + \
+        newswireStr + '</textarea>'
 
     filterStr = ''
     filterFilename = \
@@ -592,8 +593,8 @@ def htmlEditNewswire(cssCache: {}, translate: {}, baseDir: str, path: str,
     editNewswireForm += '      <br><label class="labels">' + \
         translate['One per line'] + '</label>'
     editNewswireForm += '      <textarea id="message" ' + \
-        'name="filteredWordsNewswire" style="height:50vh">' + \
-        filterStr + '</textarea>\n'
+        'name="filteredWordsNewswire" style="height:50vh" ' + \
+        'spellcheck="true">' + filterStr + '</textarea>\n'
 
     hashtagRulesStr = ''
     hashtagRulesFilename = \
@@ -612,7 +613,7 @@ def htmlEditNewswire(cssCache: {}, translate: {}, baseDir: str, path: str,
         'https://gitlab.com/bashrc2/epicyon/-/raw/main/hashtagrules.txt' + \
         '">' + translate['See instructions'] + '</a>\n'
     editNewswireForm += '      <textarea id="message" ' + \
-        'name="hashtagRulesList" style="height:80vh">' + \
+        'name="hashtagRulesList" style="height:80vh" spellcheck="false">' + \
         hashtagRulesStr + '</textarea>\n'
 
     editNewswireForm += \
@@ -687,7 +688,8 @@ def htmlEditNewsPost(cssCache: {}, translate: {}, baseDir: str, path: str,
     newsPostContent = postJsonObject['object']['content']
     editNewsPostForm += \
         '  <textarea id="message" name="editedNewsPost" ' + \
-        'style="height:600px">' + newsPostContent + '</textarea>'
+        'style="height:600px" spellcheck="true">' + \
+        newsPostContent + '</textarea>'
 
     editNewsPostForm += \
         '</div>'
diff --git a/webapp_create_post.py b/webapp_create_post.py
index d43d64ca0..46a5300e5 100644
--- a/webapp_create_post.py
+++ b/webapp_create_post.py
@@ -555,7 +555,7 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {},
             dateAndLocation += \
                 '    <textarea id="message" ' + \
                 'name="repliesModerationOption" style="height:' + \
-                str(messageBoxHeight) + 'px"></textarea>\n'
+                str(messageBoxHeight) + 'px" spellcheck="true"></textarea>\n'
         dateAndLocation += '</div>\n'
         dateAndLocation += '<div class="container">\n'
         dateAndLocation += '<label class="labels">' + \
diff --git a/webapp_moderation.py b/webapp_moderation.py
index 87d11da47..585c8f3cc 100644
--- a/webapp_moderation.py
+++ b/webapp_moderation.py
@@ -337,7 +337,7 @@ def htmlModerationInfo(cssCache: {}, translate: {},
                 translate['These are currently suspended']
             infoForm += \
                 '  <textarea id="message" ' + \
-                'name="suspended" style="height:200px">' + \
+                'name="suspended" style="height:200px" spellcheck="false">' + \
                 suspendedStr + '</textarea>\n'
             infoForm += '</div>\n'
             infoShown = True
@@ -355,7 +355,7 @@ def htmlModerationInfo(cssCache: {}, translate: {},
                 translate[msgStr1]
             infoForm += \
                 '  <textarea id="message" ' + \
-                'name="blocked" style="height:700px">' + \
+                'name="blocked" style="height:700px" spellcheck="false">' + \
                 blockedStr + '</textarea>\n'
             infoForm += '</div>\n'
             infoShown = True
@@ -370,7 +370,7 @@ def htmlModerationInfo(cssCache: {}, translate: {},
                 translate['Filtered words'] + '</b>'
             infoForm += \
                 '  <textarea id="message" ' + \
-                'name="filtered" style="height:700px">' + \
+                'name="filtered" style="height:700px" spellcheck="true">' + \
                 filteredStr + '</textarea>\n'
             infoForm += '</div>\n'
             infoShown = True
diff --git a/webapp_person_options.py b/webapp_person_options.py
index 8afeac28c..dc9ccbf04 100644
--- a/webapp_person_options.py
+++ b/webapp_person_options.py
@@ -376,7 +376,7 @@ def htmlPersonOptions(defaultTimeline: str,
             translate['Submit'] + '</button><br>\n'
         optionsStr += \
             '    <textarea id="message" ' + \
-            'name="optionnotes" style="height:400px">' + \
+            'name="optionnotes" style="height:400px" spellcheck="true">' + \
             personNotes + '</textarea>\n'
 
     optionsStr += '  </form>\n'
diff --git a/webapp_welcome_profile.py b/webapp_welcome_profile.py
index fa78dcfce..7dde5d9ce 100644
--- a/webapp_welcome_profile.py
+++ b/webapp_welcome_profile.py
@@ -110,7 +110,8 @@ def htmlWelcomeProfile(baseDir: str, nickname: str, domain: str,
     profileForm += '  <label class="labels">' + \
         translate['Your bio'] + '</label><br>\n'
     profileForm += '  <textarea id="message" name="bio" ' + \
-        'style="height:130px">' + bioStr + '</textarea>\n'
+        'style="height:130px" spellcheck="true">' + \
+        bioStr + '</textarea>\n'
     profileForm += '</div>\n'
 
     profileForm += '<div class="container next">\n'

From 1b6771678989e49b09896c8662b8e620c9931d36 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 28 Feb 2021 14:38:50 +0000
Subject: [PATCH 09/18] This isn't the problem

---
 outbox.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/outbox.py b/outbox.py
index f45daa74a..11d595c6e 100644
--- a/outbox.py
+++ b/outbox.py
@@ -77,11 +77,6 @@ def postMessageToOutbox(messageJson: {}, postToNickname: str,
     if messageJson.get('object'):
         if isinstance(messageJson['object'], dict):
             if messageJson['object'].get('content'):
-                # semicolons are disliked, so escape them
-                if ';' in messageJson['object']['content']:
-                    messageJson['object']['content'] = \
-                        messageJson['object']['content'].replace(';', '%3B')
-
                 if dangerousMarkup(messageJson['object']['content'],
                                    allowLocalNetworkAccess):
                     print('POST to outbox contains dangerous markup: ' +

From 12d80d79d339f45838be8d09e4a71f25e6fca393 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 28 Feb 2021 14:48:41 +0000
Subject: [PATCH 10/18] Add autocomplete when creating posts

---
 webapp_column_left.py | 4 ++--
 webapp_create_post.py | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/webapp_column_left.py b/webapp_column_left.py
index e9894f968..c83a02c21 100644
--- a/webapp_column_left.py
+++ b/webapp_column_left.py
@@ -425,7 +425,7 @@ def htmlEditLinks(cssCache: {}, translate: {}, baseDir: str, path: str,
                 '<br>'
             editLinksForm += \
                 '  <textarea id="message" name="editedAbout" ' + \
-                'style="height:100vh" spellcheck="true">' + \
+                'style="height:100vh" spellcheck="true" autocomplete="on">' + \
                 aboutStr + '</textarea>'
             editLinksForm += \
                 '</div>'
@@ -444,7 +444,7 @@ def htmlEditLinks(cssCache: {}, translate: {}, baseDir: str, path: str,
                 '<br>'
             editLinksForm += \
                 '  <textarea id="message" name="editedTOS" ' + \
-                'style="height:100vh" spellcheck="true">' + \
+                'style="height:100vh" spellcheck="true" autocomplete="on">' + \
                 TOSStr + '</textarea>'
             editLinksForm += \
                 '</div>'
diff --git a/webapp_create_post.py b/webapp_create_post.py
index 46a5300e5..c540f49a1 100644
--- a/webapp_create_post.py
+++ b/webapp_create_post.py
@@ -555,7 +555,8 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {},
             dateAndLocation += \
                 '    <textarea id="message" ' + \
                 'name="repliesModerationOption" style="height:' + \
-                str(messageBoxHeight) + 'px" spellcheck="true"></textarea>\n'
+                str(messageBoxHeight) + 'px" spellcheck="true" ' + \
+                'autocomplete="on"></textarea>\n'
         dateAndLocation += '</div>\n'
         dateAndLocation += '<div class="container">\n'
         dateAndLocation += '<label class="labels">' + \
@@ -753,7 +754,8 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {},
 
     newPostForm += \
         '    <textarea id="message" name="message" style="height:' + \
-        str(messageBoxHeight) + 'px"' + selectedStr + ' spellcheck="true">' + \
+        str(messageBoxHeight) + 'px"' + selectedStr + \
+        ' spellcheck="true" autocomplete="on">' + \
         '</textarea>\n'
     newPostForm += extraFields + citationsStr + dateAndLocation
     if not mediaInstance or replyStr:

From 5f0e3c3d837623a95b72bf8980dea6bdf00b42df Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 28 Feb 2021 16:57:32 +0000
Subject: [PATCH 11/18] Escape semicolons anyway

---
 outbox.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/outbox.py b/outbox.py
index 11d595c6e..43c1210d6 100644
--- a/outbox.py
+++ b/outbox.py
@@ -77,6 +77,11 @@ def postMessageToOutbox(messageJson: {}, postToNickname: str,
     if messageJson.get('object'):
         if isinstance(messageJson['object'], dict):
             if messageJson['object'].get('content'):
+                # semicolons cause trouble, so escape them
+                if ';' in messageJson['object']['content']:
+                    messageJson['object']['content'] = \
+                        messageJson['object']['content'].replace(';', '%3B')
+
                 if dangerousMarkup(messageJson['object']['content'],
                                    allowLocalNetworkAccess):
                     print('POST to outbox contains dangerous markup: ' +

From a71c548a7fc62cfe245753c227acab1330727fe6 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 28 Feb 2021 18:14:13 +0000
Subject: [PATCH 12/18] Use empty string rather than none

---
 epicyon.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/epicyon.py b/epicyon.py
index ea958dd75..83e49ac4c 100644
--- a/epicyon.py
+++ b/epicyon.py
@@ -859,14 +859,17 @@ configOnionDomain = getConfigParam(baseDir, 'onion')
 if configOnionDomain:
     onionDomain = configOnionDomain
 else:
-    onionDomain = None
+    # Note: this should not be None
+    onionDomain = ''
 
 # get i2p domain name from configuration
 configi2pDomain = getConfigParam(baseDir, 'i2pDomain')
 if configi2pDomain:
     i2pDomain = configi2pDomain
 else:
+    # Note: this should not be None
     i2pDomain = None
+    onionDomain = ''
 
 # get port number from configuration
 configPort = getConfigParam(baseDir, 'port')

From 079c724bb9983e7e9950ba87f007a339aad795e4 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 28 Feb 2021 18:21:12 +0000
Subject: [PATCH 13/18] Check for missing onion domain

---
 epicyon.py | 4 +---
 inbox.py   | 7 +++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/epicyon.py b/epicyon.py
index 83e49ac4c..1fde5ee0c 100644
--- a/epicyon.py
+++ b/epicyon.py
@@ -859,8 +859,7 @@ configOnionDomain = getConfigParam(baseDir, 'onion')
 if configOnionDomain:
     onionDomain = configOnionDomain
 else:
-    # Note: this should not be None
-    onionDomain = ''
+    onionDomain = None
 
 # get i2p domain name from configuration
 configi2pDomain = getConfigParam(baseDir, 'i2pDomain')
@@ -869,7 +868,6 @@ if configi2pDomain:
 else:
     # Note: this should not be None
     i2pDomain = None
-    onionDomain = ''
 
 # get port number from configuration
 configPort = getConfigParam(baseDir, 'port')
diff --git a/inbox.py b/inbox.py
index 0efca270d..dd408122e 100644
--- a/inbox.py
+++ b/inbox.py
@@ -1370,8 +1370,11 @@ def _receiveAnnounce(recentPostsCache: {},
                                       YTReplacementDomain,
                                       allowLocalNetworkAccess)
     if not postJsonObject:
-        if domain not in messageJson['object'] and \
-           onionDomain not in messageJson['object']:
+        notInOnion = True
+        if onionDomain:
+            if onionDomain in messageJson['object']:
+                notInOnion = False
+        if domain not in messageJson['object'] and notInOnion:
             if os.path.isfile(postFilename):
                 # if the announce can't be downloaded then remove it
                 os.remove(postFilename)

From b30942c5a5b56d4a0a8b36a9ddf6c788c5530e59 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 28 Feb 2021 18:27:40 +0000
Subject: [PATCH 14/18] Should be

---
 epicyon.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/epicyon.py b/epicyon.py
index 1fde5ee0c..ea958dd75 100644
--- a/epicyon.py
+++ b/epicyon.py
@@ -866,7 +866,6 @@ configi2pDomain = getConfigParam(baseDir, 'i2pDomain')
 if configi2pDomain:
     i2pDomain = configi2pDomain
 else:
-    # Note: this should not be None
     i2pDomain = None
 
 # get port number from configuration

From 18088169e682c05cba03349e01e759981396222f Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 28 Feb 2021 19:41:30 +0000
Subject: [PATCH 15/18] Extra ToS points

---
 default_tos.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/default_tos.txt b/default_tos.txt
index 176240893..b74391ab7 100644
--- a/default_tos.txt
+++ b/default_tos.txt
@@ -14,10 +14,16 @@
 
 <p>This instance will not host content containing sexism, racism, casteism, homophobia, transphobia, misogyny, antisemitism or other forms of bigotry or discrimination on the basis of nationality or immigration status. Claims that transgressions of this type were intended to be "ironic" will be treated as a terms of service violation.</p>
 
+<p>Even if not conspicuously discriminatory, expressions of support for organizations with discrminatory agendas are not permitted on this instance. These include, but are not limited to, racial supremacist groups, the redpill/incel movement and anti-LGBT or anti-immigrant campaigns.</p>
+
+<p>Depictions of injury, death or medical procedures are not permitted.</p>
+
 <p>Violent or abusive content will be subject to moderation and is likely to be removed.</p>
 
 <p>Content of a sexual nature may be published providing that only consenting adults (aged 18 or over) are depicted and an appropriate content warning message is added. Posting sexual content without a content warning is a terms of service violation. Sexual content is defined both as photographs of real people and also artistic or fictional depictions, edited/generated photos or narratives.</p>
 
+<p>Moderators rely upon your reports. Don't assume that something of concern has already been reported. It's better for there to be duplicate reports than for something potentially damaging to go unreported.</p>
+
 <p>Content found to be non-compliant with this policy will be removed and any accounts on this instance producing, repeating or linking to such content will be deleted typically without prior notification.</p>
 
 <h3>Federation Policy</h3>

From f76c173f592b210d6e9df7172fa3e8b56eea73f5 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 1 Mar 2021 10:02:55 +0000
Subject: [PATCH 16/18] Don't use payload function when parsing form-data

---
 content.py | 20 +++++++++++++-------
 tests.py   | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/content.py b/content.py
index bc3db29e6..88ea8b9fa 100644
--- a/content.py
+++ b/content.py
@@ -979,16 +979,21 @@ def saveMediaInFormPOST(mediaBytes, debug: bool,
     return filename, attachmentMediaType
 
 
-def extractTextFieldsInPOST(postBytes, boundary, debug: bool) -> {}:
+def extractTextFieldsInPOST(postBytes, boundary, debug: bool,
+                            unitTestData=None) -> {}:
     """Returns a dictionary containing the text fields of a http form POST
     The boundary argument comes from the http header
     """
-    msg = email.parser.BytesParser().parsebytes(postBytes)
+    if not unitTestData:
+        msgBytes = email.parser.BytesParser().parsebytes(postBytes)
+        messageFields = msgBytes.decode('utf-8')
+    else:
+        messageFields = unitTestData
+
     if debug:
-        print('DEBUG: POST arriving ' +
-              msg.get_payload(decode=True).decode('utf-8'))
-    messageFields = msg.get_payload(decode=True)
-    messageFields = messageFields.decode('utf-8').split(boundary)
+        print('DEBUG: POST arriving ' + messageFields)
+
+    messageFields = messageFields.split(boundary)
     fields = {}
     # examine each section of the POST, separated by the boundary
     for f in messageFields:
@@ -1002,7 +1007,8 @@ def extractTextFieldsInPOST(postBytes, boundary, debug: bool) -> {}:
         postKey = postStr.split('"', 1)[0]
         postValueStr = postStr.split('"', 1)[1]
         if ';' in postValueStr:
-            continue
+            if postKey != 'message':
+                continue
         if '\r\n' not in postValueStr:
             continue
         postLines = postValueStr.split('\r\n')
diff --git a/tests.py b/tests.py
index e4dace257..92fb6c7e6 100644
--- a/tests.py
+++ b/tests.py
@@ -77,6 +77,7 @@ from inbox import jsonPostAllowsComments
 from inbox import validInbox
 from inbox import validInboxFilenames
 from categories import guessHashtagCategory
+from content import extractTextFieldsInPOST
 from content import validHashTag
 from content import htmlReplaceEmailQuote
 from content import htmlReplaceQuoteMarks
@@ -3330,9 +3331,47 @@ def testMarkdownToHtml():
         'Or <img class="markdownImage" src="/cat.jpg" alt="pounce" />.'
 
 
+def testExtractTextFieldsInPOST():
+    print('testExtractTextFieldsInPOST')
+    boundary = '-----------------------------116202748023898664511855843036'
+    formData = '-----------------------------116202748023898664511855' + \
+        '843036\r\nContent-Disposition: form-data; name="submitPost"' + \
+        '\r\n\r\nSubmit\r\n-----------------------------116202748023' + \
+        '898664511855843036\r\nContent-Disposition: form-data; name=' + \
+        '"subject"\r\n\r\n\r\n-----------------------------116202748' + \
+        '023898664511855843036\r\nContent-Disposition: form-data; na' + \
+        'me="message"\r\n\r\nThis is a ; test\r\n-------------------' + \
+        '----------116202748023898664511855843036\r\nContent-Disposi' + \
+        'tion: form-data; name="commentsEnabled"\r\n\r\non\r\n------' + \
+        '-----------------------116202748023898664511855843036\r\nCo' + \
+        'ntent-Disposition: form-data; name="eventDate"\r\n\r\n\r\n' + \
+        '-----------------------------116202748023898664511855843036' + \
+        '\r\nContent-Disposition: form-data; name="eventTime"\r\n\r' + \
+        '\n\r\n-----------------------------116202748023898664511855' + \
+        '843036\r\nContent-Disposition: form-data; name="location"' + \
+        '\r\n\r\n\r\n-----------------------------116202748023898664' + \
+        '511855843036\r\nContent-Disposition: form-data; name=' + \
+        '"imageDescription"\r\n\r\n\r\n-----------------------------' + \
+        '116202748023898664511855843036\r\nContent-Disposition: ' + \
+        'form-data; name="attachpic"; filename=""\r\nContent-Type: ' + \
+        'application/octet-stream\r\n\r\n\r\n----------------------' + \
+        '-------116202748023898664511855843036--\r\n'
+    debug = False
+    fields = extractTextFieldsInPOST(None, boundary, debug, formData)
+    assert fields['submitPost'] == 'Submit'
+    assert fields['subject'] == ''
+    assert fields['commentsEnabled'] == 'on'
+    assert fields['eventDate'] == ''
+    assert fields['eventTime'] == ''
+    assert fields['location'] == ''
+    assert fields['imageDescription'] == ''
+    assert fields['message'] == 'This is a ; test'
+
+
 def runAllTests():
     print('Running tests...')
     testFunctions()
+    testExtractTextFieldsInPOST()
     testMarkdownToHtml()
     testValidHashTag()
     testPrepareHtmlPostNickname()

From 6baef31a36ee489a2f1f074821e9b76b28827b9e Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 1 Mar 2021 10:06:13 +0000
Subject: [PATCH 17/18] Bring the payload back

---
 content.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content.py b/content.py
index 88ea8b9fa..bf22d7886 100644
--- a/content.py
+++ b/content.py
@@ -986,7 +986,7 @@ def extractTextFieldsInPOST(postBytes, boundary, debug: bool,
     """
     if not unitTestData:
         msgBytes = email.parser.BytesParser().parsebytes(postBytes)
-        messageFields = msgBytes.decode('utf-8')
+        messageFields = msgBytes.get_payload(decode=True).decode('utf-8')
     else:
         messageFields = unitTestData
 

From 441383cbd869fb3f31d9678a5b390a020b976bb3 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 1 Mar 2021 10:07:47 +0000
Subject: [PATCH 18/18] Allow outgoing semicolons

---
 outbox.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/outbox.py b/outbox.py
index 43c1210d6..11d595c6e 100644
--- a/outbox.py
+++ b/outbox.py
@@ -77,11 +77,6 @@ def postMessageToOutbox(messageJson: {}, postToNickname: str,
     if messageJson.get('object'):
         if isinstance(messageJson['object'], dict):
             if messageJson['object'].get('content'):
-                # semicolons cause trouble, so escape them
-                if ';' in messageJson['object']['content']:
-                    messageJson['object']['content'] = \
-                        messageJson['object']['content'].replace(';', '%3B')
-
                 if dangerousMarkup(messageJson['object']['content'],
                                    allowLocalNetworkAccess):
                     print('POST to outbox contains dangerous markup: ' +