nodebb-plugin-discord-onekite 1.0.13 → 1.0.15

package/README.md

@@ -1,8 +1,8 @@
-# nodebb-plugin-discord-onekite v1.1.2
+# nodebb-plugin-discord-onekite v1.1.4
 
-Fix build error:
-- Removed `acpScripts` and instead provides a proper AMD admin module via `modules` mapping.
-This avoids RequireJS build failures.
+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
 
-- Toast "classique NodeBB" via app.alertSuccess when `?saved=1`.
-- Discord notifications: minimal embed + fallback to plain content if Discord rejects embed.
+ACP remains with the "disk" save button and NodeBB toast.

package/lib/controllers.js

@@ -40,7 +40,6 @@ controllers.renderAdminPage = async function (req, res) {
   res.render('admin/plugins/discord-onekite', {
     settings: settings || {},
     categories: categoriesForTpl,
-    saved: req.query && (req.query.saved === '1' || req.query.saved === 'true'),
   });
 };
 

package/library.js

@@ -7,6 +7,7 @@ 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');
@@ -46,6 +47,27 @@ function isValidHttpUrl(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 {
@@ -88,40 +110,56 @@ async function sendDiscord(webhookUrl, payload, fallbackContent) {
         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 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', 'uid', '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 url = 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: isReply ? `Réponse de **${authorName}**` : `Sujet créé par **${authorName}**`,
+    description,
   };
+  if (isValidHttpUrl(postUrl)) embed.url = postUrl;
 
-  if (isValidHttpUrl(url)) {
-    embed.url = url;
-  }
-
-  const content = isReply
-    ? `🗨️ Nouvelle réponse : ${title}\n${url}`
-    : `🆕 Nouveau sujet : ${title}\n${url}`;
+  // 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');
 
   return { topicData, embed, content };
 }
@@ -142,7 +180,8 @@ Plugin.init = async ({ router }) => {
     controllers.renderAdminPage
   );
 
-  router.post('/admin/plugins/discord-onekite/save',
+  // AJAX save endpoint for ACP (used by admin.js)
+  router.post('/api/admin/plugins/discord-onekite/save',
     middleware.admin.checkPrivileges,
     async (req, res) => {
       try {
@@ -152,11 +191,11 @@ Plugin.init = async ({ router }) => {
           cids: req.body.cids || '',
         };
         await meta.settings.set(SETTINGS_KEY, payload);
+        res.json({ ok: true });
       } catch (e) {
-        // eslint-disable-next-line no-console
         console.error('[discord-onekite] save failed', e);
+        res.status(500).json({ ok: false });
       }
-      res.redirect('/admin/plugins/discord-onekite?saved=1');
     }
   );
 };
@@ -182,7 +221,8 @@ Plugin.onTopicPost = async (data) => {
 
   if (!cidAllowed(built.topicData.cid, settings.cids)) return;
 
-  await sendDiscord(settings.webhookUrl, { embeds: [built.embed] }, built.content);
+  // Send content + embed (content ensures clickable link always)
+  await sendDiscord(settings.webhookUrl, { content: built.content, embeds: [built.embed] }, built.content);
 };
 
 Plugin.onTopicReply = async (data) => {
@@ -200,7 +240,7 @@ Plugin.onTopicReply = async (data) => {
 
   if (!cidAllowed(built.topicData.cid, settings.cids)) return;
 
-  await sendDiscord(settings.webhookUrl, { embeds: [built.embed] }, built.content);
+  await sendDiscord(settings.webhookUrl, { content: built.content, embeds: [built.embed] }, built.content);
 };
 
 module.exports = Plugin;

package/package.json

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

package/static/lib/admin.js

@@ -1,27 +1,38 @@
 'use strict';
-/* global app */
+/* global $, app */
 
-define('admin/plugins/discord-onekite', [], function () {
+define('admin/plugins/discord-onekite', ['api'], function (api) {
   const ACP = {};
 
-  function toastIfSaved() {
-    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) {
-      // ignore
-    }
+  function getMultiSelectValues(selector) {
+    const el = document.querySelector(selector);
+    if (!el) return [];
+    return Array.from(el.selectedOptions || []).map(o => o.value);
   }
 
   ACP.init = function () {
-    toastIfSaved();
+    const $form = $('.discord-onekite-settings');
+    if (!$form.length) return;
+
+    $('#save').off('click.discordOnekite').on('click.discordOnekite', function () {
+      const payload = {
+        webhookUrl: String($('#webhookUrl').val() || '').trim(),
+        notifyReplies: $('#notifyReplies').is(':checked'),
+        cids: getMultiSelectValues('#cids'),
+      };
+
+      api.post('/admin/plugins/discord-onekite/save', payload).then(function () {
+        if (window.app && typeof app.alertSuccess === 'function') {
+          app.alertSuccess('Paramètres enregistrés !');
+        }
+      }).catch(function (err) {
+        // eslint-disable-next-line no-console
+        console.error(err);
+        if (window.app && typeof app.alertError === 'function') {
+          app.alertError('Erreur lors de l’enregistrement');
+        }
+      });
+    });
   };
 
   return ACP;

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

@@ -4,9 +4,7 @@
     Notifications Discord via webhook.
   </p>
 
-  <form role="form" method="post" action="/admin/plugins/discord-onekite/save">
-    <input type="hidden" name="_csrf" value="{config.csrf_token}" />
-
+  <form role="form" class="discord-onekite-settings">
     <div class="mb-3">
       <label class="form-label" for="webhookUrl">Discord Webhook URL</label>
       <input type="text" class="form-control" id="webhookUrl" name="webhookUrl" value="{settings.webhookUrl}" placeholder="https://discord.com/api/webhooks/..." />
@@ -31,12 +29,6 @@
       </p>
     </div>
 
-    <button type="submit" class="btn btn-primary">Enregistrer</button>
+    <!-- IMPORT admin/partials/save_button.tpl -->
   </form>
-
-  <noscript>
-    <!-- IF saved -->
-    <div class="alert alert-success mt-3" role="alert">Paramètres enregistrés !</div>
-    <!-- ENDIF saved -->
-  </noscript>
 </div>