nodebb-plugin-discord-onekite 1.1.9 → 1.1.10

package/README.md

@@ -1,5 +1,5 @@
-# nodebb-plugin-discord-onekite v1.1.8
+# nodebb-plugin-discord-onekite v1.1.7
 
-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.
+Fixes webpack template build errors by removing `<!-- IMPORT admin/partials/save_button.tpl -->` and using an inline save button.
+
+Everything else unchanged from v1.1.6.

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

@@ -94,6 +94,7 @@ async function sendDiscord(webhookUrl, payload) {
   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 });
@@ -129,13 +130,14 @@ async function buildPayload({ tid, pid, isReply }) {
   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 };
+  const embed = { title, description: excerpt || '' , url: targetUrl };
 
   return { topicData, content, embed };
 }
@@ -156,6 +158,7 @@ Plugin.init = async ({ router }) => {
     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) => {
@@ -166,10 +169,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');
     }
   );
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-discord-onekite",
-  "version": "1.1.9",
+  "version": "1.1.10",
   "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,40 @@
+'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 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 !');
+        }
+      }).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,15 @@
 <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}" />
+  <div class="d-flex justify-content-between align-items-start mb-3">
+    <div>
+      <h4 class="mb-1">Discord Onekite</h4>
+      <p class="text-muted mb-0">Notifications Discord via webhook.</p>
+    </div>
+    <button id="save" class="btn btn-primary">
+      <i class="fa fa-save"></i> Enregistrer
+    </button>
+  </div>
 
+  <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/..." />
@@ -32,7 +33,5 @@
         Si aucune catégorie n’est sélectionnée : <strong>toutes les catégories</strong> seront notifiées.
       </p>
     </div>
-
-    <button type="submit" class="btn btn-primary"><i class="fa fa-save"></i> Enregistrer</button>
   </form>
 </div>