From 2cdcf7f2823963ba9188b86afe1665e1e4151c5e Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Tue, 19 Sep 2023 18:29:24 +0200
Subject: [PATCH] Update for role changes in Prosody

See https://hg.prosody.im/trunk/rev/082c7d856e61
---
 snikket_web/admin.py                       | 4 ++--
 snikket_web/prosodyclient.py               | 2 +-
 snikket_web/templates/admin_edit_user.html | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/snikket_web/admin.py b/snikket_web/admin.py
index 9c3b75b..4668fdd 100644
--- a/snikket_web/admin.py
+++ b/snikket_web/admin.py
@@ -77,7 +77,7 @@ class EditUserForm(BaseForm):
         _l("Access Level"),
         choices=[
             ("prosody:restricted", _("Limited")),
-            ("prosody:user", _l("Normal user")),
+            ("prosody:registered", _l("Normal user")),
             ("prosody:admin", _l("Administrator")),
         ],
     )
@@ -131,7 +131,7 @@ async def edit_user(localpart: str) -> typing.Union[werkzeug.Response, str]:
         if target_user_info.roles:
             form.role.data = target_user_info.roles[0]
         else:
-            form.role.data = "prosody:user"
+            form.role.data = "prosody:registered"
 
     return await render_template(
         "admin_edit_user.html",
diff --git a/snikket_web/prosodyclient.py b/snikket_web/prosodyclient.py
index 90edc39..5ef9d83 100644
--- a/snikket_web/prosodyclient.py
+++ b/snikket_web/prosodyclient.py
@@ -29,7 +29,7 @@ from . import xmpputil
 from .xmpputil import split_jid
 
 
-SCOPE_DEFAULT = "prosody:user"
+SCOPE_DEFAULT = "prosody:registered"
 SCOPE_ADMIN = "prosody:admin"
 
 
diff --git a/snikket_web/templates/admin_edit_user.html b/snikket_web/templates/admin_edit_user.html
index 7f9697f..7e601a4 100644
--- a/snikket_web/templates/admin_edit_user.html
+++ b/snikket_web/templates/admin_edit_user.html
@@ -3,7 +3,7 @@
 {% macro access_level_description(role, caller=None) %}
 {%- if role == "prosody:restricted" -%}
 {% trans %}Limited users can interact with users on the same Snikket service and be members of circles.{% endtrans %}
-{%- elif role == "prosody:user" -%}
+{%- elif role == "prosody:registered" -%}
 {% trans %}Like limited users and can also interact with users on other Snikket services.{% endtrans %}
 {%- elif role == "prosody:admin" -%}
 {% trans %}Like normal users and can access the admin panel in the web portal.{% endtrans %}