nodebb-plugin-admin-chats 3.4.1 → 3.4.2

package/client.js

@@ -230,38 +230,54 @@ $(document).ready(function() {
                     }
 
                     const url = getAdminChatsPageUrl(roomId);
+
+                    async function renderAdminChatWindow(payload) {
+                        const html = await app.parseAndTranslate('partials/chats/message-window', payload);
+                        const mainWrapper = $('[component="chat/main-wrapper"]');
+                        mainWrapper.html(html);
+                        mainWrapper.attr('data-roomid', roomId);
+                        html.find('.timeago').timeago();
+                        ajaxify.data = { ...ajaxify.data, ...payload, roomId: roomId };
+                        ajaxify.updateTitle(ajaxify.data.title);
+                        $('body').toggleClass('chat-loaded', !!roomId);
+                        $('[component="chat/nav-wrapper"]').attr('data-loaded', roomId ? '1' : '0');
+                        mainWrapper.find('[data-bs-toggle="tooltip"]').tooltip({ trigger: 'hover', container: '#content' });
+                        Chats.setActive(roomId);
+                        Chats.addEventListeners();
+                        // Pass the container like core does — listeners (e.g. the emoji
+                        // plugin's chat button) resolve elements relative to it
+                        $(window).trigger('action:chat.loaded', $('.chats-full'));
+                        if (roomId) {
+                            ChatsMessages.scrollToBottomAfterImageLoad(mainWrapper.find('[component="chat/message/content"]'));
+                        }
+                        if (history.pushState) {
+                            const fullUrl = `${window.location.protocol}//${window.location.host}${config.relative_path || ''}/${url}`;
+                            // When the address bar already shows the target (e.g. closing a chat
+                            // after a back-gesture), replace instead of stacking a duplicate entry
+                            const sameUrl = window.location.href.split('?')[0] === fullUrl.split('?')[0];
+                            history[sameUrl ? 'replaceState' : 'pushState']({ url: url }, null, fullUrl);
+                        }
+                        bindAdminRecentChatsInfiniteScroll();
+                    }
+
+                    if (!roomId) {
+                        // Closing a chat needs no server round-trip — render the empty
+                        // window from the data we already have (instant back-gesture)
+                        renderAdminChatWindow({ ...ajaxify.data, roomId: 0, title: '[[pages:chats]]' });
+                        return;
+                    }
+
                     fetch(getAdminChatsDataUrl(roomId), { credentials: 'include' })
                         .then(async function(response) {
                             if (!response.ok) {
                                 throw new Error(`Received ${response.status}`);
                             }
-
-                            const payload = await response.json();
-                            const html = await app.parseAndTranslate('partials/chats/message-window', payload);
-                            const mainWrapper = $('[component="chat/main-wrapper"]');
-                            mainWrapper.html(html);
-                            mainWrapper.attr('data-roomid', roomId);
-                            html.find('.timeago').timeago();
-                            ajaxify.data = { ...ajaxify.data, ...payload, roomId: roomId };
-                            ajaxify.updateTitle(ajaxify.data.title);
-                            $('body').toggleClass('chat-loaded', !!roomId);
-                            mainWrapper.find('[data-bs-toggle="tooltip"]').tooltip({ trigger: 'hover', container: '#content' });
-                            Chats.setActive(roomId);
-                            Chats.addEventListeners();
-                            // Pass the container like core does — listeners (e.g. the emoji
-                            // plugin's chat button) resolve elements relative to it
-                            $(window).trigger('action:chat.loaded', $('.chats-full'));
-                            if (roomId) {
-                                ChatsMessages.scrollToBottomAfterImageLoad(mainWrapper.find('[component="chat/message/content"]'));
-                            }
-                            if (history.pushState) {
-                                const fullUrl = `${window.location.protocol}//${window.location.host}${config.relative_path || ''}/${url}`;
-                                // When the address bar already shows the target (e.g. closing a chat
-                                // after a back-gesture), replace instead of stacking a duplicate entry
-                                const sameUrl = window.location.href.split('?')[0] === fullUrl.split('?')[0];
-                                history[sameUrl ? 'replaceState' : 'pushState']({ url: url }, null, fullUrl);
-                            }
-                            bindAdminRecentChatsInfiniteScroll();
+                            await renderAdminChatWindow(await response.json());
+                        })
+                        .catch(function() {
+                            // Never leave the user stuck on the list — fall back to a
+                            // regular ajaxify navigation to the room
+                            ajaxify.go(url);
                         });
                 };
 
