From 449e345ee56c137935016867b5f442837b050489 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 17 Jul 2024 03:41:05 +0000 Subject: [PATCH 1/4] Ignore that users do not have access to metrics Fixes #190 The templates appear to handle this being False, so that seems the path of least resistance. --- snikket_web/user.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/snikket_web/user.py b/snikket_web/user.py index 56c6e3e..9b3970b 100644 --- a/snikket_web/user.py +++ b/snikket_web/user.py @@ -97,7 +97,10 @@ class ImportAccountDataForm(BaseForm): @client.require_session() async def index() -> str: user_info = await client.get_user_info() - metrics = await client.get_system_metrics() + try: + metrics = await client.get_system_metrics() + except: + metrics = False return await render_template( "user_home.html", user_info=user_info, From 2a8e7ae72b936dd31a2e0063eefbd22564910b1c Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 11 Aug 2024 16:25:17 +0200 Subject: [PATCH 2/4] fixup: please mypy --- snikket_web/user.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snikket_web/user.py b/snikket_web/user.py index 9b3970b..258c206 100644 --- a/snikket_web/user.py +++ b/snikket_web/user.py @@ -100,7 +100,7 @@ async def index() -> str: try: metrics = await client.get_system_metrics() except: - metrics = False + metrics = {} return await render_template( "user_home.html", user_info=user_info, From 465720c5b1ab861bc25b230242d85a40d968f2ef Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 11 Aug 2024 16:34:06 +0200 Subject: [PATCH 3/4] fixup: please flake8 --- snikket_web/user.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snikket_web/user.py b/snikket_web/user.py index 258c206..56fc67c 100644 --- a/snikket_web/user.py +++ b/snikket_web/user.py @@ -99,7 +99,7 @@ async def index() -> str: user_info = await client.get_user_info() try: metrics = await client.get_system_metrics() - except: + except (werkzeug.exceptions.Unauthorized, werkzeug.exceptions.Forbidden): metrics = {} return await render_template( "user_home.html", From 5015c4aa43977b09dc6b87b86f7f843b185a9d7e Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 11 Aug 2024 16:36:53 +0200 Subject: [PATCH 4/4] fixup: refresh translation code references --- snikket_web/translations/messages.pot | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/snikket_web/translations/messages.pot b/snikket_web/translations/messages.pot index 2cc218c..ebd7d49 100644 --- a/snikket_web/translations/messages.pot +++ b/snikket_web/translations/messages.pot @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-04-30 10:52+0100\n" +"POT-Creation-Date: 2024-08-11 16:36+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.10.3\n" +"Generated-By: Babel 2.16.0\n" #: snikket_web/admin.py:69 snikket_web/templates/admin_delete_user.html:10 #: snikket_web/templates/admin_edit_circle.html:73 @@ -334,7 +334,7 @@ msgid "" msgstr "" #: snikket_web/invite.py:299 snikket_web/templates/unauth.html:18 -#: snikket_web/user.py:189 +#: snikket_web/user.py:192 msgid "Error" msgstr "" @@ -406,29 +406,29 @@ msgstr "" msgid "Upload" msgstr "" -#: snikket_web/user.py:122 +#: snikket_web/user.py:125 msgid "Incorrect password." msgstr "" -#: snikket_web/user.py:126 +#: snikket_web/user.py:129 msgid "Password changed" msgstr "" -#: snikket_web/user.py:134 +#: snikket_web/user.py:137 msgid "" "The chosen avatar is too big. To be able to upload larger avatars, please" " use the app." msgstr "" -#: snikket_web/user.py:181 +#: snikket_web/user.py:184 msgid "Profile updated" msgstr "" -#: snikket_web/user.py:195 +#: snikket_web/user.py:198 msgid "Export" msgstr "" -#: snikket_web/user.py:213 +#: snikket_web/user.py:216 msgid "You currently have no account data to export." msgstr ""