From 2703a601f0297ddc64f19ff63aea04388745b15c Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 3 Apr 2021 11:03:03 +0100
Subject: [PATCH 1/6] Separate section for git within profile edit screen

---
 webapp_profile.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/webapp_profile.py b/webapp_profile.py
index 0161947e5..dffaa4324 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -1753,9 +1753,11 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
         'style="height:200px" spellcheck="false">' + \
         allowedInstancesStr + '</textarea>\n'
 
-    editProfileForm += \
-        '      <br><b><label class="labels">' + \
-        translate['Git Projects'] + '</label></b>\n'
+    editProfileForm += '    </div></details>\n'
+
+    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 += \
         '      <br><label class="labels">' + \

From 1b464fec247000d90c63bde2e76685c0cfcd4271 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 3 Apr 2021 11:53:34 +0100
Subject: [PATCH 2/6] Remove newline

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

diff --git a/webapp_profile.py b/webapp_profile.py
index dffaa4324..fd2893cb2 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -1760,7 +1760,7 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
     editProfileForm += '    <div class="container">\n'
     idx = 'List of project names that you wish to receive git patches for'
     editProfileForm += \
-        '      <br><label class="labels">' + \
+        '      <label class="labels">' + \
         translate[idx] + '</label>\n'
     editProfileForm += \
         '      <textarea id="message" name="gitProjects" ' + \

From 647004489e0bca096c3fc077b63c536575917eb7 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 4 Apr 2021 09:19:35 +0100
Subject: [PATCH 3/6] Unit test failure message

---
 tests.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests.py b/tests.py
index 3eda974d4..f5d2713bd 100644
--- a/tests.py
+++ b/tests.py
@@ -266,11 +266,15 @@ def testHttpSigNew():
                            domain, port,
                            boxpath, httpPrefix, messageBodyJsonStr,
                            'rsa-sha256')
-    assert signatureIndexHeader == \
+    expectedIndexHeader = \
         'keyId="https://example.com/users/foo#main-key"; ' + \
         'alg=hs2019; created=' + str(secondsSinceEpoch) + '; ' + \
         'sig1=(*request-target, *created, host, date, ' + \
         'digest, content-type, content-length)'
+    if signatureIndexHeader != expectedIndexHeader:
+        print('Unexpected http header: ' + signatureIndexHeader)
+        print('Should be:              ' + expectedIndexHeader)
+    assert signatureIndexHeader == expectedIndexHeader
     assert signatureHeader == \
         'sig1=:LQU1PcJILSp1Q30GWINusfftYYKfTtam7InSu2c+ZzfGC' + \
         'bTSevRgifZFuG2asFi8ubG/uUVHiBwIxxIz1u/JyWC3lYIFgjQF' + \

From 10482ed149f46ca8b17ff5c3af9d46f6f93393bf Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 4 Apr 2021 09:27:46 +0100
Subject: [PATCH 4/6] New

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

diff --git a/tests.py b/tests.py
index f5d2713bd..9b7fa8ec9 100644
--- a/tests.py
+++ b/tests.py
@@ -272,7 +272,7 @@ def testHttpSigNew():
         'sig1=(*request-target, *created, host, date, ' + \
         'digest, content-type, content-length)'
     if signatureIndexHeader != expectedIndexHeader:
-        print('Unexpected http header: ' + signatureIndexHeader)
+        print('Unexpected new http header: ' + signatureIndexHeader)
         print('Should be:              ' + expectedIndexHeader)
     assert signatureIndexHeader == expectedIndexHeader
     assert signatureHeader == \

From fd1b678e5eaff1412bb2fa34e7b94acd267aa7bf Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 4 Apr 2021 12:58:48 +0100
Subject: [PATCH 5/6] Tidying

---
 desktop_client.py |  2 +-
 static_analysis   | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/desktop_client.py b/desktop_client.py
index 3a7d4193d..4d3f94ae4 100644
--- a/desktop_client.py
+++ b/desktop_client.py
@@ -1442,7 +1442,7 @@ def runDesktopClient(baseDir: str, proxyType: str, httpPrefix: str,
                 _desktopShowBanner()
                 print('No posts\n')
                 if proxyType == 'tor':
-                    print('You may need to run the desktop client ' + \
+                    print('You may need to run the desktop client ' +
                           'with the --http option')
 
         # wait for a while, or until a key is pressed
diff --git a/static_analysis b/static_analysis
index b237a5261..33e135b83 100755
--- a/static_analysis
+++ b/static_analysis
@@ -8,17 +8,6 @@ fi
 
 echo "Starting static analysis"
 
-for sourceFile in epicyon/*.py
-do
-    result=$($cmd "$sourceFile")
-    if [ "$result" ]; then
-	echo ''
-	echo "$result"
-	exit 1
-    fi
-    echo -n '.'
-done
-
 for sourceFile in *.py
 do
     result=$($cmd "$sourceFile")

From 6a9bcd33e6881341b120938f3c5de5f7df59fe99 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 4 Apr 2021 20:44:01 +0100
Subject: [PATCH 6/6] Always use nickname only within login screen

---
 webapp_login.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/webapp_login.py b/webapp_login.py
index 0b47a2f8c..e488d5f46 100644
--- a/webapp_login.py
+++ b/webapp_login.py
@@ -42,9 +42,7 @@ def htmlGetLoginCredentials(loginParams: str,
                     nickname = nickname[1:]
                 if '@' in nickname:
                     # the full nickname@domain has been entered
-                    handleDomain = nickname.split('@')[1].strip()
-                    if handleDomain == domain:
-                        nickname = nickname.split('@')[0]
+                    nickname = nickname.split('@')[0]
             elif arg.split('=', 1)[0] == 'password':
                 password = arg.split('=', 1)[1]
             elif arg.split('=', 1)[0] == 'register':