nodebb-plugin-discord-onekite 1.0.0 → 1.0.1

package/README.md

@@ -1,20 +1,5 @@
-# nodebb-plugin-discord-onekite (NodeBB v4.x)
+# nodebb-plugin-discord-onekite (NodeBB v4.x) — v1.0.0 (ACP fix)
 
-Plugin NodeBB qui notifie un salon Discord via **webhook** lors :
-- des **nouveaux sujets**
-- et optionnellement des **réponses**
-
-## Installation (local)
-Depuis le dossier NodeBB :
-
-```bash
-npm install /chemin/vers/nodebb-plugin-discord-onekite
-./nodebb build
-./nodebb restart
-```
-
-## Configuration
-ACP → Plugins → **Discord Onekite**
-- Webhook URL
-- (option) Notifier les réponses
-- Catégories à notifier (si aucune sélection : toutes)
+- Catégories listées dans l'ACP (chargées via /api/categories)
+- Sauvegarde via settings.save
+- Aucune catégorie sélectionnée => toutes

package/library.js

@@ -10,19 +10,13 @@ const user = require.main.require('./src/user');
 
 const controllers = require('./lib/controllers');
 
-// Settings are stored under this key in NodeBB's settings system
 const SETTINGS_KEY = 'discord-onekite';
 
 function normalizeCids(value) {
   if (!value) return [];
   if (Array.isArray(value)) return value.map(v => String(v)).filter(Boolean);
-
-  // Sometimes saved as "1,2,3"
   if (typeof value === 'string') {
-    return value
-      .split(',')
-      .map(s => s.trim())
-      .filter(Boolean);
+    return value.split(',').map(s => s.trim()).filter(Boolean);
   }
   return [];
 }
@@ -37,7 +31,7 @@ async function getSettings() {
 }
 
 function cidAllowed(topicCid, allowedCids) {
-  // IMPORTANT (per request): if no categories are selected => notify ALL categories.
+  // requirement: none selected => ALL
   if (!allowedCids || allowedCids.length === 0) return true;
   return allowedCids.includes(String(topicCid));
 }
@@ -51,7 +45,6 @@ async function postToDiscord(webhookUrl, payload) {
     body: JSON.stringify(payload),
   });
 
