nodebb-plugin-discord-onekite 1.0.2 → 1.0.3

package/README.md

@@ -1,7 +1,8 @@
-# nodebb-plugin-discord-onekite (NodeBB v4.x) — v1.0.1
+# nodebb-plugin-discord-onekite (NodeBB v4.x) — v1.0.2
 
-Fix: template build errors by removing inline <script> from the .tpl and using acpScripts properly.
+Fix ACP issues:
+- Uses `modules` mapping so `require('admin/plugins/discord-onekite')` always resolves.
+- Multi-select uses `name="cids[]"` so selections persist.
+- Also hooks `action:ajaxify.end` as a fallback in admin to re-init after navigation.
 
-- Categories list loads in ACP
-- Settings save works
-- No categories selected => notify all
+Requirement: no categories selected => notify all.

package/library.js

@@ -15,14 +15,13 @@ const SETTINGS_KEY = 'discord-onekite';
 function normalizeCids(value) {
   if (!value) return [];
   if (Array.isArray(value)) return value.map(v => String(v)).filter(Boolean);
-  if (typeof value === 'string') {
-    return value.split(',').map(s => s.trim()).filter(Boolean);
-  }
+  if (typeof value === 'string') return value.split(',').map(s => s.trim()).filter(Boolean);
   return [];
 }
 
 async function getSettings() {
   const s = await meta.settings.get(SETTINGS_KEY);
+  // Note: when select name is cids[], nodebb may save it as array or comma string; normalize handles both.
   return {
     webhookUrl: (s && s.webhookUrl) ? String(s.webhookUrl).trim() : '',
     notifyReplies: !!(s && (s.notifyReplies === true || s.notifyReplies === 'on' || s.notifyReplies === 'true')),
@@ -31,8 +30,7 @@ async function getSettings() {
 }
 
 function cidAllowed(topicCid, allowedCids) {
-  // none selected => ALL
-  if (!allowedCids || allowedCids.length === 0) return true;
+  if (!allowedCids || allowedCids.length === 0) return true; // none selected => ALL
   return allowedCids.includes(String(topicCid));
 }
 
@@ -69,9 +67,7 @@ async function buildTopicEmbed({ tid, pid, type }) {
     footer: { text: 'NodeBB → Discord (Onekite)' },
   };
 
-  if (isReply) {
-    embed.description = 'Nouvelle réponse dans un sujet.';
-  }
+  if (isReply) embed.description = 'Nouvelle réponse dans un sujet.';
 
   return { topicData, embed };
 }
@@ -118,7 +114,6 @@ Plugin.onTopicSave = async (data) => {
 
     await postToDiscord(settings.webhookUrl, { embeds: [built.embed] });
   } catch (err) {
-    // eslint-disable-next-line no-console
     console.error(err);
   }
 };
@@ -144,7 +139,6 @@ Plugin.onPostSave = async (data) => {
 
     await postToDiscord(settings.webhookUrl, { embeds: [built.embed] });
   } catch (err) {
-    // eslint-disable-next-line no-console
     console.error(err);
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-discord-onekite",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Discord webhook notifier for Onekite (NodeBB v4.x only)",
   "main": "library.js",
   "license": "MIT",

package/plugin.json

@@ -10,5 +10,7 @@
     { "hook": "action:post.save", "method": "onPostSave" }
   ],
   "templates": "static/templates",
-  "acpScripts": ["static/lib/admin.js"]
+  "modules": {
+    "../admin/plugins/discord-onekite.js": "./static/lib/admin.js"
+  }
 }

package/static/lib/admin.js

@@ -1,61 +1,69 @@
 'use strict';