@@ -375,7 +391,8 @@ $(document).ready(function() {
 
         // Try admin endpoint first if user has access
         if (hasAdminChatsAccess()) {
-            const adminEndpoint = `${config.relative_path || ''}/api/admin-chats/page/${roomId}`;
+            // switch=1: room data only — no need to rebuild the full room list here
+            const adminEndpoint = `${config.relative_path || ''}/api/admin-chats/page/${roomId}?switch=1`;
             try {
                 const adminResponse = await fetch(adminEndpoint, {
                     headers: {

package/library.js

@@ -847,7 +847,9 @@ function registerRoutes(app, router, middleware) {
                 return;
             }
 
-            const payload = await buildAdminChatsPayload(req);
+            const payload = await buildAdminChatsPayload(req, {
+                isSwitch: parseInt(req.query.switch, 10) === 1,
+            });
             res.json(payload);
         } catch (err) {
             res.status(500).json({ status: { code: 'error', message: err.message } });
@@ -1115,7 +1117,11 @@ async function assertAdminChatsAccess(req, res) {
     return true;
 }
 
-async function buildAdminChatsPayload(req) {
+async function buildAdminChatsPayload(req, options = {}) {
+    // Like core (controllers/accounts/chats.js): when the client only switches
+    // rooms (?switch=1 on the JSON endpoint), skip rebuilding the room list —
+    // scanning every chat room on each switch made room-opening slow on mobile
+    const isSwitch = !!options.isSwitch;
     const userslug = await User.getUserField(req.uid, 'userslug');
     const [isAdmin, canView, canManage] = await Promise.all([
         User.isAdministrator(req.uid),
@@ -1124,11 +1130,6 @@ async function buildAdminChatsPayload(req) {
     ]);
     const adminChatsManage = isAdmin || canManage;
     const adminChatsAccess = isAdmin || canView || canManage;
-    const [recentChats, publicRooms, privateRoomCount] = await Promise.all([
-        getAdminRecentChats(req.uid, 0, ADMIN_CHAT_PAGE_SIZE),
-        Messaging.getPublicRooms(req.uid, req.uid),
-        getPrivateRoomCount(),
-    ]);
 
     const payload = {
         title: '[[pages:chats]]',
@@ -1138,13 +1139,21 @@ async function buildAdminChatsPayload(req) {
         adminChatsAccess,
         adminChatsIsAdmin: isAdmin,
         adminChatsCanManage: adminChatsManage,
-        rooms: recentChats.rooms,
-        nextStart: recentChats.nextStart,
-        publicRooms: publicRooms || [],
-        privateRoomCount,
         bodyClasses: ['page-user-chats'],
     };
 
+    if (!isSwitch) {
+        const [recentChats, publicRooms, privateRoomCount] = await Promise.all([
+            getAdminRecentChats(req.uid, 0, ADMIN_CHAT_PAGE_SIZE),
+            Messaging.getPublicRooms(req.uid, req.uid),
+            getPrivateRoomCount(),
+        ]);
+        payload.rooms = recentChats.rooms;
+        payload.nextStart = recentChats.nextStart;
+        payload.publicRooms = publicRooms || [];
+        payload.privateRoomCount = privateRoomCount;
+    }
+
     const roomId = parseInt(req.params.roomId, 10) || 0;
     if (!roomId) {
         return payload;

package/package.json

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