nodebb-plugin-admin-chats 3.1.1 → 3.2.0

package/client.js

@@ -336,68 +336,69 @@ $(document).ready(function() {
             return null;
         }
 
+        // First, check if we have the room data in ajaxify.data (from the current page)
         const currentRoom = ajaxify && ajaxify.data && (ajaxify.data.room || ajaxify.data);
-        if (currentRoom && parseInt(currentRoom.roomId, 10) === roomId && currentRoom.adminChatLock) {
-            setCachedRoomData(roomId, currentRoom);
-            return currentRoom;
+        if (currentRoom && parseInt(currentRoom.roomId, 10) === roomId) {
+            if (currentRoom.adminChatLock) {
+                setCachedRoomData(roomId, currentRoom);
+                return currentRoom;
+            }
         }
 
+        // Check cache
         const cached = getCachedRoomData(roomId);
         if (cached) {
             return cached;
         }
 
-        const endpoint = isAdminAllChatsPage() ?
-            `${config.relative_path || ''}/api/admin-chats/page/${roomId}` :
-            `${config.relative_path || ''}/api/chats/${roomId}`;
-        const response = await fetch(endpoint, {
-            headers: {
-                'x-csrf-token': config.csrf_token,
-            },
-            credentials: 'same-origin',
-        });
-        if (!response.ok) {
-            if (hasAdminChatsAccess() && !isAdminAllChatsPage()) {
-                const adminResponse = await fetch(`${config.relative_path || ''}/api/admin-chats/page/${roomId}`, {
+        // Try admin endpoint first if user has access
+        if (hasAdminChatsAccess()) {
+            const adminEndpoint = `${config.relative_path || ''}/api/admin-chats/page/${roomId}`;
+            try {
+                const adminResponse = await fetch(adminEndpoint, {
                     headers: {
                         'x-csrf-token': config.csrf_token,
                     },
                     credentials: 'same-origin',
                 });
-                if (!adminResponse.ok) {
-                    return null;
-                }
-                const adminPayload = await adminResponse.json();
-                const adminRoom = adminPayload && adminPayload.roomId ? adminPayload : (adminPayload && adminPayload.room ? adminPayload.room : null);
-                if (adminRoom) {
-                    setCachedRoomData(roomId, adminRoom);
+                if (adminResponse.ok) {
+                    const adminPayload = await adminResponse.json();
+                    const adminRoom = adminPayload && adminPayload.roomId ? adminPayload : (adminPayload && adminPayload.room ? adminPayload.room : null);
+                    if (adminRoom) {
+                        setCachedRoomData(roomId, adminRoom);
+                        return adminRoom;
+                    }
                 }
-                return adminRoom;
+            } catch (err) {
+                // Continue to fallback
             }
-            return null;
         }
 
-        const payload = await response.json();
-        const roomData = payload && payload.roomId ? payload : (payload && payload.room ? payload.room : null);
-        if (roomData && !roomData.adminChatLock && hasAdminChatsAccess() && !isAdminAllChatsPage()) {
-            const adminResponse = await fetch(`${config.relative_path || ''}/api/admin-chats/page/${roomId}`, {
+        // For all users, try to get lock data from the new endpoint
+        const lockEndpoint = `${config.relative_path || ''}/api/admin-chats/${roomId}/lock`;
+        try {
+            const lockResponse = await fetch(lockEndpoint, {
                 headers: {
                     'x-csrf-token': config.csrf_token,
                 },
                 credentials: 'same-origin',
             });
-            if (adminResponse.ok) {
-                const adminPayload = await adminResponse.json();
-                const adminRoom = adminPayload && adminPayload.roomId ? adminPayload : (adminPayload && adminPayload.room ? adminPayload.room : null);
-                if (adminRoom && adminRoom.adminChatLock) {
-                    roomData.adminChatLock = adminRoom.adminChatLock;
+            if (lockResponse.ok) {
+                const lockPayload = await lockResponse.json();
+                if (lockPayload && lockPayload.lockData) {
+                    const roomData = {
+                        roomId: roomId,
+                        adminChatLock: lockPayload.lockData,
+                    };
+                    setCachedRoomData(roomId, roomData);
+                    return roomData;
                 }
             }
+        } catch (err) {
+            // Ignore error
         }
-        if (roomData) {
-            setCachedRoomData(roomId, roomData);
-        }
-        return roomData;
+
+        return null;
     }
     function isLockedForUser(roomData) {
         return !!(roomData && roomData.adminChatLock && roomData.adminChatLock.isLocked && !canManageChats());
@@ -739,6 +740,35 @@ $(document).ready(function() {
         socket.on('event:chats.restore', function() { setTimeout(refreshChatUi, 0); });
     }
 
+    // Monitor for new chat modals/windows being added to the DOM
+    // This ensures styling is applied to floating chat windows opened from non-chat pages
+    const observer = new MutationObserver(function(mutations) {
+        let hasNewChatWindow = false;
+        mutations.forEach(function(mutation) {
+            if (mutation.type === 'childList') {
+                mutation.addedNodes.forEach(function(node) {
+                    if (node.nodeType === 1) { // Element node
+                        const $node = $(node);
+                        if ($node.is('.chat-modal') || $node.find('.chat-modal').length) {
+                            hasNewChatWindow = true;
+                        }
+                        if ($node.is('[component="chat/message/window"]') || $node.find('[component="chat/message/window"]').length) {
+                            hasNewChatWindow = true;
+                        }
+                    }
+                });
+            }
+        });
+        if (hasNewChatWindow) {
+            setTimeout(refreshChatUi, 50);
+        }
+    });
+
+    observer.observe(document.body, {
+        childList: true,
+        subtree: true
+    });
+
     // Handle browser back/forward navigation
     $(window).on('popstate', function() {
         if (isAdminAllChatsPage()) {

package/library.js

@@ -830,6 +830,29 @@ function registerRoutes(app, router, middleware) {
             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);
+
+            if (Number.isNaN(roomId)) {
+                return res.status(400).json({ status: { code: 'bad-request', message: 'Invalid room id' } });
+            }
+
+            if (!await roomExists(roomId)) {
+                return res.status(404).json({ status: { code: 'not-found', message: 'Room not found' } });
+            }
+
+            const lockData = await getRoomLockData(roomId);
+            return res.json({
+                status: { code: 'ok', message: 'Lock data retrieved' },
+                roomId,
+                lockData,
+            });
+        } catch (err) {
+            return res.status(500).json({ status: { code: 'error', message: err.message } });
+        }
+    });
 }
 
 async function renderAdminChatsPage(req, res, next) {

package/package.json

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

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

@@ -0,0 +1,12 @@
+{
+  "lock.banner": "🔒 تم قفل هذه الغرفة من قبل المسؤولين.",
+  "menu.lock": "قفل الغرفة",
+  "menu.release": "إزالة القفل",
+  "errors.update": "تعذر تحديث قفل الغرفة.",
+  "profile.viewChats": "عرض الدردشات",
+  "empty.selectChat": "يرجى اختيار دردشة من الشريط الجانبي.",
+  "errors.lockedAction": "لا يمكن تنفيذ هذا الإجراء في غرفة مقفلة.",
+  "admin-chats-view": "عرض جميع الدردشات",
+  "admin-chats-manage": "إدارة غرف الدردشة",
+  "participants": "المشاركون"
+}

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

@@ -0,0 +1,12 @@
+{
+  "lock.banner": "🔒 Dieser Raum wurde von den Administratoren gesperrt.",
+  "menu.lock": "Raum sperren",
+  "menu.release": "Sperre aufheben",
+  "errors.update": "Raumsperre konnte nicht aktualisiert werden.",
+  "profile.viewChats": "Chats ansehen",
+  "empty.selectChat": "Bitte wählen Sie einen Chat in der Seitenleiste aus.",
+  "errors.lockedAction": "Diese Aktion kann in einem gesperrten Raum nicht ausgeführt werden.",
+  "admin-chats-view": "Alle Chats ansehen",
+  "admin-chats-manage": "Chat-Räume verwalten",
+  "participants": "Teilnehmer"
+}

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

@@ -0,0 +1,12 @@
+{
+  "lock.banner": "🔒 Dieser Raum wurde von den Administratoren gesperrt.",
+  "menu.lock": "Raum sperren",
+  "menu.release": "Sperre aufheben",
+  "errors.update": "Raumsperre konnte nicht aktualisiert werden.",
+  "profile.viewChats": "Chats ansehen",
+  "empty.selectChat": "Bitte wählen Sie einen Chat in der Seitenleiste aus.",
+  "errors.lockedAction": "Diese Aktion kann in einem gesperrten Raum nicht ausgeführt werden.",
+  "admin-chats-view": "Alle Chats ansehen",
+  "admin-chats-manage": "Chat-Räume verwalten",
+  "participants": "Teilnehmer"
+}

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

@@ -0,0 +1,12 @@
+{
+  "lock.banner": "🔒 Αυτό το δωμάτιο κλειδώθηκε από τους διαχειριστές.",
+  "menu.lock": "Κλείδωμα δωματίου",
+  "menu.release": "Άρση κλειδώματος",
+  "errors.update": "Δεν ήταν δυνατή η ενημέρωση του κλειδώματος του δωματίου.",
+  "profile.viewChats": "Προβολή συνομιλιών",
+  "empty.selectChat": "Παρακαλώ επιλέξτε μια συνομιλία από την πλαϊνή μπάρα.",
+  "errors.lockedAction": "Αυτή η ενέργεια δεν μπορεί να εκτελεστεί σε κλειδωμένο δωμάτιο.",
+  "admin-chats-view": "Προβολή όλων των συνομιλιών",
+  "admin-chats-manage": "Διαχείριση δωματίων συνομιλίας",
+  "participants": "Συμμετέχοντες"
+}

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

@@ -0,0 +1,12 @@
+{
+  "lock.banner": "🔒 Esta sala fue bloqueada por los administradores.",
+  "menu.lock": "Bloquear sala",
+  "menu.release": "Liberar bloqueo",
+  "errors.update": "No se pudo actualizar el bloqueo de la sala.",
+  "profile.viewChats": "Ver chats",
+  "empty.selectChat": "Seleccione un chat de la barra lateral.",
+  "errors.lockedAction": "Esta acción no se puede realizar en una sala bloqueada.",
+  "admin-chats-view": "Ver todos los chats",
+  "admin-chats-manage": "Administrar salas de chat",
+  "participants": "Participantes"
+}

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

@@ -0,0 +1,12 @@
+{
+  "lock.banner": "🔒 Cette salle a été verrouillée par les administrateurs.",
+  "menu.lock": "Verrouiller la salle",
+  "menu.release": "Déverrouiller",
+  "errors.update": "Impossible de mettre à jour le verrouillage de la salle.",
+  "profile.viewChats": "Voir les discussions",
+  "empty.selectChat": "Veuillez sélectionner une discussion dans la barre latérale.",
+  "errors.lockedAction": "Cette action ne peut pas être effectuée dans une salle verrouillée.",
+  "admin-chats-view": "Voir toutes les discussions",
+  "admin-chats-manage": "Gérer les salons de discussion",
+  "participants": "Participants"
+}

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

@@ -0,0 +1,12 @@
+{
+  "lock.banner": "🔒 इस कमरे को प्रशासकों द्वारा लॉक किया गया था।",
+  "menu.lock": "कमरा लॉक करें",
+  "menu.release": "लॉक हटाएं",
+  "errors.update": "कमरे का लॉक अपडेट नहीं हो सका।",
+  "profile.viewChats": "चैट देखें",
+  "empty.selectChat": "कृपया साइडबार से एक चैट चुनें।",
+  "errors.lockedAction": "लॉक किए गए कमरे में यह कार्रवाई नहीं की जा सकती।",
+  "admin-chats-view": "सभी चैट देखें",
+  "admin-chats-manage": "चैट रूम प्रबंधित करें",
+  "participants": "प्रतिभागी"
+}

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

@@ -0,0 +1,12 @@
+{
+  "lock.banner": "🔒 Questa stanza è stata bloccata dagli amministratori.",
+  "menu.lock": "Blocca stanza",
+  "menu.release": "Rimuovi blocco",
+  "errors.update": "Impossibile aggiornare il blocco della stanza.",
+  "profile.viewChats": "Visualizza chat",
+  "empty.selectChat": "Seleziona una chat dalla barra laterale.",
+  "errors.lockedAction": "Questa azione non può essere eseguita in una stanza bloccata.",
+  "admin-chats-view": "Visualizza tutte le chat",
+  "admin-chats-manage": "Gestisci le stanze di chat",
+  "participants": "Partecipanti"
+}

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

@@ -0,0 +1,12 @@
+{
+  "lock.banner": "🔒 Questa stanza è stata bloccata dagli amministratori.",
+  "menu.lock": "Blocca stanza",
+  "menu.release": "Rimuovi blocco",
+  "errors.update": "Impossibile aggiornare il blocco della stanza.",
+  "profile.viewChats": "Visualizza chat",
+  "empty.selectChat": "Seleziona una chat dalla barra laterale.",
+  "errors.lockedAction": "Questa azione non può essere eseguita in una stanza bloccata.",
+  "admin-chats-view": "Visualizza tutte le chat",
+  "admin-chats-manage": "Gestisci le stanze di chat",
+  "participants": "Partecipanti"
+}

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

@@ -0,0 +1,12 @@
+{
+  "lock.banner": "🔒 このルームは管理者によってロックされました。",
+  "menu.lock": "ルームをロック",
+  "menu.release": "ロック解除",
+  "errors.update": "ルームのロックを更新できませんでした。",
+  "profile.viewChats": "チャットを見る",
+  "empty.selectChat": "サイドバーからチャットを選択してください。",
+  "errors.lockedAction": "ロックされたルームではこの操作は実行できません。",
+  "admin-chats-view": "すべてのチャットを見る",
+  "admin-chats-manage": "チャットルームを管理",
+  "participants": "参加者"
+}

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

@@ -0,0 +1,12 @@
+{
+  "lock.banner": "🔒 Deze chatruimte is door de beheerders vergrendeld.",
+  "menu.lock": "Chatruimte vergrendelen",
+  "menu.release": "Vergrendeling opheffen",
+  "errors.update": "Kon de vergrendeling van de chatruimte niet bijwerken.",
+  "profile.viewChats": "Chats bekijken",
+  "empty.selectChat": "Selecteer een chat in de zijbalk.",
+  "errors.lockedAction": "Deze actie kan niet worden uitgevoerd in een vergrendelde chatruimte.",
+  "admin-chats-view": "Alle chats bekijken",
+  "admin-chats-manage": "Chatruimtes beheren",
+  "participants": "Deelnemers"
+}

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

@@ -0,0 +1,12 @@
+{
+  "lock.banner": "🔒 Ten pokój został zablokowany przez administratorów.",
+  "menu.lock": "Zablokuj pokój",
+  "menu.release": "Odblokuj",
+  "errors.update": "Nie udało się zaktualizować blokady pokoju.",
+  "profile.viewChats": "Wyświetl czaty",
+  "empty.selectChat": "Wybierz czat z paska bocznego.",
+  "errors.lockedAction": "Tej czynności nie można wykonać w zablokowanym pokoju.",
+  "admin-chats-view": "Wyświetl wszystkie czaty",
+  "admin-chats-manage": "Zarządzaj pokojami czatu",
+  "participants": "Uczestnicy"
+}

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

@@ -0,0 +1,12 @@
+{
+  "lock.banner": "🔒 Esta sala foi bloqueada pelos administradores.",
+  "menu.lock": "Bloquear sala",
+  "menu.release": "Desbloquear sala",
+  "errors.update": "Não foi possível atualizar o bloqueio da sala.",
+  "profile.viewChats": "Ver chats",
+  "empty.selectChat": "Selecione um chat na barra lateral.",
+  "errors.lockedAction": "Esta ação não pode ser realizada em uma sala bloqueada.",
+  "admin-chats-view": "Ver todos os chats",
+  "admin-chats-manage": "Gerenciar salas de chat",
+  "participants": "Participantes"
+}

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

@@ -0,0 +1,12 @@
+{
+  "lock.banner": "🔒 Quest locals è vegnì bloccà dals administraturs.",
+  "menu.lock": "Bloccar il local",
+  "menu.release": "Levà il bloc",
+  "errors.update": "Impussibel d'actualisar il bloc dal local.",
+  "profile.viewChats": "Veser chats",
+  "empty.selectChat": "Per plaschair tscherna in chat en la trav laterala.",
+  "errors.lockedAction": "Questa acziun na po betg vegnir fatga en in local bloccà.",
+  "admin-chats-view": "Veser tut ils chats",
+  "admin-chats-manage": "Administrar locals da chat",
+  "participants": "Participonts"
+}

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

@@ -0,0 +1,12 @@
+{
+  "lock.banner": "🔒 Эта комната была заблокирована администраторами.",
+  "menu.lock": "Заблокировать комнату",
+  "menu.release": "Снять блокировку",
+  "errors.update": "Не удалось обновить блокировку комнаты.",
+  "profile.viewChats": "Просмотреть чаты",
+  "empty.selectChat": "Пожалуйста, выберите чат на боковой панели.",
+  "errors.lockedAction": "Это действие нельзя выполнить в заблокированной комнате.",
+  "admin-chats-view": "Просмотреть все чаты",
+  "admin-chats-manage": "Управлять чат-комнатами",
+  "participants": "Участники"
+}

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

@@ -0,0 +1,12 @@
+{
+  "lock.banner": "🔒 Ця кімната заблокована адміністратором.",
+  "menu.lock": "Заблокувати кімнату",
+  "menu.release": "Зняти блокування",
+  "errors.update": "Не вдалося оновити блокування кімнати.",
+  "profile.viewChats": "Переглянути Чати",
+  "empty.selectChat": "Оберіть чат з сайдбару, будь ласка.",
+  "errors.lockedAction": "Цю дію не можна виконати в блокованій кімнаті.",
+  "admin-chats-view": "Переглянути всі чати",
+  "admin-chats-manage": "Керувати чат-кімнатами",
+  "participants": "Учасники"
+}

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

@@ -0,0 +1,12 @@
+{
+  "lock.banner": "🔒 此聊天室已被管理员锁定。",
+  "menu.lock": "锁定聊天室",
+  "menu.release": "解除锁定",
+  "errors.update": "无法更新聊天室锁定状态。",
+  "profile.viewChats": "查看聊天",
+  "empty.selectChat": "请从侧边栏选择一个聊天。",
+  "errors.lockedAction": "锁定的聊天室无法执行此操作。",
+  "admin-chats-view": "查看所有聊天",
+  "admin-chats-manage": "管理聊天室",
+  "participants": "参与者"
+}

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

@@ -0,0 +1,12 @@
+{
+  "lock.banner": "🔒 此聊天室已被管理員鎖定。",
+  "menu.lock": "鎖定聊天室",
+  "menu.release": "解除鎖定",
+  "errors.update": "無法更新聊天室鎖定狀態。",
+  "profile.viewChats": "查看聊天",
+  "empty.selectChat": "請從側邊欄選擇一個聊天。",
+  "errors.lockedAction": "鎖定的聊天室無法執行此操作。",
+  "admin-chats-view": "查看所有聊天",
+  "admin-chats-manage": "管理聊天室",
+  "participants": "參與者"
+}