From 16b442ac19fbb2028166bf67c65b9a8eef45f970 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Wed, 22 Feb 2023 09:32:20 +0100
Subject: [PATCH] Occupant modal: Only show role/affiliation forms for
 moderators

---
 .prettierrc                                   |  1 -
 CHANGES.md                                    |  1 -
 .../muc-views/modals/templates/occupant.js    | 24 ++++++++++++-------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.prettierrc b/.prettierrc
index 2a06a05d6..e0e638036 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,5 +1,4 @@
 {
-  "arrowParens": "avoid",
   "printWidth": 120,
   "quoteProps": "preserve",
   "singleQuote": true,
diff --git a/CHANGES.md b/CHANGES.md
index 93fd8bb6f..0ae90f269 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,7 +5,6 @@
 - Add the ability to set roles and affiliations via the MUC occupant modal
 - Fix `isOnlyEmojis is not a function` when using only `@converse/headless`
 
-
 ## 10.1.2 (2023-02-17)
 
 - #1490: Busy-loop when fetching registration form fails
diff --git a/src/plugins/muc-views/modals/templates/occupant.js b/src/plugins/muc-views/modals/templates/occupant.js
index f728c3873..3ccc87a98 100644
--- a/src/plugins/muc-views/modals/templates/occupant.js
+++ b/src/plugins/muc-views/modals/templates/occupant.js
@@ -16,6 +16,9 @@ export default (el) => {
     const hats = el.model?.get('hats')?.length ? el.model.get('hats') : null;
     const muc = el.model.collection.chatroom;
 
+    const allowed_commands = muc.getAllowedCommands();
+    const may_moderate = allowed_commands.includes('modtools');
+
     const i18n_add_to_contacts = __('Add to Contacts');
 
     const can_see_real_jids = muc.features.get('nonanonymous') || muc.getOwnRole() === 'moderator';
@@ -45,26 +48,29 @@ export default (el) => {
                     <li>
                         <div class="row"><strong>${__('Affiliation')}:</strong></div>
                         <div class="row">${affiliation}&nbsp;
-                            <a href="#"
-                               data-form="affiliation-form"
-                               class="toggle-form right"
-                               color="var(--subdued-color)"
-                               @click=${(ev) => el.toggleForm(ev)}><converse-icon class="fa fa-wrench" size="1em"></converse-icon>
-                            </a>
-                            ${ el.show_affiliation_form ? html`<converse-muc-affiliation-form jid=${jid} .muc=${muc} affiliation=${affiliation}></converse-muc-affiliation-form>` : '' }
+                            ${ may_moderate ? html`
+                                <a href="#"
+                                data-form="affiliation-form"
+                                class="toggle-form right"
+                                color="var(--subdued-color)"
+                                @click=${(ev) => el.toggleForm(ev)}><converse-icon class="fa fa-wrench" size="1em"></converse-icon>
+                                </a>
+                                ${ el.show_affiliation_form ? html`<converse-muc-affiliation-form jid=${jid} .muc=${muc} affiliation=${affiliation}></converse-muc-affiliation-form>` : '' }` : ''
+                            }
                         </div>
                     </li>
                     <li>
                         <div class="row"><strong>${__('Role')}:</strong></div>
                         <div class="row">${role}&nbsp;
-                            ${ role ? html`
+                            ${ may_moderate && role ? html`
                                 <a href="#"
                                    data-form="row-form"
                                    class="toggle-form right"
                                    color="var(--subdued-color)"
                                    @click=${(ev) => el.toggleForm(ev)}><converse-icon class="fa fa-wrench" size="1em"></converse-icon>
                                 </a>
-                                ${ el.show_role_form ? html`<converse-muc-role-form jid=${jid} .muc=${muc} role=${role}></converse-muc-role-form>` : '' }` : '' }
+                                ${ el.show_role_form ? html`<converse-muc-role-form jid=${jid} .muc=${muc} role=${role}></converse-muc-role-form>` : '' }` : ''
+                            }
                         </div>
                     </li>
                     <li>