Merge branch 'main' of ssh://code.freedombone.net:2222/bashrc/epicyon into main

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

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")

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 new http header: ' + signatureIndexHeader)
+        print('Should be:              ' + expectedIndexHeader)
+    assert signatureIndexHeader == expectedIndexHeader
     assert signatureHeader == \
         'sig1=:LQU1PcJILSp1Q30GWINusfftYYKfTtam7InSu2c+ZzfGC' + \
         'bTSevRgifZFuG2asFi8ubG/uUVHiBwIxxIz1u/JyWC3lYIFgjQF' + \

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()
+                    nickname = nickname.split('@')[0]
-                    if handleDomain == domain:
-                        nickname = nickname.split('@')[0]
             elif arg.split('=', 1)[0] == 'password':
                 password = arg.split('=', 1)[1]
             elif arg.split('=', 1)[0] == 'register':

webapp_profile.py

@@ -1753,12 +1753,14 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
         'style="height:200px" spellcheck="false">' + \
         allowedInstancesStr + '</textarea>\n'
 
-    editProfileForm += \
+    editProfileForm += '    </div></details>\n'
-        '      <br><b><label class="labels">' + \
+
-        translate['Git Projects'] + '</label></b>\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">' + \
+        '      <label class="labels">' + \
         translate[idx] + '</label>\n'
     editProfileForm += \
         '      <textarea id="message" name="gitProjects" ' + \