nodebb-plugin-discord-onekite 1.1.9 → 1.1.11

package/README.md

@@ -1,5 +1,9 @@
-# nodebb-plugin-discord-onekite v1.1.8
+# nodebb-plugin-discord-onekite v1.1.4.2
 
-This variant avoids RequireJS admin modules (no `modules` / no AMD) to prevent requirejs build failures.
-ACP saves with a normal POST + redirect and shows a success banner.
-Discord notifications unchanged.
+Based on v1.1.4.
+
+Change: Discord notification format is now:
+- Single clickable link line: 🆕 Nouveau sujet : [Titre](URL) (or reply variant)
+- Excerpt below
+
+ACP behavior unchanged from v1.1.4.

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

@@ -8,6 +8,7 @@ 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');
 
@@ -37,6 +38,15 @@ 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)
@@ -89,14 +99,15 @@ async function postToDiscord(webhookUrl, payload) {
   }
 }
 
-async function sendDiscord(webhookUrl, payload) {
+async function sendDiscord(webhookUrl, payload, fallbackContent) {
   if (!webhookUrl) return;
+
   try {
     await postToDiscord(webhookUrl, payload);
   } catch (e) {
-    if (e && e.statusCode === 400 && payload && payload.content) {
+    if (e && e.statusCode === 400 && fallbackContent) {
       try {
-        await postToDiscord(webhookUrl, { content: payload.content });
+        await postToDiscord(webhookUrl, { content: fallbackContent });
         return;
       } catch (e2) {
         console.error(e2);
@@ -120,24 +131,40 @@ async function getPostExcerpt(pid) {
 async function buildPayload({ tid, pid, isReply }) {
   const baseUrl = normalizeBaseUrl(meta.config.url);
 
-  const topicData = await topics.getTopicFields(tid, ['tid', 'cid', 'title', 'slug', 'mainPid']);
+  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 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;
 
+  // Message format:
+  // 1) A single clickable link line: "🆕 Nouveau sujet : [Titre](URL)" (or reply variant)
+  // 2) Excerpt below
   const linkLine = isReply
-    ? `🗨️ Nouvelle réponse : [${title}](${targetUrl})`
+    ? `🗨️ Nouvelle réponse : [${title}](${postUrl})`
     : `🆕 Nouveau sujet : [${title}](${topicUrl})`;
 
-  const content = [linkLine, excerpt].filter(Boolean).join('\n');
-
-  const embed = { title, description: excerpt || '', url: targetUrl };
+  const content = [linkLine, description].filter(Boolean).join('
+');
 
-  return { topicData, content, embed };
+  return { topicData, embed, content };
 }
 
 function extractTidPid(data) {
@@ -156,7 +183,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 {
@@ -166,10 +194,11 @@ Plugin.init = async ({ router }) => {
           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 });
       }
-      res.redirect('/admin/plugins/discord-onekite?saved=1');
     }
   );
 };
@@ -192,9 +221,11 @@ Plugin.onTopicPost = async (data) => {
 
   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] });
+  // Send content + embed (content ensures clickable link always)
+  await sendDiscord(settings.webhookUrl, { content: built.content, embeds: [built.embed] }, built.content);
 };
 
 Plugin.onTopicReply = async (data) => {
@@ -207,9 +238,12 @@ 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] });
+  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.1.9",
+  "version": "1.1.11",
   "description": "Discord webhook notifier for Onekite (NodeBB v4.x only)",
   "main": "library.js",
   "license": "MIT",

package/plugin.json

@@ -21,5 +21,8 @@
       "method": "onTopicReply"
     }
   ],
-  "templates": "templates"
+  "templates": "templates",
+  "modules": {
+    "../admin/plugins/discord-onekite.js": "static/lib/admin.js"
+  }
 }

package/static/lib/admin.js

@@ -0,0 +1,39 @@
+'use strict';
+/* global $, app */
+
+define('admin/plugins/discord-onekite', ['api'], function (api) {
+  const ACP = {};
+
+  function getMultiSelectValues(selector) {
+    const el = document.querySelector(selector);
+    if (!el) return [];
+    return Array.from(el.selectedOptions || []).map(o => o.value);
+  }
+
+  ACP.init = function () {
+    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

@@ -1,14 +1,10 @@
 <div class="acp-page-container">
   <h4>Discord Onekite</h4>
-  <p class="text-muted">Notifications Discord via webhook.</p>
-
-  <!-- IF saved -->
-  <div class="alert alert-success" role="alert">Paramètres enregistrés !</div>
-  <!-- ENDIF saved -->
-
-  <form role="form" method="post" action="/admin/plugins/discord-onekite/save">
-    <input type="hidden" name="_csrf" value="{config.csrf_token}" />
+  <p class="text-muted">
+    Notifications Discord via webhook.
+  </p>
 
+  <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/..." />
@@ -33,6 +29,6 @@
       </p>
     </div>
 
-    <button type="submit" class="btn btn-primary"><i class="fa fa-save"></i> Enregistrer</button>
+    <!-- IMPORT admin/partials/save_button.tpl -->
   </form>
 </div>