nodebb-plugin-discord-onekite 1.0.4 → 1.0.6

package/README.md

@@ -1,8 +1,8 @@
-# nodebb-plugin-discord-onekite (NodeBB v4.x) — v1.0.3
+# nodebb-plugin-discord-onekite — v1.0.5 (server-side ACP)
 
-This version aligns more closely with the official Quickstart pattern:
-- uses `modules` mapping (no leading ./) to expose `admin/plugins/discord-onekite`
-- template has no inline script
-- admin.js logs `[discord-onekite] admin init` when loaded
+If your ACP JS is not loading for any reason (custom admin theme, aggressive bundling, CSP, etc.),
+this version avoids it entirely:
 
-If you still don't see that log, NodeBB isn't loading the module, so we can narrow it down quickly.
+- Categories are rendered server-side.
+- Settings are saved via a normal POST form submit.
+- CSRF token is provided via `{config.csrf_token}`.

package/lib/controllers.js

@@ -1,9 +1,55 @@
 'use strict';
 
+const meta = require.main.require('./src/meta');
+const categories = require.main.require('./src/categories');
+
+const SETTINGS_KEY = 'discord-onekite';
+
+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 getCategoriesForAdmin(uid) {
+  // This API exists in NodeBB and is used in various plugins/examples.
+  // If it ever changes, the fallback is to just return an empty array.
+  return await new Promise((resolve) => {
+    try {
+      categories.getCategoriesByPrivilege('categories:cid', uid, 'read', (err, cids) => {
+        if (err || !Array.isArray(cids)) return resolve([]);
+        categories.getCategoriesData(cids, uid, (err2, data) => {
+          if (err2 || !Array.isArray(data)) return resolve([]);
+          resolve(data);
+        });
+      });
+    } catch (e) {
+      resolve([]);
+    }
+  });
+}
+
 const controllers = {};
 
 controllers.renderAdminPage = async function (req, res) {
-  res.render('admin/plugins/discord-onekite', {});
+  const settings = await meta.settings.get(SETTINGS_KEY);
+  const savedCids = normalizeCids(settings && settings.cids);
+
+  const cats = await getCategoriesForAdmin(req.uid);
+  const categoriesForTpl = (cats || [])
+    .filter(c => c && typeof c.cid !== 'undefined' && c.name)
+    .map(c => ({
+      cid: String(c.cid),
+      name: c.name,
+      selected: savedCids.includes(String(c.cid)),
+    }))
+    .sort((a, b) => a.name.localeCompare(b.name));
+
+  res.render('admin/plugins/discord-onekite', {
+    settings: settings || {},
+    categories: categoriesForTpl,
+  });
 };
 
 module.exports = controllers;

package/library.js

@@ -4,6 +4,7 @@ const { request } = require('undici');
 
 const routeHelpers = require.main.require('./src/routes/helpers');
 const meta = require.main.require('./src/meta');
+const middleware = require.main.require('./src/middleware');
 
 const topics = require.main.require('./src/topics');
 const user = require.main.require('./src/user');
