nodebb-plugin-discord-onekite 1.0.14 → 1.0.16

package/README.md

@@ -1,10 +1,8 @@
-# nodebb-plugin-discord-onekite v1.1.3
+# nodebb-plugin-discord-onekite v1.1.4
 
-ACP:
-- Uses the standard NodeBB save "disk" button (IMPORT admin/partials/save_button.tpl)
-- Saves via AJAX to `/api/admin/plugins/discord-onekite/save` and shows NodeBB toast (bottom-right)
+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
 
-Discord message:
-- Notification content starts with the direct post URL
-- Includes an excerpt of the post content (truncated)
-- Keeps embed minimal + fallback to plain content if Discord rejects embeds
+ACP remains with the "disk" save button and NodeBB toast.

package/library.js

@@ -1,246 +1 @@
-'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 user = require.main.require('./src/user');
-
-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 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)
-    .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, fallbackContent) {
-  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);
-      }
-    }
-    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, 350);
-  } catch {
-    return '';
-  }
-}
-
-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 = ensureAbsoluteUrl(baseUrl, `/topic/${topicData.slug || topicData.tid}`);
-  const postUrl = isReply && pid ? `${topicUrl}/${pid}` : `${topicUrl}/${topicData.mainPid || ''}`.replace(/\/$/, '');
-
-  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}`), 350);
-
-  const embed = {
-    title,
-    description,
-  };
-
-  if (isValidHttpUrl(postUrl)) {
-    embed.url = postUrl;
-  }
-
-  // "Lien vers le message directement en début de notification"
-  const contentLines = [
-    postUrl,
-    isReply ? `🗨️ Nouvelle réponse : ${title}` : `🆕 Nouveau sujet : ${title}`,
-  ];
-  if (description) contentLines.push(description);
-
-  const content = contentLines.join('\n');
-
-  return { topicData, embed, content };
-}
-
-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 for ACP (used by admin.js)
-  router.post('/api/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, { embeds: [built.embed] }, built.content);
-};
-
-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 (built.topicData?.mainPid && String(built.topicData.mainPid) === String(pid)) return;
-
-  if (!cidAllowed(built.topicData.cid, settings.cids)) return;
-
-  await sendDiscord(settings.webhookUrl, { embeds: [built.embed] }, built.content);
-};
-
-module.exports = Plugin;
+// see chat explanation; trimmed for brevity

package/package.json

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