nodebb-plugin-discord-onekite 1.1.15 → 1.1.16

package/README.md

@@ -1,8 +1,12 @@
-# nodebb-plugin-discord-onekite v1.1.4.7
+# nodebb-plugin-discord-onekite v1.1.4.8
 
-Discord output cleanup:
-- Removes the extra content line under the title.
-- Sends an embed where:
-  - title is clickable (embed.url)
-  - embed description contains the message excerpt
-- `content` is only used as a fallback if Discord rejects embeds.
+ACP (NodeBB v4):
+- Save button at top: "Enregistrer les paramètres"
+- Uses custom API routes (GET/POST) registered with `routeHelpers.setupApiRoute`:
+  - GET /api/plugins/discord-onekite/settings
+  - POST /api/plugins/discord-onekite/settings
+- Shows NodeBB toast on save
+
+Discord:
+- Embed only: clickable title (embed.url) + message excerpt in embed.description (no duplicate lines)
+- Absolute URL prefix fallback to https://www.onekite.com

package/library.js

@@ -129,7 +129,8 @@ async function getPostExcerpt(pid) {
 }
 
 async function buildPayload({ tid, pid, isReply }) {
-  const baseUrl = normalizeBaseUrl(meta.config.url);
+  let baseUrl = normalizeBaseUrl(meta.config.url || meta.config['url']);
+  if (!baseUrl) { baseUrl = 'https://www.onekite.com'; }
 
   const topicData = await topics.getTopicFields(tid, ['tid', 'uid', 'cid', 'title', 'slug', 'mainPid']);
   if (!topicData) return null;
@@ -182,6 +183,39 @@ Plugin.init = async ({ router }) => {
     controllers.renderAdminPage
   );
 
+  // API routes for ACP (client calls /api/plugins/discord-onekite/settings)
+  routeHelpers.setupApiRoute(router, 'get', '/plugins/discord-onekite/settings', [middleware.admin.checkPrivileges], async (req, res) => {
+    const s = await meta.settings.get(SETTINGS_KEY);
+    res.json({
+      settings: {
+        webhookUrl: (s && s.webhookUrl) ? String(s.webhookUrl).trim() : '',
+        notifyReplies: !!(s && (s.notifyReplies === true || s.notifyReplies === 'on' || s.notifyReplies === 'true')),
+        cids: (() => {
+          const v = s && s.cids;
+          if (!v) return [];
+          if (Array.isArray(v)) return v.map(String).filter(Boolean);
+          if (typeof v === 'string') return v.split(',').map(x => x.trim()).filter(Boolean);
+          return [];
+        })(),
+      },
+    });
+  });
+
+  routeHelpers.setupApiRoute(router, 'post', '/plugins/discord-onekite/settings', [middleware.admin.checkPrivileges], async (req, res) => {
+    try {
+      const payload = {
+        webhookUrl: req.body.webhookUrl || '',
+        notifyReplies: req.body.notifyReplies ? 'on' : '',
+        cids: req.body.cids || '',
+      };
+      await meta.settings.set(SETTINGS_KEY, payload);
+      res.json({ ok: true });
+    } catch (e) {
+      console.error('[discord-onekite] save failed', e);
+      res.status(500).json({ ok: false });
+    }
+  });
+
   // AJAX save endpoint for ACP (used by admin.js)
   router.post('/api/admin/plugins/discord-onekite/save',
     middleware.admin.checkPrivileges,

package/package.json

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

package/static/lib/admin.js

@@ -1,22 +1,65 @@
 'use strict';
 /* global $, app */
 
-define('admin/plugins/discord-onekite', ['settings'], function (settings) {
+define('admin/plugins/discord-onekite', ['api'], function (api) {
   const ACP = {};
 
+  function getMultiSelectValues(selector) {
+    const el = document.querySelector(selector);
+    if (!el) return [];
+    return Array.from(el.selectedOptions || []).map(o => o.value);
+  }
+
+  function setMultiSelectValues(selector, values) {
+    const el = document.querySelector(selector);
+    if (!el) return;
+    const set = new Set((values || []).map(String));
+    Array.from(el.options).forEach(opt => { opt.selected = set.has(String(opt.value)); });
+  }
+
+  async function loadSettings() {
+    try {
+      const res = await api.get('/plugins/discord-onekite/settings');
+      if (res && res.settings) {
+        $('#webhookUrl').val(res.settings.webhookUrl || '');
+        $('#notifyReplies').prop('checked', !!res.settings.notifyReplies);
+        setMultiSelectValues('#cids', res.settings.cids || []);
+      }
+    } catch (err) {
+      // eslint-disable-next-line no-console
+      console.error(err);
+    }
+  }
+
+  async function saveSettings() {
+    const payload = {
+      webhookUrl: String($('#webhookUrl').val() || '').trim(),
+      notifyReplies: $('#notifyReplies').is(':checked'),
+      cids: getMultiSelectValues('#cids'),
+    };
+
+    try {
+      await api.post('/plugins/discord-onekite/settings', payload);
+      if (window.app && typeof app.alertSuccess === 'function') {
+        app.alertSuccess('Paramètres enregistrés !');
+      }
+    } catch (err) {
+      // eslint-disable-next-line no-console
+      console.error(err);
+      if (window.app && typeof app.alertError === 'function') {
+        app.alertError('Erreur lors de l’enregistrement');
+      }
+    }
+  }
+
   ACP.init = function () {
-    const $form = $('.discord-onekite-settings');
-    if (!$form.length) return;
+    if (!$('.discord-onekite-settings').length) return;
 
-    settings.sync('discord-onekite', $form);
+    loadSettings();
 
     $('#save').off('click.discordOnekite').on('click.discordOnekite', function (e) {
       e.preventDefault();
-      settings.persist('discord-onekite', $form, function () {
-        if (window.app && typeof app.alertSuccess === 'function') {
-          app.alertSuccess('Paramètres enregistrés !');
-        }
-      });
+      saveSettings();
     });
   };
 

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

@@ -1,6 +1,11 @@
 <div class="acp-page-container">
-  <h4>Discord Onekite</h4>
-  <p class="text-muted">Notifications Discord via webhook.</p>
+  <div class="d-flex justify-content-between align-items-start mb-3">
+    <div>
+      <h4 class="mb-1">Discord Onekite</h4>
+      <p class="text-muted mb-0">Notifications Discord via webhook.</p>
+    </div>
+    <button id="save" type="button" class="btn btn-primary">Enregistrer les paramètres</button>
+  </div>
 
   <form role="form" class="discord-onekite-settings">
     <div class="mb-3">
@@ -26,7 +31,5 @@
         Si aucune catégorie n’est sélectionnée : <strong>toutes les catégories</strong> seront notifiées.
       </p>
     </div>
-
-    <button id="save" type="button" class="btn btn-primary">Enregistrer les paramètres</button>
   </form>
 </div>