nodebb-plugin-admin-chats 3.7.0 → 3.8.1

package/lib/routes.js

@@ -352,6 +352,36 @@ function registerRoutes(app, router, middleware) {
         }
     });
 
+    // Room deletion from the admin-chats page. Core's DELETE
+    // /api/v3/admin/chats/:roomId is gated on real admin privileges
+    // (middleware.admin.checkPrivileges), so holders of the
+    // admin-chats:manage privilege cannot use it — this endpoint accepts
+    // them too. Goes through Messaging.deleteRooms, so the activity-set
+    // wrapper (lib/activity.js) prunes the deleted room from the admin list.
+    router.delete('/api/admin-chats/:roomId', ...routeMiddleware, async (req, res) => {
+        try {
+            const roomId = parseInt(req.params.roomId, 10);
+
+            if (!req.uid || Number.isNaN(roomId)) {
+                return res.status(400).json({ status: { code: 'bad-request', message: 'Invalid room id' } });
+            }
+
+            if (!await User.isAdministrator(req.uid) && !await canManageAdminChats(req.uid)) {
+                return res.status(403).json({ status: { code: 'forbidden', message: 'Admin or manage privilege required' } });
+            }
+
+            if (!await roomExists(roomId)) {
+                return res.status(404).json({ status: { code: 'not-found', message: 'Room not found' } });
+            }
+
+            await Messaging.deleteRooms([roomId]);
+
+            return res.json({ status: { code: 'ok', message: 'Room deleted' }, roomId });
+        } catch (err) {
+            return res.status(500).json({ status: { code: 'error', message: err.message } });
+        }
+    });
+
     router.get('/api/admin-chats/:roomId/lock', ...routeMiddleware, async (req, res) => {
         try {
             const roomId = parseInt(req.params.roomId, 10);

package/package.json

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

package/plugin.json

@@ -8,6 +8,7 @@
   "scripts": [
     "static/lib/switch-chat.js",
     "static/lib/lock-toggle.js",
+    "static/lib/delete-room.js",
     "static/lib/live-updates.js",
     "static/lib/profile-link.js",
     "static/lib/message-history.js"

package/public/languages/ar/admin-chats.json

@@ -18,5 +18,6 @@
   "errors.history": "Unable to load or update the edit history.",
   "history.restore": "Restore version",
   "history.restored": "Message restored to the selected version",
-  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history."
+  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history.",
+  "errors.delete": "Unable to delete the chat room."
 }

package/public/languages/de/admin-chats.json

@@ -18,5 +18,6 @@
   "errors.history": "Unable to load or update the edit history.",
   "history.restore": "Restore version",
   "history.restored": "Message restored to the selected version",
-  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history."
+  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history.",
+  "errors.delete": "Unable to delete the chat room."
 }

package/public/languages/de-CH/admin-chats.json

@@ -18,5 +18,6 @@
   "errors.history": "Unable to load or update the edit history.",
   "history.restore": "Restore version",
   "history.restored": "Message restored to the selected version",
-  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history."
+  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history.",
+  "errors.delete": "Unable to delete the chat room."
 }

package/public/languages/el/admin-chats.json

@@ -18,5 +18,6 @@
   "errors.history": "Unable to load or update the edit history.",
   "history.restore": "Restore version",
   "history.restored": "Message restored to the selected version",
-  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history."
+  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history.",
+  "errors.delete": "Unable to delete the chat room."
 }

package/public/languages/en/admin-chats.json

@@ -18,5 +18,6 @@
   "errors.history": "Unable to load or update the edit history.",
   "history.restore": "Restore version",
   "history.restored": "Message restored to the selected version",
-  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history."
+  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history.",
+  "errors.delete": "Unable to delete the chat room."
 }

package/public/languages/en-GB/admin-chats.json

@@ -18,5 +18,6 @@
   "errors.history": "Unable to load or update the edit history.",
   "history.restore": "Restore version",
   "history.restored": "Message restored to the selected version",
-  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history."
+  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history.",
+  "errors.delete": "Unable to delete the chat room."
 }

package/public/languages/es/admin-chats.json

@@ -18,5 +18,6 @@
   "errors.history": "Unable to load or update the edit history.",
   "history.restore": "Restore version",
   "history.restored": "Message restored to the selected version",
-  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history."
+  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history.",
+  "errors.delete": "Unable to delete the chat room."
 }

package/public/languages/fr/admin-chats.json

@@ -18,5 +18,6 @@
   "errors.history": "Unable to load or update the edit history.",
   "history.restore": "Restore version",
   "history.restored": "Message restored to the selected version",
-  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history."
+  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history.",
+  "errors.delete": "Unable to delete the chat room."
 }

