nodebb-plugin-discord-onekite 1.0.11 → 1.0.13

package/README.md

@@ -1,4 +1,8 @@
-# nodebb-plugin-discord-onekite v1.0.9
+# nodebb-plugin-discord-onekite v1.1.2
 
-- Uses action:topic.post for new topics and action:topic.reply for replies (more reliable than action:*save for notifications).
-- Server-side ACP settings + NodeBB-style toast (bottom-right) after save.
+Fix build error:
+- Removed `acpScripts` and instead provides a proper AMD admin module via `modules` mapping.
+This avoids RequireJS build failures.
+
+- Toast "classique NodeBB" via app.alertSuccess when `?saved=1`.
+- Discord notifications: minimal embed + fallback to plain content if Discord rejects embed.

package/library.js

@@ -20,6 +20,32 @@ function normalizeCids(value) {
   return [];
 }
 
+function normalizeBaseUrl(url) {
+  if (!url) return '';
+  let s = String(url).trim();
+  if (!/^https?:\/\//i.test(s)) s = `https://${s}`;
+  s = s.replace(/\/+$/, '');
+  return s;
+}
+
+function ensureAbsoluteUrl(baseUrl, maybeUrl) {
+  if (!maybeUrl) return '';
+  const s = String(maybeUrl);
+  if (/^https?:\/\//i.test(s)) return s;
+  if (s.startsWith('//')) return `https:${s}`;
+  if (s.startsWith('/')) return `${baseUrl}${s}`;
+  return s;
+}
+
+function isValidHttpUrl(s) {
+  try {
+    const u = new URL(s);
+    return u.protocol === 'http:' || u.protocol === 'https:';
+  } catch {
+    return false;
+  }
+}
+
 async function getSettings() {
   const s = await meta.settings.get(SETTINGS_KEY);
   return {
@@ -35,40 +61,69 @@ function cidAllowed(topicCid, allowedCids) {
 }
 
 async function postToDiscord(webhookUrl, payload) {
-  if (!webhookUrl) return;
-
   const res = await request(webhookUrl, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify(payload),
   });
 
+  const bodyText = await res.body.text().catch(() => '');
+
   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}`);
+    const err = new Error(`[discord-onekite] Discord webhook HTTP ${res.statusCode}: ${bodyText}`);
+    err.statusCode = res.statusCode;
+    err.responseBody = bodyText;
+    throw err;
   }
 }
 
-async function buildTopicEmbed({ tid, pid, isReply }) {
-  const baseUrl = meta.config.url;
+async function sendDiscord(webhookUrl, payload, fallbackContent) {
+  if (!webhookUrl) return;
 
-  const topicData = await topics.getTopicFields(tid, ['tid', 'uid', 'cid', 'title', 'slug', 'timestamp', 'mainPid']);
+  try {
+    await postToDiscord(webhookUrl, payload);
+  } catch (e) {
+    if (e && e.statusCode === 400 && fallbackContent) {
+      try {
+        await postToDiscord(webhookUrl, { content: fallbackContent });
+        return;
+      } catch (e2) {
+        // eslint-disable-next-line no-console
+        console.error(e2);
+      }
+    }
+    // eslint-disable-next-line no-console
+    console.error(e);
+  }
+}
+
+async function buildPayload({ tid, pid, isReply }) {
+  const baseUrl = normalizeBaseUrl(meta.config.url);
+
+  const topicData = await topics.getTopicFields(tid, ['tid', 'uid', 'cid', 'title', 'slug', 'mainPid']);
   if (!topicData) return null;
 
-  const topicUrl = `${baseUrl}/topic/${topicData.slug || topicData.tid}`;
-  const u = await user.getUserFields(topicData.uid, ['username', 'picture']);
+  const topicUrl = ensureAbsoluteUrl(baseUrl, `/topic/${topicData.slug || topicData.tid}`);
+  const url = 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 embed = {
-    title: topicData.title || (isReply ? 'Nouvelle réponse' : 'Nouveau sujet'),
-    url: isReply && pid ? `${topicUrl}/${pid}` : topicUrl,
-    timestamp: new Date(Date.now()).toISOString(),
-    author: u?.username ? { name: u.username, icon_url: u.picture || undefined } : undefined,
-    footer: { text: 'NodeBB → Discord (Onekite)' },
+    title,
+    description: isReply ? `Réponse de **${authorName}**` : `Sujet créé par **${authorName}**`,
   };
 
-  if (isReply) embed.description = 'Nouvelle réponse dans un sujet.';
+  if (isValidHttpUrl(url)) {
+    embed.url = url;
+  }
 
-  return { topicData, embed };
+  const content = isReply
+    ? `🗨️ Nouvelle réponse : ${title}\n${url}`
+    : `🆕 Nouveau sujet : ${title}\n${url}`;
+
+  return { topicData, embed, content };
 }
 
 function extractTidPid(data) {
@@ -115,50 +170,37 @@ Plugin.addAdminNavigation = (header) => {
   return header;
 };
 
-// Fired when a new topic is posted (creation)
 Plugin.onTopicPost = async (data) => {
-  try {
-    const settings = await getSettings();
-    if (!settings.webhookUrl) return;
+  const settings = await getSettings();
+  if (!settings.webhookUrl) return;
 
-    const { tid } = extractTidPid(data);
-    if (!tid) return;
+  const { tid } = extractTidPid(data);
+  if (!tid) return;
 
-    const built = await buildTopicEmbed({ tid, isReply: false });
-    if (!built) return;
+  const built = await buildPayload({ tid, isReply: false });
+  if (!built) return;
 
-    if (!cidAllowed(built.topicData.cid, settings.cids)) return;
+  if (!cidAllowed(built.topicData.cid, settings.cids)) return;
 
-    await postToDiscord(settings.webhookUrl, { embeds: [built.embed] });
-  } catch (err) {
-    // eslint-disable-next-line no-console
-    console.error(err);
-  }
+  await sendDiscord(settings.webhookUrl, { embeds: [built.embed] }, built.content);
 };
 
-// Fired when a reply is made in a topic
 Plugin.onTopicReply = async (data) => {
-  try {
-    const settings = await getSettings();
-    if (!settings.notifyReplies) return;
-    if (!settings.webhookUrl) return;
+  const settings = await getSettings();
+  if (!settings.notifyReplies) return;
+  if (!settings.webhookUrl) return;
 
-    const { tid, pid } = extractTidPid(data);
-    if (!tid || !pid) return;
+  const { tid, pid } = extractTidPid(data);
+  if (!tid || !pid) return;
 
-    const built = await buildTopicEmbed({ tid, pid, isReply: true });
-    if (!built) return;
+  const built = await buildPayload({ tid, pid, isReply: true });
+  if (!built) return;
 
-    // Safety: don't notify if somehow this is the main post
-    if (built.topicData?.mainPid && String(built.topicData.mainPid) === String(pid)) return;
+  if (built.topicData?.mainPid && String(built.topicData.mainPid) === String(pid)) return;
 
-    if (!cidAllowed(built.topicData.cid, settings.cids)) return;
+  if (!cidAllowed(built.topicData.cid, settings.cids)) return;
 
-    await postToDiscord(settings.webhookUrl, { embeds: [built.embed] });
-  } catch (err) {
-    // eslint-disable-next-line no-console
-    console.error(err);
-  }
+  await sendDiscord(settings.webhookUrl, { embeds: [built.embed] }, built.content);
 };
 
 module.exports = Plugin;

package/package.json

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

package/plugin.json

@@ -22,7 +22,7 @@
     }
   ],
   "templates": "templates",
-  "acpScripts": [
-    "static/lib/acp-toast.js"
-  ]
+  "modules": {
+    "../admin/plugins/discord-onekite.js": "static/lib/admin.js"
+  }
 }

package/static/lib/{acp-toast.js → admin.js}

@@ -1,10 +1,10 @@
 'use strict';
-/* global $, app, ajaxify */
+/* global app */
 
-(function () {
-  function showToastIfSaved() {
-    if (!ajaxify || !ajaxify.data || ajaxify.data.template !== 'admin/plugins/discord-onekite') return;
+define('admin/plugins/discord-onekite', [], function () {
+  const ACP = {};
 
+  function toastIfSaved() {
     try {
       const url = new URL(window.location.href);
       const saved = url.searchParams.get('saved');
@@ -12,7 +12,6 @@
         if (window.app && typeof app.alertSuccess === 'function') {
           app.alertSuccess('Paramètres enregistrés !');
         }
-        // remove the query param to avoid re-toasting on navigation
         url.searchParams.delete('saved');
         window.history.replaceState({}, document.title, url.toString());
       }
@@ -21,6 +20,9 @@
     }
   }
 
-  $(window).on('action:ajaxify.end', showToastIfSaved);
-  $(showToastIfSaved);
-})();
+  ACP.init = function () {
+    toastIfSaved();
+  };
+
+  return ACP;
+});

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

@@ -1,15 +1,9 @@
 <div class="acp-page-container">
   <h4>Discord Onekite</h4>
   <p class="text-muted">
-    Notifications Discord via webhook (rendu serveur).
+    Notifications Discord via webhook.
   </p>
 
-  <!-- IF saved -->
-  <div class="alert alert-success" role="alert">
-    Paramètres enregistrés !
-  </div>
-  <!-- ENDIF saved -->
-
   <form role="form" method="post" action="/admin/plugins/discord-onekite/save">
     <input type="hidden" name="_csrf" value="{config.csrf_token}" />
 
@@ -39,4 +33,10 @@
 
     <button type="submit" class="btn btn-primary">Enregistrer</button>
   </form>
+
+  <noscript>
+    <!-- IF saved -->
+    <div class="alert alert-success mt-3" role="alert">Paramètres enregistrés !</div>
+    <!-- ENDIF saved -->
+  </noscript>
 </div>