nodebb-plugin-discord-onekite 1.0.3 → 1.0.5

package/README.md

@@ -1,8 +1,7 @@
-# nodebb-plugin-discord-onekite (NodeBB v4.x) — v1.0.2
+# nodebb-plugin-discord-onekite (NodeBB v4.x) — v1.0.4
 
-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.
+This version follows the most compatible ACP pattern used by many official/community plugins:
 
-Requirement: no categories selected => notify all.
+- Templates are in `templates/` (not `static/templates/`)
+- ACP script is loaded via `acpScripts` and runs globally on `action:ajaxify.end`
+- No reliance on `modules` name matching

package/library.js

@@ -21,7 +21,6 @@ function normalizeCids(value) {
 
 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')),
@@ -30,7 +29,7 @@ async function getSettings() {
 }
 
 function cidAllowed(topicCid, allowedCids) {
-  if (!allowedCids || allowedCids.length === 0) return true; // none selected => ALL
+  if (!allowedCids || allowedCids.length === 0) return true;
   return allowedCids.includes(String(topicCid));
 }
 

package/package.json

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

package/plugin.json

@@ -9,8 +9,6 @@
     { "hook": "action:topic.save", "method": "onTopicSave" },
     { "hook": "action:post.save", "method": "onPostSave" }
   ],
-  "templates": "static/templates",
-  "modules": {
-    "../admin/plugins/discord-onekite.js": "./static/lib/admin.js"
-  }
+  "templates": "templates",
+  "acpScripts": ["static/lib/admin.js"]
 }

package/static/lib/admin.js

@@ -1,83 +1,67 @@
 'use strict';
 /* 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);
-    return [];
-  }
-
-  async function loadCategoriesIntoSelect(savedCids) {
-    const $select = $('#cids');
-    if (!$select.length) return;
-
-    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);
-      });
-  }
-
-  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) {
+(function () {
+  function initOnekiteACP() {
+    if (!ajaxify || !ajaxify.data || ajaxify.data.template !== 'admin/plugins/discord-onekite') {
       return;
     }
-    initialized = true;
 
-    const $form = $('.discord-onekite-settings');
-    if (!$form.length) return;
+    // Use NodeBB's AMD loader to access core helpers
+    require(['settings', 'api'], function (settings, api) {
+      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 || {}));
-    });
+      // Avoid double-binding
+      if ($form.data('onekite-initialized')) return;
+      $form.data('onekite-initialized', true);
 
-    const savedCids = normalizeCids(saved.cids);
+      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);
+        return [];
+      }
 
-    // 2) Populate fields
-    settings.load('discord-onekite', $form);
+      // Load saved settings into the form
+      settings.load('discord-onekite', $form);
 
-    // 3) Populate categories + apply selection
-    try {
-      await loadCategoriesIntoSelect(savedCids);
-    } catch (e) {
-      // eslint-disable-next-line no-console
-      console.error('[discord-onekite] categories load failed', e);
-      app.alertError('Impossible de charger la liste des catégories.');
-    }
+      // Get raw settings so we can pre-select categories
+      settings.get('discord-onekite', function (saved) {
+        saved = saved || {};
+        const savedCids = normalizeCids(saved.cids);
 
-    // 4) Save
-    $('#save').off('click.discordOnekite').on('click.discordOnekite', function () {
-      settings.save('discord-onekite', $form, function () {
-        app.alertSuccess('Paramètres enregistrés !');
+        // Load categories (admin should have access)
+        api.get('/categories').then(function (res) {
+          const categories = (res && res.categories) ? res.categories : [];
+          const $select = $('#cids');
+          $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);
+            });
+        }).catch(function (e) {
+          // eslint-disable-next-line no-console
+          console.error('[discord-onekite] GET /api/categories failed', e);
+          if (app && app.alertError) app.alertError('Impossible de charger les catégories (GET /api/categories).');
+        });
       });
-    });
-  };
 
-  // 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();
-    }
-  });
+      // Save
+      $('#save').off('click.discordOnekite').on('click.discordOnekite', function () {
+        settings.save('discord-onekite', $form, function () {
+          if (app && app.alertSuccess) app.alertSuccess('Paramètres enregistrés !');
+        });
+      });
+    });
+  }
 
-  return ACP;
-});
+  // Run on initial load and after ajax navigation in ACP
+  $(window).on('action:ajaxify.end', initOnekiteACP);
+  $(initOnekiteACP);
+})();

package/{static/templates → templates}/admin/plugins/discord-onekite.tpl

@@ -1,7 +1,7 @@
 <div class="acp-page-container">
   <h4>Discord Onekite</h4>
   <p class="text-muted">
-    Envoie une notification dans Discord via webhook, avec filtres par catégories.
+    Notifications Discord via webhook.
   </p>
 
   <form role="form" class="discord-onekite-settings">
@@ -19,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>