nodebb-plugin-discord-onekite 1.1.22 → 1.1.25

package/README.md

@@ -1,7 +1,17 @@
-# nodebb-plugin-discord-onekite v1.1.4.13
+# nodebb-plugin-discord-onekite v1.1.4.15
 
-Fixes ACP not applying JS / not persisting:
-- Uses `acpScripts` + modules key `admin/plugins/discord-onekite.js` to ensure admin script loads.
-- Removes bottom-right save button partial; uses only the top "Enregistrer les paramètres" button.
-- Persists categories via hidden CSV field `data-field="cids"`.
-- Toast uses title "Succès" and message "Paramètres enregistrés".
+ACP is implemented like the working `nodebb-plugin-calendar-onekite` you provided:
+- Admin template uses `admin/partials/settings/header.tpl` + `footer.tpl` (top save bar)
+- Admin JS uses NodeBB v3 admin API endpoints:
+  - GET /api/v3/admin/plugins/discord-onekite/settings
+  - PUT /api/v3/admin/plugins/discord-onekite/settings
+- Save buttons from header are intercepted and call the PUT endpoint.
+
+Toast:
+- Shows "Succès" (title) and "Paramètres enregistrés" (message) via `app.alert` when available.
+
+Discord:
+- Embed only: clickable title (embed.url) + message excerpt in embed.description.
+
+
+Toast updated to match calendar-onekite: alerts.success/error with dedup.

package/lib/admin.js

@@ -0,0 +1,41 @@
+'use strict';
+
+const meta = require.main.require('./src/meta');
+
+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 getSettings() {
+  const s = await meta.settings.get(SETTINGS_KEY);
+  return {
+    webhookUrl: (s && s.webhookUrl) ? String(s.webhookUrl).trim() : '',
+    notifyReplies: !!(s && (s.notifyReplies === true || s.notifyReplies === 'on' || s.notifyReplies === 'true')),
+    cids: normalizeCids(s && s.cids),
+  };
+}
+
+async function saveSettings(body) {
+  const payload = {
+    webhookUrl: body.webhookUrl || '',
+    notifyReplies: body.notifyReplies ? 'on' : '',
+    // Store as CSV string for meta.settings
+    cids: Array.isArray(body.cids) ? body.cids.map(String).filter(Boolean).join(',') : (body.cids || ''),
+  };
+  await meta.settings.set(SETTINGS_KEY, payload);
+}
+
+module.exports = {
+  async getSettings(req, res) {
+    res.json({ settings: await getSettings() });
+  },
+  async saveSettings(req, res) {
+    await saveSettings(req.body || {});
+    res.json({ ok: true });
+  },
+};

package/library.js

@@ -4,13 +4,14 @@ 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 posts = require.main.require('./src/posts');
-const user = require.main.require('./src/user');
 
 const controllers = require('./lib/controllers');
+const adminApi = require('./lib/admin');
+
+const Plugin = {};
 
 const SETTINGS_KEY = 'discord-onekite';
 
@@ -38,15 +39,6 @@ function ensureAbsoluteUrl(baseUrl, maybeUrl) {
   return s;
 }
 
-function isValidHttpUrl(s) {
-  try {
-    const u = new URL(s);
-    return u.protocol === 'http:' || u.protocol === 'https:';
-  } catch {
-    return false;
-  }
-}
-
 function stripHtml(html) {
   if (!html) return '';
   return String(html)
@@ -99,19 +91,15 @@ async function postToDiscord(webhookUrl, payload) {
   }
 }
 
