nodebb-plugin-discord-onekite 1.0.1 → 1.0.2

package/README.md

@@ -1,5 +1,7 @@
-# nodebb-plugin-discord-onekite (NodeBB v4.x) — v1.0.0 (ACP fix)
+# nodebb-plugin-discord-onekite (NodeBB v4.x) — v1.0.1
 
-- Catégories listées dans l'ACP (chargées via /api/categories)
-- Sauvegarde via settings.save
-- Aucune catégorie sélectionnée => toutes
+Fix: template build errors by removing inline <script> from the .tpl and using acpScripts properly.
+
+- Categories list loads in ACP
+- Settings save works
+- No categories selected => notify all

package/library.js

@@ -31,7 +31,7 @@ async function getSettings() {
 }
 
 function cidAllowed(topicCid, allowedCids) {
-  // requirement: none selected => ALL
+  // none selected => ALL
   if (!allowedCids || allowedCids.length === 0) return true;
   return allowedCids.includes(String(topicCid));
 }
@@ -118,6 +118,7 @@ Plugin.onTopicSave = async (data) => {
 
     await postToDiscord(settings.webhookUrl, { embeds: [built.embed] });
   } catch (err) {
+    // eslint-disable-next-line no-console
     console.error(err);
   }
 };
@@ -143,6 +144,7 @@ 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.1",
+  "version": "1.0.2",
   "description": "Discord webhook notifier for Onekite (NodeBB v4.x only)",
   "main": "library.js",
   "license": "MIT",

package/plugin.json

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

package/static/lib/admin.js

@@ -0,0 +1,67 @@
+'use strict';
+/* global $, app */
+
+define('admin/plugins/discord-onekite', ['settings', 'api'], function (settings, api) {
+  const ACP = {};
+
+  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 [];
+  }
+
+  ACP.init = async function () {
+    const $form = $('.discord-onekite-settings');
+    const $select = $('#cids');
+
+    // 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 || {}));
+      });
+    } catch (e) {
+      saved = {};
+    }
+
+    // Populate simple fields (webhookUrl, notifyReplies, etc.)
+    settings.load('discord-onekite', $form);
+
+    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 : [];
+
+      $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 (e) {
+      // eslint-disable-next-line no-console
+      console.error('[discord-onekite] Could not load categories', e);
+      app.alertError('Impossible de charger la liste des catégories.');
+    }
+
+    // Save button
+    $('#save').off('click.discordOnekite').on('click.discordOnekite', function () {
+      settings.save('discord-onekite', $form, function () {
+        app.alertSuccess('Paramètres enregistrés !');
+      });
+    });
+  };
+
+  return ACP;
+});

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

@@ -31,60 +31,3 @@
     <!-- IMPORT admin/partials/save_button.tpl -->
   </form>
 </div>
-
-<script>
-require(['settings', 'api'], function (settings, api) {
-  var $form = $('.discord-onekite-settings');
-  var $select = $('#cids');
-
-  function normalizeCids(v) {
-    if (!v) { return []; }
-    if (Array.isArray(v)) { return v.map(String); }
-    if (typeof v === 'string') {
-      return v.split(',').map(function (s) { return s.trim(); }).filter(Boolean);
-    }
-    return [];
-  }
-
-  // 1) Load saved settings (fills webhookUrl + checkbox; we also keep cids for later)
-  settings.get('discord-onekite', function (saved) {
-    saved = saved || {};
-    // Populate simple fields now
-    settings.load('discord-onekite', $form);
-
-    var savedCids = normalizeCids(saved.cids);
-
-    // 2) Load categories, then build options, then apply saved selection
-    api.get('/categories', {}).then(function (res) {
-      var categories = (res && res.categories) ? res.categories : [];
-      $select.empty();
-
-      categories
-        .filter(function (c) { return c && typeof c.cid !== 'undefined' && c.name; })
-        .forEach(function (c) {
-          var opt = $('<option />').val(String(c.cid)).text(c.name);
-          if (savedCids.includes(String(c.cid))) {
-            opt.prop('selected', true);
-          }
-          opt.appendTo($select);
-        });
-    }).catch(function (e) {
-      console.error('[discord-onekite] Could not load categories', e);
-      if (window.app && app.alertError) {
-        app.alertError('Impossible de charger la liste des catégories.');
-      } else {
-        alert('Impossible de charger la liste des catégories.');
-      }
-    });
-
-    // 3) Save handler
-    $('#save').off('click.discordOnekite').on('click.discordOnekite', function () {
-      settings.save('discord-onekite', $form, function () {
-        if (window.app && app.alertSuccess) {
-          app.alertSuccess('Paramètres enregistrés !');
-        }
-      });
-    });
-  });
-});
-</script>