@@ -74,12 +75,34 @@ async function buildTopicEmbed({ tid, pid, type }) {
 const Plugin = {};
 
 Plugin.init = async ({ router }) => {
+  // GET admin page
   routeHelpers.setupAdminPageRoute(
     router,
     '/admin/plugins/discord-onekite',
     [],
     controllers.renderAdminPage
   );
+
+  // POST save (server-side, no ACP JS needed)
+  // Protect via admin middleware; CSRF is checked globally by NodeBB when _csrf is present.
+  router.post('/admin/plugins/discord-onekite/save',
+    middleware.admin.checkPrivileges,
+    async (req, res) => {
+      try {
+        const payload = {
+          webhookUrl: req.body.webhookUrl || '',
+          notifyReplies: req.body.notifyReplies ? 'on' : '',
+          // multiple select may come as string or array
+          cids: req.body.cids || '',
+        };
+        await meta.settings.set(SETTINGS_KEY, payload);
+      } catch (e) {
+        // eslint-disable-next-line no-console
+        console.error('[discord-onekite] save failed', e);
+      }
+      res.redirect(`${meta.config.relative_path}/admin/plugins/discord-onekite`);
+    }
+  );
 };
 
 Plugin.addAdminNavigation = (header) => {

package/package.json

@@ -1,14 +1,20 @@
 {
   "name": "nodebb-plugin-discord-onekite",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Discord webhook notifier for Onekite (NodeBB v4.x only)",
   "main": "library.js",
   "license": "MIT",
-  "keywords": ["nodebb", "plugin", "discord", "webhook", "notifications"],
+  "keywords": [
+    "nodebb",
+    "plugin",
+    "discord",
+    "webhook",
+    "notifications"
+  ],
   "dependencies": {
     "undici": "^6.0.0"
   },
   "nbbpm": {
     "compatibility": "^4.0.0"
   }
-}
+}

package/plugin.json

@@ -1,16 +1,25 @@
 {
   "id": "nodebb-plugin-discord-onekite",
   "name": "Discord Onekite Notifier",
-  "description": "Notifie Discord via webhook pour nouveaux sujets et/ou réponses, filtrable par catégories (NodeBB v4.x uniquement).",
-  "library": "library.js",
+  "description": "Notifie Discord via webhook pour nouveaux sujets et/ou r\u00e9ponses, filtrable par cat\u00e9gories (NodeBB v4.x uniquement).",
+  "library": "./library.js",
   "hooks": [
-    { "hook": "static:app.load", "method": "init" },
-    { "hook": "filter:admin.header.build", "method": "addAdminNavigation" },
-    { "hook": "action:topic.save", "method": "onTopicSave" },
-    { "hook": "action:post.save", "method": "onPostSave" }
+    {
+      "hook": "static:app.load",
+      "method": "init"
+    },
+    {
+      "hook": "filter:admin.header.build",
+      "method": "addAdminNavigation"
+    },
+    {
+      "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"
+}

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

@@ -1,17 +1,19 @@
 <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 (sans JS côté ACP).
   </p>
 
-  <form role="form" class="discord-onekite-settings">
+  <form role="form" method="post" action="{config.relative_path}/admin/plugins/discord-onekite/save">
+    <input type="hidden" name="_csrf" value="{config.csrf_token}" />
+
     <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/..." />
+      <input type="text" class="form-control" id="webhookUrl" name="webhookUrl" value="{settings.webhookUrl}" placeholder="https://discord.com/api/webhooks/..." />
     </div>
 
     <div class="form-check mb-3">
-      <input class="form-check-input" type="checkbox" id="notifyReplies" name="notifyReplies">
+      <input class="form-check-input" type="checkbox" id="notifyReplies" name="notifyReplies" <!-- IF settings.notifyReplies -->checked<!-- ENDIF settings.notifyReplies -->>
       <label class="form-check-label" for="notifyReplies">
         Notifier aussi les réponses (si décoché : uniquement les nouveaux sujets)
       </label>
@@ -19,15 +21,16 @@
 
     <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">
+        <!-- BEGIN categories -->
+        <option value="{categories.cid}" <!-- IF categories.selected -->selected<!-- ENDIF categories.selected -->>{categories.name}</option>
+        <!-- END categories -->
+      </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>
-      <p class="form-text">
-        <em>Astuce debug :</em> ouvre la console navigateur, tu dois voir <code>[discord-onekite] admin init</code>.
-      </p>
     </div>
 
-    <!-- IMPORT admin/partials/save_button.tpl -->
+    <button type="submit" class="btn btn-primary">Enregistrer</button>
   </form>
 </div>

package/static/lib/admin.js

@@ -1,70 +0,0 @@
-'use strict';
-/* global $, app, ajaxify */
-
-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 [];
-  }
-
-  async function fetchCategories() {
-    // In NodeBB, api.get('/categories') => GET /api/categories
-    const res = await api.get('/categories');
-    return (res && res.categories) ? res.categories : [];
-  }
-
-  ACP.init = async function () {
-    // This should be called automatically by NodeBB when template admin/plugins/discord-onekite is loaded.
-    // Also safe to call multiple times.
-    console.log('[discord-onekite] admin init');
-
-    const $form = $('.discord-onekite-settings');
-    if (!$form.length) return;
-
-    // Load current settings
-    const saved = await new Promise((resolve) => {
-      settings.get('discord-onekite', (data) => resolve(data || {}));
-    });
-
-    settings.load('discord-onekite', $form);
-    const savedCids = normalizeCids(saved.cids);
-
-    // Populate categories select
-    const $select = $('#cids');
-    try {
-      const categories = await fetchCategories();
-      $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) {
-      console.error('[discord-onekite] failed to fetch categories', e);
-      if (app && app.alertError) app.alertError('Impossible de charger la liste des catégories (GET /api/categories).');
-    }
-
-    // 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 !');
-      });
-    });
-  };
-
-  // Fallback for ajaxified ACP navigation
-  $(window).off('action:ajaxify.end.discordOnekite').on('action:ajaxify.end.discordOnekite', function (ev, data) {
-    if (data && data.template === 'admin/plugins/discord-onekite') {
-      ACP.init();
-    }
-  });
-
-  return ACP;
-});