nodebb-plugin-discord-onekite 1.0.15 → 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

@@ -8,7 +8,6 @@ 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');
 
@@ -38,15 +37,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,15 +89,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) {
+    // If Discord rejects embeds, retry with plain content only.
+    if (e && e.statusCode === 400 && payload && payload.content) {
       try {
-        await postToDiscord(webhookUrl, { content: fallbackContent });
+        await postToDiscord(webhookUrl, { content: payload.content });
         return;
       } catch (e2) {
         console.error(e2);
@@ -131,37 +121,25 @@ async function getPostExcerpt(pid) {
 async function buildPayload({ tid, pid, isReply }) {
   const baseUrl = normalizeBaseUrl(meta.config.url);
 
-  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;
+  // 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');
 
-  // Ensure the message is clickable: markdown link + also raw URL in first line
-  const content = [
-    postUrl,  // raw URL first line
-    isReply ? `🗨️ Nouvelle réponse : [${title}](${postUrl})` : `🆕 Nouveau sujet : [${title}](${topicUrl})`,
-    description ? description : '',
-  ].filter(Boolean).join('\n');
+  const embed = { title, description: excerpt || '' , url: targetUrl };
 
-  return { topicData, embed, content };
+  return { topicData, content, embed };
 }
 
 function extractTidPid(data) {
@@ -180,8 +158,8 @@ Plugin.init = async ({ router }) => {
     controllers.renderAdminPage
   );
 
-  // AJAX save endpoint for ACP (used by admin.js)
-  router.post('/api/admin/plugins/discord-onekite/save',
+  // AJAX save endpoint (used by admin.js via api.post)
+  router.post('/admin/plugins/discord-onekite/save',
     middleware.admin.checkPrivileges,
     async (req, res) => {
       try {
@@ -218,11 +196,9 @@ Plugin.onTopicPost = async (data) => {
 
   const built = await buildPayload({ 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, { content: built.content, embeds: [built.embed] });
 };
 
 Plugin.onTopicReply = async (data) => {
@@ -235,12 +211,9 @@ Plugin.onTopicReply = async (data) => {
 
   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, { content: built.content, embeds: [built.embed] }, built.content);
+  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.15",
+  "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 !');