nodebb-plugin-discord-onekite 1.0.10 → 1.0.12

package/README.md

@@ -1,2 +1,5 @@
-# nodebb-plugin-discord-onekite v1.0.8
-Clean build (no debug). Server-side ACP + success alert.
+# nodebb-plugin-discord-onekite v1.1.1
+
+Fix:
+- Makes embeds ultra-minimal (title/description/url only).
+- On Discord 400 embed validation error, retries with plain `content` so a notification is always delivered.

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,41 +61,79 @@ 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 sendDiscord(webhookUrl, payload, fallbackContent) {
+  if (!webhookUrl) return;
+
+  try {
+    await postToDiscord(webhookUrl, payload);
+  } catch (e) {
+    // Discord embed validation error is commonly 400 with {"embeds":["0"]}
+    // Retry with plain content so notifications still arrive.
+    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 buildTopicEmbed({ tid, pid, type }) {
-  const baseUrl = meta.config.url;
+async function buildPayload({ tid, pid, isReply }) {
+  const baseUrl = normalizeBaseUrl(meta.config.url);
 
-  const topicData = await topics.getTopicFields(tid, ['tid', 'uid', 'cid', 'title', 'slug', 'timestamp', 'mainPid']);
+  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 isReply = type === 'reply';
+  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);
+
+  // Super-minimal embed to avoid Discord rejecting unknown/invalid fields.
   const embed = {
-    title: topicData.title || (isReply ? 'Nouvelle réponse' : 'Nouveau sujet'),
-    url: isReply && pid ? `${topicUrl}/${pid}` : topicUrl,
-    timestamp: new Date(isReply ? Date.now() : (topicData.timestamp || 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;
+  }
+
+  const content = isReply
+    ? `🗨️ Nouvelle réponse : ${title}\n${url}`
+    : `🆕 Nouveau sujet : ${title}\n${url}`;
+
+  return { topicData, embed, content };
+}
 
-  return { topicData, embed };
+function extractTidPid(data) {
+  const tid = data?.tid || data?.topic?.tid || data?.post?.tid;
+  const pid = data?.pid || data?.post?.pid;
+  return { tid, pid };
 }
 
 const Plugin = {};
@@ -110,57 +174,37 @@ Plugin.addAdminNavigation = (header) => {
   return header;
 };
 
-Plugin.onTopicSave = async (data) => {
-  try {
-    const settings = await getSettings();
-    if (!settings.webhookUrl) return;
-
-    const tid = data?.tid || data?.topic?.tid;
-    if (!tid) return;
+Plugin.onTopicPost = async (data) => {
+  const settings = await getSettings();
+  if (!settings.webhookUrl) return;
 
-    const isNew =
-      data?.isNew === true ||
-      data?.topic?.isNew === true ||
-      (typeof data?.topic?.postcount === 'number' && data.topic.postcount === 1);
+  const { tid } = extractTidPid(data);
+  if (!tid) return;
 
-    if (!isNew) return;
+  const built = await buildPayload({ tid, isReply: false });
+  if (!built) return;
 
-    const built = await buildTopicEmbed({ tid, type: 'topic' });
-    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);
 };
 
-Plugin.onPostSave = async (data) => {
-  try {
-    const settings = await getSettings();
-    if (!settings.notifyReplies) return;
-    if (!settings.webhookUrl) return;
+Plugin.onTopicReply = async (data) => {
+  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;
+  const { tid, pid } = extractTidPid(data);
+  if (!tid || !pid) return;
 
-    const isNew = data?.isNew === true || data?.post?.isNew === true;
-    if (!isNew) return;
+  const built = await buildPayload({ tid, pid, isReply: true });
+  if (!built) return;
 
-    const built = await buildTopicEmbed({ tid, pid, type: 'reply' });
-    if (!built) return;
+  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.10",
+  "version": "1.0.12",
   "description": "Discord webhook notifier for Onekite (NodeBB v4.x only)",
   "main": "library.js",
   "license": "MIT",

package/plugin.json

@@ -13,13 +13,16 @@
       "method": "addAdminNavigation"
     },
     {
-      "hook": "action:topic.save",
-      "method": "onTopicSave"
+      "hook": "action:topic.post",
+      "method": "onTopicPost"
     },
     {
-      "hook": "action:post.save",
-      "method": "onPostSave"
+      "hook": "action:topic.reply",
+      "method": "onTopicReply"
     }
   ],
-  "templates": "templates"
+  "templates": "templates",
+  "acpScripts": [
+    "static/lib/acp-toast.js"
+  ]
 }

package/static/lib/acp-toast.js

@@ -0,0 +1,23 @@
+'use strict';
+/* global $, app, ajaxify */
+
+(function () {
+  function showToastIfSaved() {
+    if (!ajaxify || !ajaxify.data || ajaxify.data.template !== 'admin/plugins/discord-onekite') return;
+
+    try {
+      const url = new URL(window.location.href);
+      const saved = url.searchParams.get('saved');
+      if (saved === '1' || saved === 'true') {
+        if (window.app && typeof app.alertSuccess === 'function') {
+          app.alertSuccess('Paramètres enregistrés !');
+        }
+        url.searchParams.delete('saved');
+        window.history.replaceState({}, document.title, url.toString());
+      }
+    } catch (e) {}
+  }
+
+  $(window).on('action:ajaxify.end', showToastIfSaved);
+  $(showToastIfSaved);
+})();