-/* global $, app */
+/* global $, app, ajaxify */
 
 define('admin/plugins/discord-onekite', ['settings', 'api'], function (settings, api) {
   const ACP = {};
+  let initialized = false;
 
   function normalizeCids(v) {
     if (!v) return [];
     if (Array.isArray(v)) return v.map(String).filter(Boolean);
-    if (typeof v === 'string') {
-      return v.split(',').map(s => s.trim()).filter(Boolean);
-    }
+    if (typeof v === 'string') return v.split(',').map(s => s.trim()).filter(Boolean);
     return [];
   }
 
-  ACP.init = async function () {
-    const $form = $('.discord-onekite-settings');
+  async function loadCategoriesIntoSelect(savedCids) {
     const $select = $('#cids');
+    if (!$select.length) return;
 
-    // Load current saved settings (including cids) BEFORE fetching categories,
-    // so we can apply selection after options are created.
-    let saved = {};
-    try {
-      saved = await new Promise((resolve) => {
-        settings.get('discord-onekite', (data) => resolve(data || {}));
+    const res = await api.get('/categories');
+
+    // Depending on endpoint, categories may be at res.categories or res.category
+    const categories = (res && (res.categories || res.category || res.data || [])) || [];
+    const list = Array.isArray(categories) ? categories : [];
+
+    $select.empty();
+    list
+      .filter(c => c && typeof c.cid !== 'undefined' && c.name)
+      .forEach(c => {
+        const cid = String(c.cid);
+        const $opt = $('<option />').val(cid).text(c.name);
+        if (savedCids.includes(cid)) $opt.prop('selected', true);
+        $opt.appendTo($select);
       });
-    } catch (e) {
-      saved = {};
+  }
+
+  ACP.init = async function () {
+    // NodeBB will call init() on page load for template admin/plugins/discord-onekite.
+    // But ACP is ajaxified; ensure we don't double-bind.
+    if (initialized) {
+      return;
     }
+    initialized = true;
 
-    // Populate simple fields (webhookUrl, notifyReplies, etc.)
-    settings.load('discord-onekite', $form);
+    const $form = $('.discord-onekite-settings');
+    if (!$form.length) return;
+
+    // 1) Load raw settings first (to get cids)
+    const saved = await new Promise((resolve) => {
+      settings.get('discord-onekite', (data) => resolve(data || {}));
+    });
 
     const savedCids = normalizeCids(saved.cids);
 
-    // Fetch categories list and populate select
-    try {
-      const res = await api.get('/categories');
-      const categories = (res && res.categories) ? res.categories : [];
+    // 2) Populate fields
+    settings.load('discord-onekite', $form);
 
-      $select.empty();
-      categories
-        .filter(c => c && typeof c.cid !== 'undefined' && c.name)
-        .forEach(c => {
-          const cid = String(c.cid);
-          const $opt = $('<option />').val(cid).text(c.name);
-          if (savedCids.includes(cid)) {
-            $opt.prop('selected', true);
-          }
-          $opt.appendTo($select);
-        });
+    // 3) Populate categories + apply selection
+    try {
+      await loadCategoriesIntoSelect(savedCids);
     } catch (e) {
       // eslint-disable-next-line no-console
-      console.error('[discord-onekite] Could not load categories', e);
+      console.error('[discord-onekite] categories load failed', e);
       app.alertError('Impossible de charger la liste des catégories.');
     }
 
-    // Save button
+    // 4) Save
     $('#save').off('click.discordOnekite').on('click.discordOnekite', function () {
       settings.save('discord-onekite', $form, function () {
         app.alertSuccess('Paramètres enregistrés !');
@@ -63,5 +71,13 @@ define('admin/plugins/discord-onekite', ['settings', 'api'], function (settings,
     });
   };
 
+  // In case NodeBB doesn't call init (theme/custom admin), also listen for ajaxify end
+  $(window).off('action:ajaxify.end.discordOnekite').on('action:ajaxify.end.discordOnekite', function () {
+    if (ajaxify && ajaxify.data && ajaxify.data.template === 'admin/plugins/discord-onekite') {
+      initialized = false;
+      ACP.init();
+    }
+  });
+
   return ACP;
 });

package/static/templates/admin/plugins/discord-onekite.tpl

@@ -8,9 +8,6 @@
     <div class="mb-3">
       <label class="form-label" for="webhookUrl">Discord Webhook URL</label>
       <input type="text" class="form-control" id="webhookUrl" name="webhookUrl" placeholder="https://discord.com/api/webhooks/..." />
-      <p class="form-text text-muted">
-        Discord → Salon #notifications → Intégrations → Webhooks → Copier l’URL.
-      </p>
     </div>
 
     <div class="form-check mb-3">
@@ -22,7 +19,7 @@
 
     <div class="mb-3">
       <label class="form-label" for="cids">Catégories à notifier</label>
-      <select class="form-select" id="cids" name="cids" multiple size="12"></select>
+      <select class="form-select" id="cids" name="cids[]" multiple size="12"></select>
       <p class="form-text text-muted">
         Si aucune catégorie n’est sélectionnée : <strong>toutes les catégories</strong> seront notifiées.
       </p>