From c2a77fdd4415ec3bed9a714cd081b8678400e68c Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 30 May 2021 15:27:26 +0100 Subject: [PATCH] Access keys on edit profile screen --- daemon.py | 8 +++++++- webapp_profile.py | 8 +++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/daemon.py b/daemon.py index fee03986e..079e1df29 100644 --- a/daemon.py +++ b/daemon.py @@ -10465,6 +10465,12 @@ class PubServer(BaseHTTPRequestHandler): city = self._getSpoofedCity(baseDir, nickname, domain) else: city = self.server.city + + accessKeys = self.server.accessKeys + if '/users/' in path: + if self.server.keyShortcuts.get(nickname): + accessKeys = self.server.keyShortcuts[nickname] + msg = htmlEditProfile(self.server.cssCache, translate, baseDir, @@ -10475,7 +10481,7 @@ class PubServer(BaseHTTPRequestHandler): self.server.themeName, peertubeInstances, self.server.textModeBanner, - city).encode('utf-8') + city, accessKeys).encode('utf-8') if msg: msglen = len(msg) self._set_headers('text/html', msglen, diff --git a/webapp_profile.py b/webapp_profile.py index 3adda2e8f..b0eead02e 100644 --- a/webapp_profile.py +++ b/webapp_profile.py @@ -1081,7 +1081,8 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str, domain: str, port: int, httpPrefix: str, defaultTimeline: str, theme: str, peertubeInstances: [], - textModeBanner: str, city: str) -> str: + textModeBanner: str, city: str, + accessKeys: {}) -> str: """Shows the edit profile screen """ imageFormats = getImageFormats() @@ -1611,8 +1612,9 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str, editProfileForm += '
\n' editProfileForm += \ '
\n' + \ - ' \n' + \ + ' \n' + \ '
\n' editProfileForm += '
\n'