Include flake8-print plugin

This alerts us of stray print statements, which should never occur
because this is a non-TUI application.

.github/workflows/main.yaml

@@ -45,7 +45,7 @@ jobs:
       - name: Install
         run: |
           set -euo pipefail
-          pip install flake8
+          pip install flake8 flake8-print
       - name: Linting
         run: |
           python -m flake8 snikket_web

Dockerfile

@@ -1,7 +1,13 @@
-FROM debian:buster-slim
+FROM debian:bullseye-slim AS build
 
-ARG BUILD_SERIES=dev
+RUN set -eu; \
-ARG BUILD_ID=0
+    export DEBIAN_FRONTEND=noninteractive ; \
+    apt-get update ; \
+    apt-get install -y --no-install-recommends \
+        python3 python3-pip python3-setuptools python3-wheel \
+        libpython3-dev \
+        make build-essential \
+        netcat;
 
 COPY requirements.txt /opt/snikket-web-portal/requirements.txt
 COPY build-requirements.txt /opt/snikket-web-portal/build-requirements.txt
@@ -11,32 +17,41 @@ COPY babel.cfg /opt/snikket-web-portal/babel.cfg
 
 WORKDIR /opt/snikket-web-portal
 
-RUN set -eu; \
+RUN pip3 install -r requirements.txt; \
-    export DEBIAN_FRONTEND=noninteractive ; \
-    apt-get update ; \
-    apt-get install -y --no-install-recommends \
-        python3 python3-pip python3-setuptools python3-wheel \
-        libpython3-dev \
-        make build-essential \
-        netcat \
-        ; \
-    pip3 install -r requirements.txt; \
     pip3 install -r build-requirements.txt; \
-    make; \
+    make;
-    pip3 uninstall -yr build-requirements.txt; \
+
-    apt-get remove -y build-essential make libpython3-dev; \
+
-    apt-get autoremove -y; \
+FROM debian:bullseye-slim
-    pip3 install hypercorn; \
+
-    rm -rf /root/.cache; \
+ARG BUILD_SERIES=dev
-    apt-get clean ; rm -rf /var/lib/apt/lists
+ARG BUILD_ID=0
 
 COPY docker/env.py /etc/snikket-web-portal/env.py
+
 ENV SNIKKET_WEB_PYENV=/etc/snikket-web-portal/env.py
 
 ENV SNIKKET_WEB_PROSODY_ENDPOINT=http://127.0.0.1:5280/
 
 HEALTHCHECK CMD nc -zv ${SNIKKET_TWEAK_PORTAL_INTERNAL_HTTP_INTERFACE:-127.0.0.1} ${SNIKKET_TWEAK_PORTAL_INTERNAL_HTTP_PORT:-5765}
 
+RUN set -eu; \
+    export DEBIAN_FRONTEND=noninteractive ; \
+    apt-get update ; \
+    apt-get install -y --no-install-recommends \
+        python3 python3-pip python3-setuptools python3-wheel; \
+    apt-get clean ; rm -rf /var/lib/apt/lists; \
+    pip3 install hypercorn; \
+    rm -rf /root/.cache;
+
+WORKDIR /opt/snikket-web-portal
+
+COPY requirements.txt /opt/snikket-web-portal/requirements.txt
+RUN pip3 install -r requirements.txt; rm -rf /root/.cache;
+
+COPY --from=build /opt/snikket-web-portal/snikket_web/ /opt/snikket-web-portal/snikket_web
+COPY babel.cfg /opt/snikket-web-portal/babel.cfg
+
 RUN echo "$BUILD_SERIES $BUILD_ID" > /opt/snikket-web-portal/.app_version
 
 ADD docker/entrypoint.sh /entrypoint.sh

requirements.txt

@@ -5,4 +5,5 @@ hsluv~=0.0.2
 flask-babel~=1.0
 email-validator~=1.1
 environ-config~=20.0
+wtforms~=2.3
 typing-extensions

snikket_web/admin.py

@@ -63,9 +63,6 @@ async def users() -> str:
     )
 
 