package/public/languages/fr-CH/admin-chats.json

@@ -18,5 +18,6 @@
   "errors.history": "Unable to load or update the edit history.",
   "history.restore": "Restore version",
   "history.restored": "Message restored to the selected version",
-  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history."
+  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history.",
+  "errors.delete": "Unable to delete the chat room."
 }

package/public/languages/he/admin-chats.json

@@ -18,5 +18,6 @@
   "errors.history": "לא ניתן לטעון או לעדכן את היסטוריית העריכות.",
   "history.restore": "שחזור גרסה",
   "history.restored": "ההודעה שוחזרה לגרסה שנבחרה",
-  "history.restoreDescription": "שחזור יציב את תוכן הגרסה שנבחרה כגרסה הנוכחית; הגרסה שהוחלפה תישמר בהיסטוריה."
+  "history.restoreDescription": "שחזור יציב את תוכן הגרסה שנבחרה כגרסה הנוכחית; הגרסה שהוחלפה תישמר בהיסטוריה.",
+  "errors.delete": "לא ניתן למחוק את חדר הצ'אט."
 }

package/public/languages/hi/admin-chats.json

@@ -18,5 +18,6 @@
   "errors.history": "Unable to load or update the edit history.",
   "history.restore": "Restore version",
   "history.restored": "Message restored to the selected version",
-  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history."
+  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history.",
+  "errors.delete": "Unable to delete the chat room."
 }

package/public/languages/it/admin-chats.json

@@ -18,5 +18,6 @@
   "errors.history": "Unable to load or update the edit history.",
   "history.restore": "Restore version",
   "history.restored": "Message restored to the selected version",
-  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history."
+  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history.",
+  "errors.delete": "Unable to delete the chat room."
 }

package/public/languages/it-CH/admin-chats.json

@@ -18,5 +18,6 @@
   "errors.history": "Unable to load or update the edit history.",
   "history.restore": "Restore version",
   "history.restored": "Message restored to the selected version",
-  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history."
+  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history.",
+  "errors.delete": "Unable to delete the chat room."
 }

package/public/languages/ja/admin-chats.json

@@ -18,5 +18,6 @@
   "errors.history": "Unable to load or update the edit history.",
   "history.restore": "Restore version",
   "history.restored": "Message restored to the selected version",
-  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history."
+  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history.",
+  "errors.delete": "Unable to delete the chat room."
 }

package/public/languages/nl/admin-chats.json

@@ -18,5 +18,6 @@
   "errors.history": "Unable to load or update the edit history.",
   "history.restore": "Restore version",
   "history.restored": "Message restored to the selected version",
-  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history."
+  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history.",
+  "errors.delete": "Unable to delete the chat room."
 }

package/public/languages/pl/admin-chats.json

@@ -18,5 +18,6 @@
   "errors.history": "Unable to load or update the edit history.",
   "history.restore": "Restore version",
   "history.restored": "Message restored to the selected version",
-  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history."
+  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history.",
+  "errors.delete": "Unable to delete the chat room."
 }

package/public/languages/pt-BR/admin-chats.json

@@ -18,5 +18,6 @@
   "errors.history": "Unable to load or update the edit history.",
   "history.restore": "Restore version",
   "history.restored": "Message restored to the selected version",
-  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history."
+  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history.",
+  "errors.delete": "Unable to delete the chat room."
 }

package/public/languages/rm-CH/admin-chats.json

@@ -18,5 +18,6 @@
   "errors.history": "Unable to load or update the edit history.",
   "history.restore": "Restore version",
   "history.restored": "Message restored to the selected version",
-  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history."
+  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history.",
+  "errors.delete": "Unable to delete the chat room."
 }

package/public/languages/ru/admin-chats.json

@@ -18,5 +18,6 @@
   "errors.history": "Unable to load or update the edit history.",
   "history.restore": "Restore version",
   "history.restored": "Message restored to the selected version",
-  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history."
+  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history.",
+  "errors.delete": "Unable to delete the chat room."
 }

package/public/languages/uk/admin-chats.json

@@ -18,5 +18,6 @@
   "errors.history": "Unable to load or update the edit history.",
   "history.restore": "Restore version",
   "history.restored": "Message restored to the selected version",
-  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history."
+  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history.",
+  "errors.delete": "Unable to delete the chat room."
 }

package/public/languages/zh-CN/admin-chats.json

@@ -18,5 +18,6 @@
   "errors.history": "Unable to load or update the edit history.",
   "history.restore": "Restore version",
   "history.restored": "Message restored to the selected version",
-  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history."
+  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history.",
+  "errors.delete": "Unable to delete the chat room."
 }

package/public/languages/zh-TW/admin-chats.json

