nodebb-plugin-admin-chats 3.4.0 → 3.4.2

package/client.js

@@ -223,54 +223,92 @@ $(document).ready(function() {
                     }
 
                     roomId = roomId || '';
-                    Chats.destroyAutoComplete(ajaxify.data.roomId);
-                    socket.emit('modules.chats.leave', ajaxify.data.roomId);
+                    // NodeBB 4.14.9+ (56c6115a61): destroyAutoComplete takes the input element, not a roomId
+                    Chats.destroyAutoComplete($('[component="chat/main-wrapper"]').find('[component="chat/input"]'));
+                    if (ajaxify.data.roomId) {
+                        socket.emit('modules.chats.leave', ajaxify.data.roomId);
+                    }
 
                     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();
-                            $(window).trigger('action:chat.loaded');
-                            if (roomId) {
-                                ChatsMessages.scrollToBottomAfterImageLoad(mainWrapper.find('[component="chat/message/content"]'));
-                            }
-                            if (history.pushState) {
-                                history.pushState({ url: url }, null, `${window.location.protocol}//${window.location.host}${config.relative_path || ''}/${url}`);
-                            }
-                            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);
                         });
                 };
 
                 Chats._adminAllChatsPatched = true;
             }
 
-            // Auto-open chat if roomId is specified in URL
+            // Auto-open chat if roomId is specified in URL and the room is not
+            // already rendered (server-side render sets data-roomid on the wrapper —
+            // re-switching in that case caused a visible list->chat flash on mobile)
             const currentRoomId = ajaxify && ajaxify.data && ajaxify.data.roomId;
-            if (currentRoomId && !$('body').hasClass('chat-loaded')) {
+            const activeChatId = $('[component="chat/main-wrapper"]').attr('data-roomid') || '';
+            if (currentRoomId && String(currentRoomId) !== String(activeChatId)) {
                 setTimeout(function() {
                     Chats.switchChat(currentRoomId);
                 }, 100);
+            } else {
+                syncChatLoadedState();
             }
 
             bindAdminRecentChatsInfiniteScroll();
         });
     }
 
+    // Keep the mobile layout state (body.chat-loaded / nav data-loaded) in sync with
+    // the room that is actually rendered, without re-fetching it
+    function syncChatLoadedState() {
+        const activeChatId = parseInt($('[component="chat/main-wrapper"]').attr('data-roomid'), 10) || 0;
+        $('body').toggleClass('chat-loaded', !!activeChatId);
+        $('[component="chat/nav-wrapper"]').attr('data-loaded', activeChatId ? '1' : '0');
+    }
+
     function replaceAdminEmptyStateText() {
         if (!hasAdminChatsAccess()) {
             return;
@@ -353,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: {
@@ -675,9 +714,10 @@ $(document).ready(function() {
             patchForumChatsForAdminAll();
             bindAdminRecentChatsInfiniteScroll();
             
-            // Auto-open chat if roomId is specified in URL and chat is not already loaded
+            // Auto-open chat if roomId is specified in URL and that room is not already rendered
             const currentRoomId = ajaxify && ajaxify.data && ajaxify.data.roomId;
-            if (currentRoomId && !$('body').hasClass('chat-loaded')) {
+            const activeChatId = $('[component="chat/main-wrapper"]').attr('data-roomid') || '';
+            if (currentRoomId && String(currentRoomId) !== String(activeChatId)) {
                 setTimeout(function() {
                     require(['forum/chats'], function(Chats) {
                         if (Chats && Chats.switchChat) {
@@ -685,6 +725,8 @@ $(document).ready(function() {
                         }
                     });
                 }, 200);
+            } else {
+                syncChatLoadedState();
             }
         }
 
@@ -718,6 +760,8 @@ $(document).ready(function() {
                         }
                     });
                 }, 100);
+            } else {
+                syncChatLoadedState();
             }
         }
         refreshChatUi();
@@ -776,32 +820,28 @@ $(document).ready(function() {
         }
     });
 
-    // Handle URL changes for internal navigation
+    // Handle URL changes for internal navigation (including back/forward gestures).
+    // The URL is the source of truth here — ajaxify.data.roomId is stale after popstate.
     function handleChatNavigation() {
         if (!isAdminAllChatsPage()) {
             return;
         }
-        
-        // Try to get roomId from multiple sources
-        let currentRoomId = ajaxify && ajaxify.data && ajaxify.data.roomId;
-        
-        // If not found in ajaxify.data, try to extract from URL
-        if (!currentRoomId) {
-            const urlMatch = window.location.pathname.match(/\/chats\/(\d+)/);
-            if (urlMatch) {
-                currentRoomId = parseInt(urlMatch[1], 10);
-            }
-        }
-        
-        const activeChatId = $('[component="chat/main-wrapper"]').attr('data-roomid');
-        
-        if (currentRoomId && (!activeChatId || activeChatId !== String(currentRoomId))) {
-            require(['forum/chats'], function(Chats) {
-                if (Chats && Chats.switchChat) {
-                    Chats.switchChat(currentRoomId);
-                }
-            });
+
+        const urlMatch = window.location.pathname.match(/\/chats\/(\d+)/);
+        const urlRoomId = urlMatch ? parseInt(urlMatch[1], 10) : 0;
+        const activeChatId = parseInt($('[component="chat/main-wrapper"]').attr('data-roomid'), 10) || 0;
+
+        if (urlRoomId === activeChatId) {
+            return;
         }
+
+        require(['forum/chats'], function(Chats) {
+            if (Chats && Chats.switchChat) {
+                // urlRoomId 0 -> URL is the chat list: close the open chat and show the list
+                // (previously a back-gesture out of a chat left the chat stuck on screen)
+                Chats.switchChat(urlRoomId || '');
+            }
+        });
     }
 
     $(document).on('click', '[data-action="delete"], [data-action="restore"]', function() {

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.0",
+  "version": "3.4.2",
   "description": "A plugin that allows the administrator to view and manage user chats.",
   "main": "library.js",
   "nbbpm": {