nodebb-plugin-admin-chats 3.6.0 → 3.6.1

package/lib/hooks.js

@@ -94,13 +94,19 @@ hooks.addProfileLink = async function (data) {
         return data;
     }
 
+    // Nothing to moderate on your own profile — /user/<self>/chats is just the
+    // regular chat list, already reachable from the main menu.
+    if (parseInt(data.uid, 10) === parseInt(viewerUid, 10)) {
+        return data;
+    }
+
     data.links.push({
         id: 'admin-view-chats',
         route: 'chats',
         icon: 'fa-comments',
         name: '[[admin-chats:profile.viewChats]]',
         visibility: {
-            self: true, other: true, moderator: true, globalMod: true, admin: true,
+            self: false, other: true, moderator: true, globalMod: true, admin: true,
         },
     });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-admin-chats",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "A plugin that allows the administrator to view and manage user chats.",
   "main": "library.js",
   "nbbpm": {

package/static/lib/profile-link.js

@@ -28,7 +28,18 @@ $(document).ready(function () {
         }
     }
 
+    // Drop everything a previous run of this function left behind. Runs can
+    // overlap (ajaxify.end may fire more than once per page) and each one
+    // awaits, so without this a bail-out — or a second run — leaves an orphan
+    // gear button on the page.
+    function removePreviousInjection() {
+        $('.admin-chats-privileges-menu').remove();
+        $('.admin-chats-profile-link, .admin-chats-profile-divider').remove();
+    }
+
     async function injectProfileChatsLink() {
+        removePreviousInjection();
+
         const isUserProfile = $('.account').length && window.location.pathname.includes('/user/');
         if (!isUserProfile || !await resolveAdminChatsAccess()) {
             return;
@@ -39,6 +50,15 @@ $(document).ready(function () {
             return;
         }
 
+        // Own profile: /user/<self>/chats is just the regular chat list, so the
+        // moderation entry point has nothing to add there. Harmony doesn't
+        // render its own gear menu here either ({{{ if !isSelf }}}), so bailing
+        // out has to leave no button behind at all.
+        const profileUid = parseInt(ajaxify.data.uid || (ajaxify.data.user && ajaxify.data.user.uid), 10);
+        if (profileUid && parseInt(app.user.uid, 10) === profileUid) {
+            return;
+        }
+
         const relativePath = config.relative_path || '';
         // Injected via jQuery rather than a template, so [[...]] needs an
         // explicit translator call here — nothing else will resolve it.
@@ -56,11 +76,13 @@ $(document).ready(function () {
             </li>
         `;
 
-        let menu = $('.account-sub-links');
+        const menu = $('.account-sub-links').first();
         if (!menu.length) {
             // No admin/ban/mute menu was rendered for this viewer (they only
             // hold the admin-chats privilege) — build a minimal dropdown of
-            // our own next to the other profile action buttons.
+            // our own next to the other profile action buttons. The item goes
+            // in before the dropdown is attached, so a half-built gear can
+            // never end up on the page.
             const container = $('.account .flex-shrink-0.d-flex.gap-1').first();
             const fallbackContainer = container.length ? container : $('.account .flex-shrink-0').first();
 
@@ -70,14 +92,10 @@ $(document).ready(function () {
                         <button type="button" class="btn btn-light dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             <i class="fa fa-gear fa-fw"></i>
                         </button>
-                        <ul class="dropdown-menu dropdown-menu-end p-1 text-sm account-sub-links" role="menu"></ul>
+                        <ul class="dropdown-menu dropdown-menu-end p-1 text-sm account-sub-links" role="menu">${menuItemHtml}</ul>
                     </div>
                 `);
-                menu = fallbackContainer.find('.account-sub-links').last();
             }
-        }
-
-        if (!menu.length) {
             return;
         }