nodebb-plugin-admin-chats 3.8.0 → 3.8.2

package/lib/hooks.js

@@ -243,7 +243,11 @@ hooks.onLoadRoom = async function (payload) {
         isLockedForUser
     );
     room.canReply = room.canReply && !isLockedForUser;
-    room.showUserInput = room.showUserInput && !isLockedForUser;
+    // The composer in partials/chats/message-window.tpl is wrapped in {{{ if showUserInput }}}.
+    // Core sets showUserInput = false whenever "maximum users in chat room" is 2 (the flag was
+    // meant for the add-user field and core templates no longer use it), which hid the message
+    // box on /chats - the page phones use. Only hide it when the room is locked for the viewer.
+    room.showUserInput = !isLockedForUser;
 
     if (!hasAccess) {
         return payload;

package/package.json

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

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/static/lib/switch-chat.js

@@ -192,6 +192,12 @@ $(document).ready(function () {
         if (!isAdminAllChatsPage()) {
             return;
         }
+        // On back/forward away from the chats page ajaxify.data still describes the chats
+        // page until the next page finishes loading. Without this check the room list is
+        // "switched" to and /chats is pushed on top of the page the user is navigating to.
+        if (!/\/chats(\/|$)/.test(window.location.pathname)) {
+            return;
+        }
 
         const urlMatch = window.location.pathname.match(/\/chats\/(\d+)/);
         const urlRoomId = urlMatch ? parseInt(urlMatch[1], 10) : 0;