@@ -18,5 +18,6 @@
   "errors.history": "Unable to load or update the edit history.",
   "history.restore": "Restore version",
   "history.restored": "Message restored to the selected version",
-  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history."
+  "history.restoreDescription": "Restoring sets the selected version as the current one; the replaced version is kept in the history.",
+  "errors.delete": "Unable to delete the chat room."
 }

package/static/lib/delete-room.js

@@ -0,0 +1,67 @@
+'use strict';
+
+// The Delete Room menu item on the admin-all-chats page is rendered
+// server-side (templates/partials/chats/options.tpl, gated on the manage
+// privilege via room.isAdmin). It deliberately does NOT use core's
+// data-action="delete": core's handler calls the admin-only
+// DELETE /api/v3/admin/chats/:roomId endpoint, which rejects non-admin
+// holders of the admin-chats:manage privilege — so the click goes through
+// the plugin's own endpoint, which accepts them too.
+$(document).ready(function () {
+    async function deleteRoom(roomId) {
+        const response = await fetch(`${config.relative_path || ''}/api/admin-chats/${roomId}`, {
+            method: 'DELETE',
+            headers: {
+                'x-csrf-token': config.csrf_token,
+            },
+            credentials: 'same-origin',
+        });
+
+        if (!response.ok) {
+            throw new Error('Unable to delete room');
+        }
+
+        return await response.json();
+    }
+
+    $(document).on('click', '.admin-chat-delete-room-item', function (ev) {
+        ev.preventDefault();
+
+        const $button = $(this);
+        const roomId = parseInt($button.attr('data-room-id'), 10);
+
+        if (!roomId || $button.hasClass('disabled')) {
+            return;
+        }
+
+        require(['modals', 'forum/chats'], function (modals, Chats) {
+            // Same confirm dialog core shows for its own Delete Room item
+            modals.confirm({
+                size: 'small',
+                title: '[[modules:chat.delete]]',
+                message: '<p>[[modules:chat.delete-prompt]]</p>',
+                callback: async function (ok) {
+                    if (!ok) {
+                        return;
+                    }
+
+                    $button.addClass('disabled').attr('aria-disabled', 'true');
+
+                    try {
+                        await deleteRoom(roomId);
+                        // Drop the room from the sidebar lists and close the
+                        // open chat window (the patched switchChat renders the
+                        // empty state for a falsy roomId)
+                        $(`[component="chat/nav-wrapper"] [data-roomid="${roomId}"]`).remove();
+                        if (Chats && Chats.switchChat) {
+                            Chats.switchChat('');
+                        }
+                    } catch (err) {
+                        app.alertError('[[admin-chats:errors.delete]]');
+                        $button.removeClass('disabled').removeAttr('aria-disabled');
+                    }
+                },
+            });
+        });
+    });
+});

package/static/lib/live-updates.js

@@ -25,18 +25,4 @@ $(document).ready(function () {
             refreshIfOpen(data && data.roomId);
         });
     }
-
-    // Core toggles the `deleted` class on a message when it's deleted/restored,
-    // but doesn't itself swap which of the delete/restore actions is visible.
-    $(document).on('click', '[data-action="delete"], [data-action="restore"]', function () {
-        const $message = $(this).closest('[component="chat/message"]');
-        if (!$message.length) {
-            return;
-        }
-        setTimeout(function () {
-            const isDeleted = $message.hasClass('deleted');
-            $message.find('[data-action="delete"]').toggleClass('hidden', isDeleted).toggle(!isDeleted);
-            $message.find('[data-action="restore"]').toggleClass('hidden', !isDeleted).toggle(isDeleted);
-        }, 50);
-    });
 });

package/templates/partials/chats/options.tpl

@@ -81,13 +81,20 @@
 				</a>
 			</li>
 			{{{ end }}}
-			{{{ if (public && isAdmin) }}}
+			{{{ if ((public && isAdmin) && !adminAllChats) }}}
 			<li>
 				<a class="dropdown-item rounded-1 d-flex align-items-center gap-2" href="#" data-action="delete" role="menuitem">
 					<i class="fa fa-fw text-danger fa-trash"></i> {{tx("modules:chat.delete-room")}}
 				</a>
 			</li>
 			{{{ end }}}
+			{{{ if (adminAllChats && isAdmin) }}}
+			<li>
+				<a class="dropdown-item rounded-1 d-flex align-items-center gap-2 admin-chat-delete-room-item" href="#" data-room-id="{roomId}" role="menuitem">
+					<i class="fa fa-fw text-danger fa-trash"></i> {{tx("modules:chat.delete-room")}}
+				</a>
+			</li>
+			{{{ end }}}
 		</ul>
 	</div>