-_LIMITED_ROLE_NAME = _("Limited")
-
-
 class EditUserForm(BaseForm):
     localpart = wtforms.StringField(
         _l("Login name"),
@@ -78,9 +75,7 @@ class EditUserForm(BaseForm):
     role = wtforms.RadioField(
         _l("Access Level"),
         choices=[
-            # NOTE: enable this only after something has been done which
+            ("prosody:restricted", _("Limited")),
-            # actually enforces the described restrictions :).
-            # ("prosody:restricted", _LIMITED_ROLE_NAME),
             ("prosody:normal", _l("Normal user")),
             ("prosody:admin", _l("Administrator")),
         ],
@@ -547,8 +542,6 @@ async def edit_circle(id_: str) -> typing.Union[str, quart.Response]:
             )
 
         return redirect(url_for(".edit_circle", id_=id_))
-    else:
-        print(form.errors)
 
     return await render_template(
         "admin_edit_circle.html",

snikket_web/templates/invite_success.html

@@ -15,6 +15,6 @@
 		{% trans %}Copy address{% endtrans %}
 	{%- endcall -%}
 	<p>{% trans %}You can now set up your legacy XMPP client with the above address and the password you chose during registration.{% endtrans %}</p>
-	<p>{% trans %}You can now safely close this page.{% endtrans %}</p>
+	<p>{% trans login_url=url_for('main.login') %}You can now safely close this page, or log in to the web portal to <a href="{{ login_url }}">manage your account</a>.{% endtrans %}</p>
 </div>
 {% endblock %}

snikket_web/templates/invite_view.html

@@ -68,7 +68,7 @@
 			{#- -#}
 			<div id="qr-info-url" class="tab-pane active">
 				<p>{% trans %}Use a <em>QR code</em> scanner on your mobile device to scan the code below:{% endtrans %}</p>
-				<div id="qr-invite-page" data-qrdata="{{ url_for(".view", id_=invite_id, _external=True) }}" class="qr"></div>
+				<div id="qr-invite-page" data-qrdata="{{ url_for(".view", id_=invite_id, _external=True, _scheme="https") }}" class="qr"></div>
 			</div>
 			{#- -#}
 			<div id="qr-info-uri" class="tab-pane">

snikket_web/translations/id/LC_MESSAGES/messages.po

@@ -6,18 +6,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"Report-Msgid-Bugs-To: translations@snikket.org\n"
 "POT-Creation-Date: 2021-06-18 16:05+0200\n"
-"PO-Revision-Date: 2021-05-19 15:12+0000\n"
+"PO-Revision-Date: 2021-12-12 07:00+0000\n"
 "Last-Translator: uira <inboxriau@andriana.id>\n"
-"Language-Team: Indonesian <https://i18n.sotecware.net/projects/snikket/web-"
+"Language-Team: Indonesian <http://i18n.sotecware.net/projects/snikket/"
-"portal/id/>\n"
+"web-portal/id/>\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.5.1\n"
+"X-Generator: Weblate 4.8.1\n"
 "Generated-By: Babel 2.9.0\n"
 
 #: snikket_web/admin.py:66
@@ -194,23 +194,23 @@ msgstr "Pengguna dihapus dari kelompok"
 
 #: snikket_web/admin.py:616
 msgid "Message contents"
-msgstr ""
+msgstr "Isi pesan"
 
 #: snikket_web/admin.py:622
 msgid "Only send to online users"
-msgstr ""
+msgstr "Hanya kirim ke pengguna online"
 
 #: snikket_web/admin.py:626
 msgid "Post to all users"
-msgstr ""
+msgstr "Kirim ke semua pengguna"
 
 #: snikket_web/admin.py:630
 msgid "Send preview to yourself"
-msgstr ""
+msgstr "Kirim pratinjau ke diri sendiri"
 
 #: snikket_web/admin.py:652
 msgid "Announcement sent!"
-msgstr ""
+msgstr "Pengumuman terkirim!"
 
 #: snikket_web/infra.py:51
 msgid "Main"
@@ -630,7 +630,7 @@ msgstr "Anggota kelompok"
 
 #: snikket_web/templates/admin_edit_circle.html:71
 msgid "The user has been deleted from the server."
-msgstr ""
+msgstr "Pengguna telah dihapus dari server"
 
 #: snikket_web/templates/admin_edit_circle.html:71
 #: snikket_web/templates/library.j2:108
@@ -843,22 +843,20 @@ msgstr "Kelola undangan"
 
 #: snikket_web/templates/admin_home.html:35
 msgid "System health"
-msgstr ""
+msgstr "Kesehatan sistem"
 
 #: snikket_web/templates/admin_home.html:38
 msgid "View the server status or send a broadcast message to all users."
-msgstr ""
+msgstr "Lihat status server atau kirim pesan siaran ke semua pengguna."
 
 #: snikket_web/templates/admin_home.html:40
 msgid "Send a broadcast message to all users."
-msgstr ""
+msgstr "Kirim pesan siaran ke semua pengguna."
 
 #: snikket_web/templates/admin_home.html:43
 #: snikket_web/templates/admin_system.html:4
-#, fuzzy
-#| msgid "Manage users"
 msgid "Manage system"
-msgstr "Kelola pengguna"
+msgstr "Kelola sistem"
 
 #: snikket_web/templates/admin_home.html:48
 msgid "Go back to your user's web portal page."
@@ -919,11 +917,11 @@ msgstr "Hancurkan tautan"
 
 #: snikket_web/templates/admin_system.html:6
 msgid "Overall system status"
-msgstr ""
+msgstr "Kesehatan sistem keseluruhan"
 
 #: snikket_web/templates/admin_system.html:9
 msgid "System load (5 minute average)"
-msgstr ""
+msgstr "Beban sistem (rata-rata 5 menit)"
 
 #: snikket_web/templates/admin_system.html:14
 #: snikket_web/templates/admin_system.html:22
@@ -933,11 +931,11 @@ msgstr ""
 #: snikket_web/templates/admin_system.html:68
 #: snikket_web/templates/admin_system.html:76
 msgid "unknown"
-msgstr ""
+msgstr "Tidak diketahui"
 
 #: snikket_web/templates/admin_system.html:17
 msgid "Memory use"
-msgstr ""
+msgstr "Penggunaan memori"
 
 #: snikket_web/templates/admin_system.html:20
 #, python-format
@@ -945,50 +943,52 @@ msgid ""
 "%(percentage_global)s of %(mem_available)s. Of that, Snikket uses "
 "%(percentage_snikket)s."
 msgstr ""
+"%(percentage_global)s of %(mem_available)s. Dari jumlah itu, Snikket "
+"menggunakan %(percentage_snikket)s."
 
 #: snikket_web/templates/admin_system.html:27
 msgid "Web portal status"
-msgstr ""
+msgstr "Status portal web"
 
 #: snikket_web/templates/admin_system.html:30
 #: snikket_web/templates/admin_system.html:53
 msgid "Version"
-msgstr ""
+msgstr "Versi"
 
 #: snikket_web/templates/admin_system.html:31
 #: snikket_web/templates/admin_system.html:54
 msgid "View all versions"
-msgstr ""
+msgstr "Lihat versi semua"
 
 #: snikket_web/templates/admin_system.html:32
 #: snikket_web/templates/admin_system.html:55
 msgid "Average CPU use"
-msgstr ""
+msgstr "Penggunaan CPU rata-rata"
 
 #: snikket_web/templates/admin_system.html:40
 #: snikket_web/templates/admin_system.html:63
 msgid "Current memory use"
-msgstr ""
+msgstr "Penggunaan CPU rata-rata"
 
 #: snikket_web/templates/admin_system.html:50
-#, fuzzy
-#| msgid "Snikket Web Portal"
 msgid "Snikket server status"
-msgstr "Portal Web Snikket"
+msgstr "Status server Snikket"
 
 #: snikket_web/templates/admin_system.html:71
 msgid "Connected devices"
-msgstr ""
+msgstr "Perangkat terhubung"
 
 #: snikket_web/templates/admin_system.html:82
 msgid "Broadcast message"
-msgstr ""
+msgstr "Sebarkan pesan"
 
 #: snikket_web/templates/admin_system.html:84
 msgid ""
 "This form allows you to send a message to all users currently online on your "
 "Snikket server. Use it wisely."
 msgstr ""
+"Form ini memungkinkan mengirim pesan ke semua pengguna yang saat ini online "
+"di server Snikket Anda. Gunakan dengan bijak."
 
 #: snikket_web/templates/admin_users.html:19
 msgid "The user is an administrator."

snikket_web/translations/pl/LC_MESSAGES/messages.po

@@ -8,17 +8,17 @@ msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2021-06-18 16:05+0200\n"
-"PO-Revision-Date: 2021-05-19 15:12+0000\n"
+"PO-Revision-Date: 2021-09-03 15:00+0000\n"
 "Last-Translator: misiek <migelazur@mailbox.org>\n"
-"Language-Team: Polish <https://i18n.sotecware.net/projects/snikket/web-"
+"Language-Team: Polish <http://i18n.sotecware.net/projects/snikket/web-portal/"
-"portal/pl/>\n"
+"pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.5.1\n"
+"X-Generator: Weblate 4.7.2\n"
 "Generated-By: Babel 2.9.0\n"
 
 #: snikket_web/admin.py:66
@@ -195,23 +195,23 @@ msgstr "Usunięto użytkownika z kręgu"
 
 #: snikket_web/admin.py:616
 msgid "Message contents"
-msgstr ""
+msgstr "Treść wiadomości"
 
 #: snikket_web/admin.py:622
 msgid "Only send to online users"
-msgstr ""
+msgstr "Wyślij jedynie do użytkowników online"
 
 #: snikket_web/admin.py:626
 msgid "Post to all users"
-msgstr ""
+msgstr "Wyślij do wszystkich użytkowników"
 
 #: snikket_web/admin.py:630
 msgid "Send preview to yourself"
-msgstr ""
+msgstr "Prześlij do siebie podgląd wiadomości"
 
 #: snikket_web/admin.py:652
 msgid "Announcement sent!"
-msgstr ""
+msgstr "Komunikat wysłany!"
 
 #: snikket_web/infra.py:51
 msgid "Main"
@@ -629,7 +629,7 @@ msgstr "Członkowie kręgu"
 
 #: snikket_web/templates/admin_edit_circle.html:71
 msgid "The user has been deleted from the server."
-msgstr ""
+msgstr "Użytkownik został usunięty z serwera."
 
 #: snikket_web/templates/admin_edit_circle.html:71
 #: snikket_web/templates/library.j2:108
@@ -844,22 +844,21 @@ msgstr "Zarządzaj zaproszeniami"
 
 #: snikket_web/templates/admin_home.html:35
 msgid "System health"
-msgstr ""
+msgstr "Stan systemu"
 
 #: snikket_web/templates/admin_home.html:38
 msgid "View the server status or send a broadcast message to all users."
 msgstr ""
+"Podejrzyj status serwera lub prześlij komunikat do wszystkich użytkowników."
 
 #: snikket_web/templates/admin_home.html:40
 msgid "Send a broadcast message to all users."
-msgstr ""
+msgstr "Prześlij komunikat do wszystkich użytkowników."
 
 #: snikket_web/templates/admin_home.html:43
 #: snikket_web/templates/admin_system.html:4
-#, fuzzy
-#| msgid "Manage users"
 msgid "Manage system"
-msgstr "Zarządzaj użytkownikami"
+msgstr "Zarządzaj systemem"
 
 #: snikket_web/templates/admin_home.html:48
 msgid "Go back to your user's web portal page."
@@ -920,11 +919,11 @@ msgstr "Zniszcz link"
 
 #: snikket_web/templates/admin_system.html:6
 msgid "Overall system status"
-msgstr ""
+msgstr "Ogólny status systemu"
 
 #: snikket_web/templates/admin_system.html:9
 msgid "System load (5 minute average)"
-msgstr ""
+msgstr "Obciążenie systemu (dla ostatnich 5 minut)"
 
 #: snikket_web/templates/admin_system.html:14
 #: snikket_web/templates/admin_system.html:22
@@ -934,11 +933,11 @@ msgstr ""
 #: snikket_web/templates/admin_system.html:68
 #: snikket_web/templates/admin_system.html:76
 msgid "unknown"
-msgstr ""
+msgstr "nieznane"
 
 #: snikket_web/templates/admin_system.html:17
 msgid "Memory use"
-msgstr ""
+msgstr "Wykorzystanie pamięci"
 
 #: snikket_web/templates/admin_system.html:20
 #, python-format
@@ -946,50 +945,52 @@ msgid ""
 "%(percentage_global)s of %(mem_available)s. Of that, Snikket uses "
 "%(percentage_snikket)s."
 msgstr ""
+"%(percentage_global)s z %(mem_available)s. Z tego Snikket używa "
+"%(percentage_snikket)s."
 
 #: snikket_web/templates/admin_system.html:27
 msgid "Web portal status"
-msgstr ""
+msgstr "Status portalu internetowego"
 
 #: snikket_web/templates/admin_system.html:30
 #: snikket_web/templates/admin_system.html:53
 msgid "Version"
-msgstr ""
+msgstr "Wersja"
 
 #: snikket_web/templates/admin_system.html:31
 #: snikket_web/templates/admin_system.html:54
 msgid "View all versions"
-msgstr ""
+msgstr "Pokaż wszystkie wersje"
 
 #: snikket_web/templates/admin_system.html:32
 #: snikket_web/templates/admin_system.html:55
 msgid "Average CPU use"
-msgstr ""
+msgstr "Średnie użycie CPU"
 
 #: snikket_web/templates/admin_system.html:40
 #: snikket_web/templates/admin_system.html:63
 msgid "Current memory use"
-msgstr ""
+msgstr "Bieżące użycie pamięci"
 
 #: snikket_web/templates/admin_system.html:50
-#, fuzzy
-#| msgid "Snikket Web Portal"
 msgid "Snikket server status"
-msgstr "Portal użytkownika Snikket"
+msgstr "Status serwera Snikket"
 
 #: snikket_web/templates/admin_system.html:71
 msgid "Connected devices"
-msgstr ""
+msgstr "Podłączone urządzenia"
 
 #: snikket_web/templates/admin_system.html:82
 msgid "Broadcast message"
-msgstr ""
+msgstr "Wiadomość globalna"
 
 #: snikket_web/templates/admin_system.html:84
 msgid ""
 "This form allows you to send a message to all users currently online on your "
 "Snikket server. Use it wisely."
 msgstr ""
+"Ten formularz pozwala na wysłanie wiadomości do wszystkich użytkowników, "
+"którzy obecnie są online na twoim serwerze Snikket. Używaj go z rozwagą."
 
 #: snikket_web/templates/admin_users.html:19
 msgid "The user is an administrator."

snikket_web/translations/sv/LC_MESSAGES/messages.po

@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2021-06-18 16:05+0200\n"
-"PO-Revision-Date: 2021-05-28 21:00+0000\n"
+"PO-Revision-Date: 2021-08-01 14:00+0000\n"
 "Last-Translator: Kim Alvefur <zash@zash.se>\n"
-"Language-Team: Swedish <https://i18n.sotecware.net/projects/snikket/web-"
+"Language-Team: Swedish <http://i18n.sotecware.net/projects/snikket/"
-"portal/sv/>\n"
+"web-portal/sv/>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.5.1\n"
+"X-Generator: Weblate 4.7.2\n"
 "Generated-By: Babel 2.9.0\n"
 
 #: snikket_web/admin.py:66
@@ -624,7 +624,7 @@ msgstr "Medlemmar i krets"
 
 #: snikket_web/templates/admin_edit_circle.html:71
 msgid "The user has been deleted from the server."
-msgstr ""
+msgstr "Användaren har raderats från servern."
 
 #: snikket_web/templates/admin_edit_circle.html:71
 #: snikket_web/templates/library.j2:108

snikket_web/user.py

@@ -138,7 +138,6 @@ async def profile() -> typing.Union[str, quart.Response]:
             mimetype = file_info.mimetype
             data = file_info.stream.read()
             if len(data) > max_avatar_size:
-                print(len(data), max_avatar_size)
                 form.avatar.errors.append(EAVATARTOOBIG)
                 ok = False
             elif len(data) > 0:

snikket_web/xmpputil.py

@@ -207,7 +207,7 @@ def make_avatar_metadata_set_request(
         item,
         "metadata", xmlns=NS_USER_AVATAR_METADATA)
 
-    attr: typing.MutableMapping[str, str] = {
+    attr: typing.Dict[str, str] = {
         "id": id_,
         "bytes": str(size),
         "type": mimetype,
@@ -217,7 +217,12 @@ def make_avatar_metadata_set_request(
     if height is not None:
         attr["height"] = str(height)
 
-    ET.SubElement(metadata_wrap, "info", xmlns=NS_USER_AVATAR_METADATA, **attr)
+    ET.SubElement(
+        metadata_wrap,
+        "info",
+        xmlns=NS_USER_AVATAR_METADATA,
+        **attr,  # type: ignore
+    )
     return req