nodebb-plugin-admin-chats 3.4.3 → 3.5.0

package/client.js

@@ -253,11 +253,8 @@ $(document).ready(function() {
                         });
                         if (roomId) {
                             ChatsMessages.scrollToBottomAfterImageLoad(mainWrapper.find('[component="chat/message/content"]'));
-                            // Core only marks a room read when its list element carries the
-                            // "unread" class — the admin list doesn't, so mark it explicitly
-                            require(['api'], function(api) {
-                                api.del(`/chats/${roomId}/state`, {}).catch(function() {});
-                            });
+                            // Read-state is now cleared server-side when the room payload is
+                            // built; just keep the list UI in sync
                             $('[component="chat/nav-wrapper"]').find(`[data-roomid="${roomId}"]`).removeClass('unread');
                         }
                         if (history.pushState) {

package/library.js

@@ -790,15 +790,17 @@ function registerRoutes(app, router, middleware) {
 
     const pageController = async (req, res, next) => {
         try {
-            // If user is not allowed, redirect to user-specific chat URL
+            // Users without admin-chats access get core's behaviour: redirect to
+            // their own chats page (helpers.redirect also handles API/ajaxify
+            // requests via X-Redirect, so navigation works in one hop)
             if (req.uid && !await canAccessAdminChats(req.uid)) {
                 const userSlug = await User.getUserField(req.uid, 'userslug');
-                if (userSlug && req.params.roomId) {
-                    const redirectUrl = `${req.baseUrl || ''}/user/${userSlug}/chats/${req.params.roomId}${req.params.index ? `/${req.params.index}` : ''}`;
-                    return res.redirect(redirectUrl);
+                if (userSlug) {
+                    const suffix = req.params.roomId ? `/${req.params.roomId}${req.params.index ? `/${req.params.index}` : ''}` : '';
+                    return helpers.redirect(res, `/user/${userSlug}/chats${suffix}`);
                 }
             }
-            
+
             await renderAdminChatsPage(req, res, next);
         } catch (err) {
             next(err);
@@ -807,6 +809,13 @@ function registerRoutes(app, router, middleware) {
 
     const pageRouter = app || router;
     pageRouter.get('/chats/:roomId?/:index?', middleware.busyCheck, pageMiddlewares, middleware.buildHeader, pageController);
+    // Also own the page-API route. Without it, ajaxify entry into /chats/<roomId>
+    // (e.g. picking a room from the mobile chat dropdown) hit core's redirect
+    // route and bounced through an extra hop before the room finally rendered —
+    // showing the chat list in between. Registered on the core router before
+    // core's own routes, and covered by middleware.prepareAPI (mounted earlier),
+    // so res.render answers with ajaxify JSON in a single round-trip.
+    router.get('/api/chats/:roomId?/:index?', pageMiddlewares, pageController);
 
     router.get('/api/admin-chats', ...routeMiddleware, async (req, res) => {
         try {
@@ -1190,6 +1199,16 @@ async function buildAdminChatRoomPayload(uid, roomId, indexParam) {
         return null;
     }
 
+    // Root fix for "message stays unread": core only clears unread state from the
+    // client when the room's nav element carries the `unread` class, which the
+    // admin list never sets. Mark the room read for the viewer on every load.
+    try {
+        await Messaging.markRead(uid, roomId);
+        await Messaging.pushUnreadCount(uid);
+    } catch (err) {
+        // never let read-state bookkeeping break room rendering
+    }
+
     const [canViewInfo, canUploadImage, canUploadFile] = await privileges.global.can([
         'view:users:info', 'upload:post:image', 'upload:post:file',
     ], uid);

package/package.json

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