nodebb-plugin-admin-chats 3.0.1 → 3.1.1

package/client.js

@@ -1,35 +1,38 @@
 $(document).ready(function() {
+    
+    // Initialize translations object if not already set
+    if (!window.adminChatsTranslations) {
+        window.adminChatsTranslations = {};
+    }
+    
+    
+    // Get translations from ajaxify.data if available
+    if (ajaxify.data && ajaxify.data.adminChatsTranslations) {
+        window.adminChatsTranslations = ajaxify.data.adminChatsTranslations;
+        window.adminChatsLanguage = ajaxify.data.adminChatsLanguage;
+        window.adminChatsAccess = ajaxify.data.adminChatsAccess;
+        window.adminChatsIsAdmin = ajaxify.data.adminChatsIsAdmin;
+        window.adminChatsCanManage = ajaxify.data.adminChatsCanManage;
+    }
+    
     syncAdminAccessFromAjaxify();
     fetchAdminPrivileges();
     const LOCK_PREFIX = '[admin-chat-lock]';
     const roomStateCache = new Map();
-    const TEXT = {
-        he: {
-            lockBanner: '🔒 חדר זה ננעל ע"י המנהלים.',
-            menuLock: 'נעל חדר',
-            menuRelease: 'שחרר נעילה',
-            updateError: 'לא ניתן לעדכן את נעילת החדר.',
-            viewChats: "צפיה בצ'אטים",
-            emptyState: "אנא בחר צ'אט מסרגל הצד.",
-            participants: 'משתתפים',
-        },
-        en: {
-            lockBanner: '🔒 This room was locked by the administrators.',
-            menuLock: 'Lock Room',
-            menuRelease: 'Release Lock',
-            updateError: 'Unable to update room lock.',
-            viewChats: 'View Chats',
-            emptyState: 'Please select a chat from the sidebar.',
-            participants: 'Participants',
-        },
-    };
 
-    function isEnglishSystem() {
-        return $('html').attr('lang') && $('html').attr('lang').startsWith('en');
-    }
     function t(key) {
-        const dict = isEnglishSystem() ? TEXT.en : TEXT.he;
-        return dict[key];
+        // Get translation from server (from language files)
+        if (window.adminChatsTranslations && window.adminChatsTranslations[key]) {
+            return window.adminChatsTranslations[key];
+        }
+        // If translation not found, log warning and return the key itself
+        return key;
+    }
+    
+    function isEnglishSystem() {
+        const lang = window.adminChatsLanguage || $('html').attr('lang') || 'en';
+        const langCode = lang.split('-')[0];
+        return langCode === 'en';
     }
 
     function hasAdminChatsAccess() {
@@ -129,8 +132,8 @@ $(document).ready(function() {
 
     // Get lockedAction message from server translations only (based on forum settings)
     function getLockedActionMessage() {
-        if (window.adminChatsTranslations && window.adminChatsTranslations.lockedAction) {
-            return window.adminChatsTranslations.lockedAction;
+        if (window.adminChatsTranslations && window.adminChatsTranslations['errors.lockedAction']) {
+            return window.adminChatsTranslations['errors.lockedAction'];
         }
         // If server translation not available, default to English
         return 'This action cannot be performed in a locked room.';
@@ -281,14 +284,25 @@ $(document).ready(function() {
                 currentText.includes('You have no active chats') ||
                 currentText === 'You have no active chats.'
             ) {
-                $(this).text(t('emptyState'));
+                $(this).text(t('empty.selectChat'));
                 $(this).removeClass('text-muted');
             }
         });
     }
 
     function getChatWindows() {
-        return $('[component="chat/message/window"]');
+        const windows = new Set($('[component="chat/message/window"]').toArray());
+        $('.chat-modal').each(function() {
+            const $modal = $(this);
+            const nested = $modal.find('[component="chat/message/window"]').toArray();
+            if (nested.length) {
+                nested.forEach(el => windows.delete(el));
+                windows.add(this);
+            } else {
+                windows.add(this);
+            }
+        });
+        return $(Array.from(windows));
     }
 
     function getWindowRoomId($window) {
@@ -416,7 +430,7 @@ $(document).ready(function() {
         }
 
         const positionStyle = isEnglishSystem() ? 'float:right; clear:both;' : 'float:left; clear:both;';
-        target.prepend(`<div class="admin-chat-lock-banner alert alert-warning mb-2 text-start" style="${positionStyle} max-width: fit-content;">${t('lockBanner')}</div>`);
+        target.prepend(`<div class="admin-chat-lock-banner alert alert-warning mb-2 text-start" style="${positionStyle} max-width: fit-content;">${t('lock.banner')}</div>`);
     }
 
     function updateLockedActionVisibility($window, hidden) {
@@ -457,7 +471,7 @@ $(document).ready(function() {
             if (!text.includes(LOCK_PREFIX.slice(1, -1)) && !text.includes('admin-chat-lock')) {
                 return;
             }
-            $el.text(t('lockBanner'));
+            $el.text(t('lock.banner'));
         });
     }
 
@@ -483,7 +497,7 @@ $(document).ready(function() {
 
         const lockData = roomData.adminChatLock || {};
         const isLocked = !!lockData.isLocked;
-        const itemText = isLocked ? t('menuRelease') : t('menuLock');
+        const itemText = isLocked ? t('menu.release') : t('menu.lock');
         const iconClass = isLocked ? 'fa-lock-open' : 'fa-lock';
         const menuItemHtml = `
             <li role="presentation" class="admin-chat-lock-item-wrap">
@@ -609,7 +623,7 @@ $(document).ready(function() {
             <li role="presentation" class="admin-chats-profile-link">
                 <a class="dropdown-item rounded-1 d-flex align-items-center gap-2" href="${relativePath}/user/${userSlug}/chats" role="menuitem">
                     <i class="far fa-fw fa-comments"></i>
-                    <span>${t("viewChats")}</span>
+                    <span>${t("profile.viewChats")}</span>
                 </a>
             </li>
         `;
@@ -804,7 +818,7 @@ $(document).ready(function() {
             setCachedRoomData(roomId, cached);
             await refreshChatUi();
         } catch (err) {
-            app.alertError(t('updateError'));
+            app.alertError(t('errors.update'));
             $button.removeClass('disabled').removeAttr('aria-disabled');
         }
     });
@@ -823,3 +837,4 @@ $(document).ready(function() {
         app.alertError._adminChatsWrapped = true;
     }
 });
+

package/library.js

@@ -7,13 +7,83 @@ const db = require.main.require('./src/database');
 const meta = require.main.require('./src/meta');
 const privileges = require.main.require('./src/privileges');
 const helpers = require.main.require('./src/controllers/helpers');
+const fs = require('fs');
+const path = require('path');
 
 const plugin = {};
 const LOCK_PREFIX = '[admin-chat-lock]';
-const LOCKED_MESSAGE_TEXT = '🔒 חדר זה ננעל ע"י המנהלים.';
+const LOCKED_MESSAGE_TEXT_KEY = 'lock.banner';
 const ADMIN_CHATS_PRIVILEGE = 'admin-chats:view';
 const ADMIN_CHATS_MANAGE_PRIVILEGE = 'admin-chats:manage';
 
+// Load translations from language files
+const translations = {};
+function loadTranslations() {
+    // Try multiple possible paths
+    const possiblePaths = [
+        path.join(__dirname, 'public', 'languages'),
+        path.join(__dirname, '..', '..', 'public', 'languages'),
+        path.resolve(__dirname, 'public', 'languages'),
+    ];
+    
+    let languagesDir = null;
+    for (const dir of possiblePaths) {
+        if (fs.existsSync(dir)) {
+            languagesDir = dir;
+            break;
+        }
+    }
+    
+    if (!languagesDir) {
+        return;
+    }
+    
+    try {
+        const langs = fs.readdirSync(languagesDir);
+        langs.forEach(lang => {
+            const langPath = path.join(languagesDir, lang, 'admin-chats.json');
+            try {
+                if (fs.existsSync(langPath)) {
+                    const content = fs.readFileSync(langPath, 'utf8');
+                    translations[lang] = JSON.parse(content);
+                }
+            } catch (err) {
+                console.error(`[admin-chats] Error loading translations for ${lang}:`, err.message);
+            }
+        });
+    } catch (err) {
+        console.error(`[admin-chats] Error reading languages directory:`, err.message);
+    }
+}
+loadTranslations();
+function getTranslationForLang(lang, key) {
+    if (!key) {
+        return '';
+    }
+    if (lang && translations[lang] && translations[lang][key]) {
+        return translations[lang][key];
+    }
+    const langCode = lang ? lang.split('-')[0] : '';
+    if (langCode && translations[langCode] && translations[langCode][key]) {
+        return translations[langCode][key];
+    }
+    if (translations.en && translations.en[key]) {
+        return translations.en[key];
+    }
+    if (translations['en-GB'] && translations['en-GB'][key]) {
+        return translations['en-GB'][key];
+    }
+    return '';
+}
+
+function getDefaultLockMessage() {
+    const defaultLang = meta.config.defaultLang || 'en-GB';
+    return getTranslationForLang(defaultLang, LOCKED_MESSAGE_TEXT_KEY)
+        || getTranslationForLang('en-GB', LOCKED_MESSAGE_TEXT_KEY)
+        || getTranslationForLang('en', LOCKED_MESSAGE_TEXT_KEY)
+        || 'This room was locked by the administrators.';
+}
+
 async function getLockedActionMessage(uid) {
     try {
         const userData = await User.getUserData(uid);
@@ -21,15 +91,22 @@ async function getLockedActionMessage(uid) {
         
         // If user doesn't have specific language setting, use forum default
         if (!userLang) {
-            const meta = require.main.require('./src/meta');
             userLang = meta.config.defaultLang || 'en-GB';
         }
         
-        if (userLang === 'he' || userLang === 'he-IL') {
-            return 'לא ניתן לבצע פעולה זו בחדר נעול';
-        } else {
-            return 'This action cannot be performed in a locked room.';
+        // Extract language code (e.g., 'he' from 'he-IL', 'fr' from 'fr-FR')
+        const langCode = userLang.split('-')[0];
+        
+        // Try to get translation from loaded files
+        if (translations[langCode] && translations[langCode]['errors.lockedAction']) {
+            return translations[langCode]['errors.lockedAction'];
+        }
+        if (translations[userLang] && translations[userLang]['errors.lockedAction']) {
+            return translations[userLang]['errors.lockedAction'];
         }
+        
+        // Fallback to English only
+        return 'This action cannot be performed in a locked room.';
     } catch (err) {
         // Default to English if we can't determine language
         return 'This action cannot be performed in a locked room.';
@@ -77,6 +154,13 @@ plugin.init = async function (params) {
     overrideMessagingFunctions();
     overrideChatsApi();
     overrideCoreChatRedirect(params.controllers);
+    
+    // Add middleware to inject translations into every page
+    params.app.use((req, res, next) => {
+        // Store translations in res.locals so they can be accessed in templates
+        res.locals.adminChatsTranslations = translations;
+        next();
+    });
 };
 plugin.registerPrivileges = async function (data) {
     if (!data || !data.privileges || typeof data.privileges.set !== 'function') {
@@ -153,43 +237,106 @@ plugin.filterUserNotificationsGetNotifications = async function (data) {
 
     return data;
 };
-plugin.addScripts = async function (data) {
-    let isHebrew = false;
-    
-    const uid = data.req && data.req.uid;
+async function buildAdminChatsClientContext(req) {
+    const uid = req && req.uid;
+
+    let userLang = 'en-GB';
+
     if (uid) {
         try {
             const userData = await User.getUserData(uid);
-            let userLang = userData && userData.settings && userData.userLang;
-            
+
+            // Try different ways to get user language
+            userLang = userData && userData.userLang;
+            if (!userLang && userData && userData.settings) {
+                userLang = userData.settings.userLang;
+            }
+
             // If user doesn't have specific language setting, use forum default
             if (!userLang) {
-                const meta = require.main.require('./src/meta');
                 userLang = meta.config.defaultLang || 'en-GB';
             }
-            
-            isHebrew = userLang === 'he' || userLang === 'he-IL';
         } catch (err) {
-            // Default to English if error
-            isHebrew = false;
+            console.error(`[admin-chats] Error getting user language:`, err.message);
+            userLang = meta.config.defaultLang || 'en-GB';
         }
+    } else {
+        // No uid, use forum default language
+        userLang = meta.config.defaultLang || 'en-GB';
     }
-    
-    // Only send the lockedAction translation from server
-    const translations = {
-        lockedAction: isHebrew ? 'לא ניתן לבצע פעולה זו בחדר נעול' : 'This action cannot be performed in a locked room.',
-    };
+
+    // Build translations based on user language from loaded files
+    let clientTranslations = {};
+    const langCode = userLang.split('-')[0];
+
+
+    // Try to get translations from loaded files
+    // First try exact match (e.g., 'he-IL')
+    if (translations[userLang]) {
+        clientTranslations = translations[userLang];
+    }
+    // Then try language code (e.g., 'he' from 'he-IL')
+    else if (translations[langCode]) {
+        clientTranslations = translations[langCode];
+    }
+    // Then try full locale (e.g., 'en-GB')
+    else if (translations[userLang.replace('-', '-')]) {
+        clientTranslations = translations[userLang];
+    }
+    // Fallback to English
+    else {
+        clientTranslations = translations['en'] || translations['en-GB'] || {};
+    }
+
 
     const isAdmin = uid ? await User.isAdministrator(uid) : false;
     const adminChatsManage = uid ? (isAdmin || await privileges.global.can(ADMIN_CHATS_MANAGE_PRIVILEGE, uid)) : false;
     const adminChatsAccess = uid ? (isAdmin || adminChatsManage || await privileges.global.can(ADMIN_CHATS_PRIVILEGE, uid)) : false;
 
+    return {
+        clientTranslations,
+        userLang,
+        adminChatsAccess,
+        adminChatsIsAdmin: isAdmin,
+        adminChatsCanManage: adminChatsManage,
+    };
+}
+
+plugin.addTemplateData = async function (data) {
+    const templateData = data && data.templateData ? data.templateData : null;
+    if (!templateData) {
+        return data;
+    }
+
+    const context = await buildAdminChatsClientContext(data.req);
+    templateData.adminChatsTranslations = context.clientTranslations;
+    templateData.adminChatsLanguage = context.userLang;
+    templateData.adminChatsAccess = context.adminChatsAccess;
+    templateData.adminChatsIsAdmin = context.adminChatsIsAdmin;
+    templateData.adminChatsCanManage = context.adminChatsCanManage;
+
+    return data;
+};
+
+plugin.addScripts = async function (data) {
+    const context = await buildAdminChatsClientContext(data.req);
+
+    // Add translations directly to data object
+    data.adminChatsTranslations = context.clientTranslations;
+    data.adminChatsLanguage = context.userLang;
+    data.adminChatsAccess = context.adminChatsAccess;
+    data.adminChatsIsAdmin = context.adminChatsIsAdmin;
+    data.adminChatsCanManage = context.adminChatsCanManage;
+
+    // Also add as inline script to ensure it's available before client.js runs
     data.scripts = data.scripts || [];
+    const scriptContent = `window.adminChatsTranslations = ${JSON.stringify(context.clientTranslations)}; window.adminChatsLanguage = '${context.userLang}'; window.adminChatsAccess = ${context.adminChatsAccess}; window.adminChatsIsAdmin = ${context.adminChatsIsAdmin}; window.adminChatsCanManage = ${context.adminChatsCanManage};`;
     data.scripts.push({
         src: false,
-        script: `window.adminChatsTranslations = ${JSON.stringify(translations)}; window.adminChatsAccess = ${adminChatsAccess}; window.adminChatsIsAdmin = ${isAdmin}; window.adminChatsCanManage = ${adminChatsManage};`
+        script: scriptContent
     });
 
+
     return data;
 };
 
@@ -1003,7 +1150,7 @@ function buildRoomMessagesWithLockNotice(messages, lockData) {
     }
 
     cleanedMessages.push({
-        content: `${LOCK_PREFIX} ${LOCKED_MESSAGE_TEXT}`,
+        content: `${LOCK_PREFIX} ${getDefaultLockMessage()}`,
         fromuid: lockData.lockedBy,
         uid: lockData.lockedBy,
         timestamp: lockData.lockedAt,
@@ -1029,7 +1176,7 @@ function stripAdminLockMessages(messages) {
 function isAdminLockMessage(msg) {
     const content = String(msg && msg.content || '');
     return content.includes('admin-chat-lock') ||
-        content.includes(LOCKED_MESSAGE_TEXT) ||
+        content.includes(getDefaultLockMessage()) ||
         content.includes('נפתח מחדש ע"י המנהלים') ||
         content.includes('modules:chat.system.[admin-chat-lock]');
 }
@@ -1070,3 +1217,12 @@ function getRoomId(payload) {
 }
 
 module.exports = plugin;
+
+
+
+
+
+
+
+
+

package/package.json

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

package/plugin.json

@@ -61,8 +61,8 @@
       "method": "filterRenameRoom"
     },
     {
-      "hook": "filter:scripts.get",
-      "method": "addScripts"
+      "hook": "filter:middleware.render",
+      "method": "addTemplateData"
     },
     {
       "hook": "filter:notifications.create",
@@ -79,3 +79,6 @@
   ],
   "languages": "public/languages"
 }
+
+
+

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

@@ -0,0 +1,12 @@
+{
+  "lock.banner": "🔒 This room was locked by the administrators.",
+  "menu.lock": "Lock Room",
+  "menu.release": "Release Lock",
+  "errors.update": "Unable to update room lock.",
+  "profile.viewChats": "View Chats",
+  "empty.selectChat": "Please select a chat from the sidebar.",
+  "errors.lockedAction": "This action cannot be performed in a locked room.",
+  "admin-chats-view": "View all chats",
+  "admin-chats-manage": "Manage chat rooms",
+  "participants": "Participants"
+}

package/public/languages/en-GB/admin-chats.json

@@ -7,5 +7,6 @@
   "empty.selectChat": "Please select a chat from the sidebar.",
   "errors.lockedAction": "This action cannot be performed in a locked room.",
   "admin-chats-view": "View all chats",
-  "admin-chats-manage": "Manage chat rooms"
+  "admin-chats-manage": "Manage chat rooms",
+  "participants": "Participants"
 }

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

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

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

@@ -7,5 +7,6 @@
   "empty.selectChat": "אנא בחר צ'אט מסרגל הצד.",
   "errors.lockedAction": "לא ניתן לבצע פעולה זו בחדר נעול",
   "admin-chats-view": "צפיה בכל הצ'אטים",
-  "admin-chats-manage": "ניהול חדרי צ'אט"
+  "admin-chats-manage": "ניהול חדרי צ'אט",
+  "participants": "משתתפים"
 }