nodebb-plugin-discord-onekite 1.0.16 → 1.1.7

package/README.md

@@ -1,8 +1,10 @@
-# nodebb-plugin-discord-onekite v1.1.4
+# nodebb-plugin-discord-onekite v1.1.6
 
-Discord:
-- Always sends the forum topic link (example: https://www.onekite.com/topic/16024/test-discord)
-- First line is the raw URL, then a Markdown clickable link `[title](url)`
-- Still sends an embed (title clickable via embed.url) + fallback to plain content if embeds are rejected
+This fixes the broken v1.1.5 zip (missing files).
+
+ACP:
+- Standard NodeBB save disk button
+- AJAX save endpoint + NodeBB toast
 
-ACP remains with the "disk" save button and NodeBB toast.
+Discord:
+- Single clickable line "Nouveau sujet : [Titre](URL)" then excerpt below

package/library.js

@@ -1 +1,219 @@
-// see chat explanation; trimmed for brevity
+'use strict';
+
+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 controllers = require('./lib/controllers');
+
+const SETTINGS_KEY = 'discord-onekite';
+
+function normalizeCids(value) {
+  if (!value) return [];
+  if (Array.isArray(value)) return value.map(v => String(v)).filter(Boolean);
+  if (typeof value === 'string') return value.split(',').map(s => s.trim()).filter(Boolean);
+  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 stripHtml(html) {
+  if (!html) return '';
+  return String(html)
+    .replace(/<br\s*\/?>/gi, '\n')
+    .replace(/<\/p>/gi, '\n')
+    .replace(/<[^>]*>/g, '')
+    .replace(/&nbsp;/g, ' ')
+    .replace(/&amp;/g, '&')
+    .replace(/&lt;/g, '<')
+    .replace(/&gt;/g, '>')
+    .replace(/&#39;/g, "'")
+    .replace(/&quot;/g, '"')
+    .trim();
+}
+
+function truncate(s, n) {
+  const str = String(s || '');
+  if (str.length <= n) return str;
+  return str.slice(0, n - 1) + '…';
+}
+
+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),
+  };
+}
+
+function cidAllowed(topicCid, allowedCids) {
+  if (!allowedCids || allowedCids.length === 0) return true;
+  return allowedCids.includes(String(topicCid));
+}
+
+async function postToDiscord(webhookUrl, payload) {
+  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 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) {
+  if (!webhookUrl) return;
+  try {
+    await postToDiscord(webhookUrl, payload);
+  } catch (e) {
+    // If Discord rejects embeds, retry with plain content only.
+    if (e && e.statusCode === 400 && payload && payload.content) {
+      try {
+        await postToDiscord(webhookUrl, { content: payload.content });
+        return;
+      } catch (e2) {
+        console.error(e2);
+      }
+    }
+    console.error(e);
+  }
+}
+
+async function getPostExcerpt(pid) {
+  if (!pid) return '';
+  try {
+    const p = await posts.getPostFields(pid, ['content']);
+    const text = stripHtml(p && p.content);
+    return truncate(text, 500);
+  } catch {
+    return '';
+  }
+}
+
+async function buildPayload({ tid, pid, isReply }) {
+  const baseUrl = normalizeBaseUrl(meta.config.url);
+
+  const topicData = await topics.getTopicFields(tid, ['tid', 'cid', 'title', 'slug', 'mainPid']);
+  if (!topicData) return null;
+
+  const topicUrl = ensureAbsoluteUrl(baseUrl, `/topic/${topicData.slug || topicData.tid}`);
+  const targetUrl = (isReply && pid) ? `${topicUrl}/${pid}` : topicUrl;
+
+  const title = (topicData.title || (isReply ? 'Nouvelle réponse' : 'Nouveau sujet')).toString().slice(0, 256);
+  const excerpt = await getPostExcerpt(isReply ? pid : topicData.mainPid);
+
+  // Single clickable link line + excerpt below
+  const linkLine = isReply
+    ? `🗨️ Nouvelle réponse : [${title}](${targetUrl})`
+    : `🆕 Nouveau sujet : [${title}](${topicUrl})`;
+
+  const content = [linkLine, excerpt].filter(Boolean).join('\n');
+
+  const embed = { title, description: excerpt || '' , url: targetUrl };
+
+  return { topicData, content, 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 = {};
+
+Plugin.init = async ({ router }) => {
+  routeHelpers.setupAdminPageRoute(
+    router,
+    '/admin/plugins/discord-onekite',
+    [],
+    controllers.renderAdminPage
+  );
+
+  // AJAX save endpoint (used by admin.js via api.post)
+  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' : '',
+          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 });
+      }
+    }
+  );
+};
+
+Plugin.addAdminNavigation = (header) => {
+  header.plugins.push({
+    route: '/plugins/discord-onekite',
+    icon: 'fa-bell',
+    name: 'Discord Onekite',
+  });
+  return header;
+};
+
+Plugin.onTopicPost = async (data) => {
+  const settings = await getSettings();
+  if (!settings.webhookUrl) return;
+
+  const { tid } = extractTidPid(data);
+  if (!tid) return;
+
+  const built = await buildPayload({ tid, isReply: false });
+  if (!built) return;
+  if (!cidAllowed(built.topicData.cid, settings.cids)) return;
+
+  await sendDiscord(settings.webhookUrl, { content: built.content, embeds: [built.embed] });
+};
+
+Plugin.onTopicReply = async (data) => {
+  const settings = await getSettings();
+  if (!settings.notifyReplies) return;
+  if (!settings.webhookUrl) return;
+
+  const { tid, pid } = extractTidPid(data);
+  if (!tid || !pid) return;
+
+  const built = await buildPayload({ tid, pid, isReply: true });
+  if (!built) return;
+  if (!cidAllowed(built.topicData.cid, settings.cids)) return;
+
+  await sendDiscord(settings.webhookUrl, { content: built.content, embeds: [built.embed] });
+};
+
+module.exports = Plugin;

package/package.json

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

package/static/lib/admin.js

@@ -21,6 +21,7 @@ define('admin/plugins/discord-onekite', ['api'], function (api) {
         cids: getMultiSelectValues('#cids'),
       };
 
+      // api.post prefixes /api automatically, so server route must be /admin/...
       api.post('/admin/plugins/discord-onekite/save', payload).then(function () {
         if (window.app && typeof app.alertSuccess === 'function') {
           app.alertSuccess('Paramètres enregistrés !');