-  // Discord webhook success is commonly 204 No Content
   if (res.statusCode < 200 || res.statusCode >= 300) {
     const text = await res.body.text().catch(() => '');
     throw new Error(`[discord-onekite] Discord webhook HTTP ${res.statusCode}: ${text}`);
@@ -61,13 +54,10 @@ async function postToDiscord(webhookUrl, payload) {
 async function buildTopicEmbed({ tid, pid, type }) {
   const baseUrl = meta.config.url;
 
-  // For v4.x, these fields are stable and enough for URL + title
   const topicData = await topics.getTopicFields(tid, ['tid', 'uid', 'cid', 'title', 'slug', 'timestamp', 'mainPid']);
   if (!topicData) return null;
 
   const topicUrl = `${baseUrl}/topic/${topicData.slug || topicData.tid}`;
-
-  // Author (topic author). If you prefer reply author, adjust to read post author.
   const u = await user.getUserFields(topicData.uid, ['username', 'picture']);
 
   const isReply = type === 'reply';
@@ -88,7 +78,6 @@ async function buildTopicEmbed({ tid, pid, type }) {
 
 const Plugin = {};
 
-// Mount ACP page route (NodeBB v4.x)
 Plugin.init = async ({ router }) => {
   routeHelpers.setupAdminPageRoute(
     router,
@@ -98,7 +87,6 @@ Plugin.init = async ({ router }) => {
   );
 };
 
-// Add entry under ACP -> Plugins
 Plugin.addAdminNavigation = (header) => {
   header.plugins.push({
     route: '/plugins/discord-onekite',
@@ -108,16 +96,14 @@ Plugin.addAdminNavigation = (header) => {
   return header;
 };
 
-// NEW TOPICS ONLY (unless notifyReplies enabled for posts)
 Plugin.onTopicSave = async (data) => {
   try {
-    const { webhookUrl, cids } = await getSettings();
-    if (!webhookUrl) return;
+    const settings = await getSettings();
+    if (!settings.webhookUrl) return;
 
     const tid = data?.tid || data?.topic?.tid;
     if (!tid) return;
 
-    // In v4.x, new topics often expose isNew; as a fallback, we detect postcount=1 if present.
     const isNew =
       data?.isNew === true ||
       data?.topic?.isNew === true ||
@@ -128,40 +114,35 @@ Plugin.onTopicSave = async (data) => {
     const built = await buildTopicEmbed({ tid, type: 'topic' });
     if (!built) return;
 
-    if (!cidAllowed(built.topicData.cid, cids)) return;
+    if (!cidAllowed(built.topicData.cid, settings.cids)) return;
 
-    await postToDiscord(webhookUrl, { embeds: [built.embed] });
+    await postToDiscord(settings.webhookUrl, { embeds: [built.embed] });
   } catch (err) {
-    // eslint-disable-next-line no-console
     console.error(err);
   }
 };
 
-// REPLIES (optional)
 Plugin.onPostSave = async (data) => {
   try {
-    const { webhookUrl, notifyReplies, cids } = await getSettings();
-    if (!webhookUrl || !notifyReplies) return;
+    const settings = await getSettings();
+    if (!settings.notifyReplies) return;
+    if (!settings.webhookUrl) return;
 
     const pid = data?.pid || data?.post?.pid;
     const tid = data?.tid || data?.post?.tid;
     if (!pid || !tid) return;
 
-    // Only new posts (avoid edits). v4.x commonly provides isNew for creates.
     const isNew = data?.isNew === true || data?.post?.isNew === true;
     if (!isNew) return;
 
     const built = await buildTopicEmbed({ tid, pid, type: 'reply' });
     if (!built) return;
 
-    // Avoid notifying the main post (already covered by topic.save)
     if (built.topicData?.mainPid && String(built.topicData.mainPid) === String(pid)) return;
+    if (!cidAllowed(built.topicData.cid, settings.cids)) return;
 
-    if (!cidAllowed(built.topicData.cid, cids)) return;
-
-    await postToDiscord(webhookUrl, { embeds: [built.embed] });
+    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.0",
+  "version": "1.0.1",
   "description": "Discord webhook notifier for Onekite (NodeBB v4.x only)",
   "main": "library.js",
   "license": "MIT",

package/plugin.json

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

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

@@ -31,3 +31,60 @@
     <!-- 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>

package/static/lib/admin.js

@@ -1,45 +0,0 @@
-'use strict';
-
-/* global $, app */
-
-define('admin/plugins/discord-onekite', ['settings', 'api'], function (settings, api) {
-  const ACP = {};
-
-  ACP.init = async function () {
-    // Charge settings existants (webhookUrl, notifyReplies, cids)
-    settings.load('discord-onekite', $('.discord-onekite-settings'));
-
-    // Charge les catégories via l'API NodeBB (client api module ajoute /api) 
-    try {
-      const res = await api.get('/categories');
-      const categories = (res && res.categories) ? res.categories : [];
-
-      const $select = $('#cids');
-      $select.empty();
-
-      categories
-        .filter(c => c && typeof c.cid !== 'undefined' && c.name)
-        .forEach(c => {
-          $('<option />')
-            .val(String(c.cid))
-            .text(c.name)
-            .appendTo($select);
-        });
-
-      // Recharge settings pour re-sélectionner les catégories déjà sauvegardées
-      settings.load('discord-onekite', $('.discord-onekite-settings'));
-    } 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').on('click', function () {
-      settings.save('discord-onekite', $('.discord-onekite-settings'), function () {
-        app.alertSuccess('Paramètres enregistrés !');
-      });
-    });
-  };
-
-  return ACP;
-});