-async function sendDiscord(webhookUrl, payload, fallbackContent) {
+async function sendDiscord(webhookUrl, payload) {
   if (!webhookUrl) return;
-
   try {
     await postToDiscord(webhookUrl, payload);
   } catch (e) {
-    if (e && e.statusCode === 400 && fallbackContent) {
-      try {
-        await postToDiscord(webhookUrl, { content: fallbackContent });
-        return;
-      } catch (e2) {
-        console.error(e2);
-      }
+    // fallback to plain content if embeds rejected
+    if (e && e.statusCode === 400 && payload && payload.embeds) {
+      const fallback = payload.embeds[0] && payload.embeds[0].description ? payload.embeds[0].description : 'Notification';
+      try { await postToDiscord(webhookUrl, { content: fallback }); return; } catch (e2) { console.error(e2); }
     }
     console.error(e);
   }
@@ -128,43 +116,20 @@ async function getPostExcerpt(pid) {
   }
 }
 
-async function buildPayload({ tid, pid, isReply }) {
+async function buildEmbed({ tid, pid, isReply }) {
   let baseUrl = normalizeBaseUrl(meta.config.url || meta.config['url']);
-  if (!baseUrl) { baseUrl = 'https://www.onekite.com'; }
+  if (!baseUrl) baseUrl = 'https://www.onekite.com';
 
-  const topicData = await topics.getTopicFields(tid, ['tid', 'uid', 'cid', 'title', 'slug', 'mainPid']);
+  const topicData = await topics.getTopicFields(tid, ['tid', 'cid', 'title', 'slug', 'mainPid']);
   if (!topicData) return null;
 
-  // Always build the forum link like the example: https://www.onekite.com/topic/<tid or slug>
   const topicUrl = ensureAbsoluteUrl(baseUrl, `/topic/${topicData.slug || topicData.tid}`);
+  const targetUrl = (isReply && pid) ? `${topicUrl}/${pid}` : topicUrl;
 
-  // For replies, link directly to the post if possible
-  const postUrl = (isReply && pid) ? `${topicUrl}/${pid}` : topicUrl;
-
-  const u = await user.getUserFields(topicData.uid, ['username']);
   const title = (topicData.title || (isReply ? 'Nouvelle réponse' : 'Nouveau sujet')).toString().slice(0, 256);
-  const authorName = (u && u.username ? String(u.username) : 'Utilisateur').slice(0, 256);
-
   const excerpt = await getPostExcerpt(isReply ? pid : topicData.mainPid);
-  const description = truncate(excerpt || (isReply ? `Réponse de ${authorName}` : `Sujet créé par ${authorName}`), 500);
 
-  // Minimal embed but with URL so the title is clickable
-  const embed = {
-    title,
-    description,
-  };
-  if (isValidHttpUrl(postUrl)) embed.url = postUrl;
-
-  // Message format:
-  // 1) A single clickable link line: "🆕 Nouveau sujet : [Titre](URL)" (or reply variant)
-  // 2) Excerpt below
-  const linkLine = isReply
-    ? `🗨️ Nouvelle réponse : [${title}](${postUrl})`
-    : `🆕 Nouveau sujet : [${title}](${topicUrl})`;
-
-  const content = [linkLine, description].filter(Boolean).join('\n');
-
-  return { topicData, embed, content };
+  return { topicData, embed: { title, url: targetUrl, description: excerpt || '' } };
 }
 
 function extractTidPid(data) {
@@ -173,15 +138,20 @@ function extractTidPid(data) {
   return { tid, pid };
 }
 
-const Plugin = {};
+Plugin.init = async function (params) {
+  const { router, middleware } = params;
+
+  // ACP page
+  routeHelpers.setupAdminPageRoute(router, '/admin/plugins/discord-onekite', [], controllers.renderAdminPage);
 
-Plugin.init = async ({ router }) => {
-  routeHelpers.setupAdminPageRoute(
-    router,
-    '/admin/plugins/discord-onekite',
-    [],
-    controllers.renderAdminPage
-  );
+  // Admin API v3 routes (same pattern as calendar-onekite)
+  const adminBases = ['/api/v3/admin/plugins/discord-onekite'];
+  const adminMws = [middleware.admin.checkPrivileges];
+
+  adminBases.forEach((base) => {
+    router.get(`${base}/settings`, ...adminMws, adminApi.getSettings);
+    router.put(`${base}/settings`, ...adminMws, adminApi.saveSettings);
+  });
 };
 
 Plugin.addAdminNavigation = (header) => {
@@ -200,13 +170,11 @@ Plugin.onTopicPost = async (data) => {
   const { tid } = extractTidPid(data);
   if (!tid) return;
 
-  const built = await buildPayload({ tid, isReply: false });
+  const built = await buildEmbed({ tid, isReply: false });
   if (!built) return;
-
   if (!cidAllowed(built.topicData.cid, settings.cids)) return;
 
-  // Send content + embed (content ensures clickable link always)
-  await sendDiscord(settings.webhookUrl, { content: built.content, embeds: [built.embed] }, built.content);
+  await sendDiscord(settings.webhookUrl, { embeds: [built.embed] });
 };
 
 Plugin.onTopicReply = async (data) => {
@@ -217,14 +185,11 @@ Plugin.onTopicReply = async (data) => {
   const { tid, pid } = extractTidPid(data);
   if (!tid || !pid) return;
 
-  const built = await buildPayload({ tid, pid, isReply: true });
+  const built = await buildEmbed({ tid, pid, isReply: true });
   if (!built) return;
-
-  if (built.topicData?.mainPid && String(built.topicData.mainPid) === String(pid)) return;
-
   if (!cidAllowed(built.topicData.cid, settings.cids)) return;
 
-  await sendDiscord(settings.webhookUrl, { content: built.content, embeds: [built.embed] }, built.content);
+  await sendDiscord(settings.webhookUrl, { embeds: [built.embed] });
 };
 
 module.exports = Plugin;

package/package.json

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

package/plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "nodebb-plugin-discord-onekite",
   "name": "Discord Onekite Notifier",
-  "description": "Notifie Discord via webhook pour nouveaux sujets et/ou r\u00e9ponses, filtrable par cat\u00e9gories (NodeBB v4.x uniquement).",
+  "description": "Notifie Discord via webhook pour nouveaux sujets et/ou r\u00e9ponses (NodeBB v4.x).",
   "library": "./library.js",
   "hooks": [
     {
@@ -21,11 +21,16 @@
       "method": "onTopicReply"
     }
   ],
-  "templates": "templates",
+  "staticDirs": {
+    "public": "./public"
+  },
+  "templates": "./templates",
+  "modules": {
+    "../admin/plugins/discord-onekite.js": "./public/admin.js",
+    "admin/plugins/discord-onekite": "./public/admin.js"
+  },
   "acpScripts": [
-    "static/lib/admin.js"
+    "public/admin.js"
   ],
-  "modules": {
-    "admin/plugins/discord-onekite.js": "static/lib/admin.js"
-  }
+  "version": "1.1.4.16"
 }

package/public/admin.js

@@ -0,0 +1,118 @@
+define('admin/plugins/discord-onekite', ['alerts', 'bootbox'], function (alerts) {
+  'use strict';
+
+  function showAlert(type, msg) {
+    // Deduplicate identical alerts that can be triggered multiple times
+    // by NodeBB ACP save buttons/hooks across ajaxify navigations.
+    try {
+      const now = Date.now();
+      const last = window.oneKiteDiscordLastAlert;
+      if (last && last.type === type && last.msg === msg && (now - last.ts) < 1200) {
+        return;
+      }
+      window.oneKiteDiscordLastAlert = { type, msg, ts: now };
+    } catch (e) {}
+    try {
+      if (alerts && typeof alerts[type] === 'function') {
+        alerts[type](msg);
+        return;
+      }
+    } catch (e) {}
+    alert(msg);
+  }
+
+  async function fetchJson(url, opts) {
+    const res = await fetch(url, Object.assign({
+      headers: Object.assign({
+        'Content-Type': 'application/json',
+        'x-csrf-token': (document.querySelector('meta[name="csrf_token"]') && document.querySelector('meta[name="csrf_token"]').getAttribute('content')) ||
+          (document.querySelector('meta[name="csrf-token"]') && document.querySelector('meta[name="csrf-token"]').getAttribute('content')) ||
+          (typeof app !== 'undefined' && app && app.csrfToken) ||
+          '',
+      }, (opts && opts.headers) || {}),
+      credentials: 'same-origin',
+    }, opts || {}));
+
+    const text = await res.text();
+    let data = null;
+    try { data = text ? JSON.parse(text) : null; } catch (e) {}
+
+    if (!res.ok) {
+      const err = new Error((data && data.status && data.status.message) || text || 'Request failed');
+      err.status = res.status;
+      err.data = data;
+      throw err;
+    }
+    return data;
+  }
+
+  async function loadSettings() {
+    const data = await fetchJson('/api/v3/admin/plugins/discord-onekite/settings');
+    return (data && data.settings) ? data.settings : {};
+  }
+
+  async function saveSettings(payload) {
+    return await fetchJson('/api/v3/admin/plugins/discord-onekite/settings', {
+      method: 'PUT',
+      body: JSON.stringify(payload),
+    });
+  }
+
+  function getSelectedCids() {
+    return Array.from(document.querySelectorAll('#cidsMulti option:checked')).map(o => String(o.value));
+  }
+
+  function setSelectedCids(cids) {
+    const set = new Set((cids || []).map(String));
+    document.querySelectorAll('#cidsMulti option').forEach(opt => {
+      opt.selected = set.has(String(opt.value));
+    });
+  }
+
+  function getPayload() {
+    return {
+      webhookUrl: String(document.getElementById('webhookUrl')?.value || '').trim(),
+      notifyReplies: !!document.getElementById('notifyReplies')?.checked,
+      cids: getSelectedCids(),
+    };
+  }
+
+  async function doSave() {
+    try {
+      await saveSettings(getPayload());
+      showAlert('success', 'Paramètres enregistrés');
+    } catch (e) {
+      // eslint-disable-next-line no-console
+      console.error(e);
+      showAlert('error', e && e.message ? e.message : 'Erreur lors de l’enregistrement');
+    }
+  }
+
+  function bindSaveButtons() {
+    const SAVE_SELECTOR = '#save, .save, [data-action="save"], .settings-save, .floating-save, .btn[data-action="save"], #onekite-save, #save-top';
+    if (window.oneKiteDiscordAdminBound) return;
+    window.oneKiteDiscordAdminBound = true;
+
+    document.addEventListener('click', function (ev) {
+      const target = ev.target && (ev.target.closest ? ev.target.closest(SAVE_SELECTOR) : null);
+      if (!target) return;
+      ev.preventDefault();
+      doSave();
+    }, true);
+  }
+
+  async function init() {
+    bindSaveButtons();
+    try {
+      const s = await loadSettings();
+      if (typeof s.webhookUrl !== 'undefined') document.getElementById('webhookUrl').value = s.webhookUrl || '';
+      if (typeof s.notifyReplies !== 'undefined') document.getElementById('notifyReplies').checked = !!s.notifyReplies;
+      if (Array.isArray(s.cids)) setSelectedCids(s.cids);
+    } catch (e) {
+      // eslint-disable-next-line no-console
+      console.error(e);
+    }
+  }
+
+  return { init: init };
+});

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

@@ -1,39 +1,40 @@
-<div class="acp-page-container">
-  <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="onekite-save" type="button" class="btn btn-primary">Enregistrer les paramètres</button>
-  </div>
-
-  <form role="form" class="discord-onekite-settings">
-    <div class="mb-3">
-      <label class="form-label" for="webhookUrl">Discord Webhook URL</label>
-      <input type="text" class="form-control" id="webhookUrl" data-field="webhookUrl" value="{settings.webhookUrl}" placeholder="https://discord.com/api/webhooks/..." />
-    </div>
+<!-- IMPORT admin/partials/settings/header.tpl -->
 
-    <div class="form-check mb-3">
-      <input class="form-check-input" type="checkbox" id="notifyReplies" data-field="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>
-    </div>
-
-    <div class="mb-3">
-      <label class="form-label" for="cidsMulti">Catégories à notifier</label>
+<div class="row">
+  <div class="col-lg-8">
+    <div class="card mb-3">
+      <div class="card-header">
+        <strong>Discord Onekite</strong>
+      </div>
+      <div class="card-body">
+        <p class="text-muted">Notifications Discord via webhook.</p>
 
-      <select class="form-select" id="cidsMulti" multiple size="12">
-        <!-- BEGIN categories -->
-        <option value="{categories.cid}" <!-- IF categories.selected -->selected<!-- ENDIF categories.selected -->>{categories.name}</option>
-        <!-- END categories -->
-      </select>
+        <form class="discord-onekite-settings" role="form">
+          <div class="mb-3">
+            <label class="form-label" for="webhookUrl">Discord Webhook URL</label>
+            <input id="webhookUrl" type="text" class="form-control" placeholder="https://discord.com/api/webhooks/..." value="{settings.webhookUrl}" />
+          </div>
 
-      <input type="hidden" id="cids" data-field="cids" value="{settings.cids}" />
+          <div class="form-check mb-3">
+            <input class="form-check-input" type="checkbox" id="notifyReplies" <!-- IF settings.notifyReplies -->checked<!-- ENDIF settings.notifyReplies -->>
+            <label class="form-check-label" for="notifyReplies">Notifier aussi les réponses</label>
+          </div>
 
-      <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>
+          <div class="mb-3">
+            <label class="form-label" for="cidsMulti">Catégories à notifier</label>
+            <select class="form-select" id="cidsMulti" 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>
+          </div>
+        </form>
+      </div>
     </div>
-  </form>
+  </div>
 </div>
+
+<!-- IMPORT admin/partials/settings/footer.tpl -->

package/static/lib/admin.js

@@ -1,50 +0,0 @@
-'use strict';
-/* global $, app */
-
-define('admin/plugins/discord-onekite', ['settings'], function (settings) {
-  const ACP = {};
-
-  function parseCsv(v) {
-    if (!v) return [];
-    return String(v).split(',').map(s => s.trim()).filter(Boolean);
-  }
-  function toCsv(arr) {
-    return (arr || []).map(String).filter(Boolean).join(',');
-  }
-  function setSelectedCids(cids) {
-    const set = new Set((cids || []).map(String));
-    $('#cidsMulti option').each(function () {
-      $(this).prop('selected', set.has(String($(this).val())));
-    });
-  }
-  function getSelectedCids() {
-    return $('#cidsMulti option:selected').map(function () { return String($(this).val()); }).get();
-  }
-
-  function toastSuccess() {
-    if (window.app && typeof app.alert === 'function') {
-      app.alert({ type: 'success', title: 'Succès', message: 'Paramètres enregistrés' });
-    } else if (window.app && typeof app.alertSuccess === 'function') {
-      app.alertSuccess('Succès: Paramètres enregistrés');
-    }
-  }
-
-  ACP.init = function () {
-    const $form = $('.discord-onekite-settings');
-    if (!$form.length) return;
-
-    settings.sync('discord-onekite', $form, function () {
-      setSelectedCids(parseCsv($('#cids').val()));
-    });
-
-    $('#onekite-save').off('click.discordOnekite').on('click.discordOnekite', function (e) {
-      e.preventDefault();
-      $('#cids').val(toCsv(getSelectedCids()));
-      settings.persist('discord-onekite', $form, function () {
-        toastSuccess();
-      });
-    });
-  };
-
-  return ACP;
-});