nodebb-plugin-discord-onekite 1.0.9 → 1.0.11

package/README.md

@@ -1 +1,4 @@
-Debug build v1.0.7
+# nodebb-plugin-discord-onekite v1.0.9
+
+- Uses action:topic.post for new topics and action:topic.reply for replies (more reliable than action:*save for notifications).
+- Server-side ACP settings + NodeBB-style toast (bottom-right) after save.

package/lib/controllers.js

@@ -12,28 +12,13 @@ function normalizeCids(v) {
   return [];
 }
 
-async function getCategoriesDebug(uid) {
-  const result = { method: 'getCategoriesByPrivilege', count: 0, error: null, sample: [] };
-
-  const cats = await new Promise((resolve) => {
-    try {
-      categories.getCategoriesByPrivilege('categories:cid', uid || 0, 'read', (err, categoriesData) => {
-        if (err) {
-          result.error = err.message || String(err);
-          return resolve([]);
-        }
-        if (!Array.isArray(categoriesData)) return resolve([]);
-        resolve(categoriesData.filter(Boolean));
-      });
-    } catch (e) {
-      result.error = e.message || String(e);
-      resolve([]);
-    }
+async function getReadableCategories(uid) {
+  return await new Promise((resolve) => {
+    categories.getCategoriesByPrivilege('categories:cid', uid || 0, 'read', (err, categoriesData) => {
+      if (err || !Array.isArray(categoriesData)) return resolve([]);
+      resolve(categoriesData.filter(Boolean));
+    });
   });
-
-  result.count = cats.length;
-  result.sample = cats.slice(0, 5).map(c => ({ cid: c.cid, name: c.name }));
-  return { cats, result };
 }
 
 const controllers = {};
@@ -42,7 +27,7 @@ controllers.renderAdminPage = async function (req, res) {
   const settings = await meta.settings.get(SETTINGS_KEY);
   const savedCids = normalizeCids(settings && settings.cids);
 
-  const { cats, result } = await getCategoriesDebug(req.uid);
+  const cats = await getReadableCategories(req.uid);
   const categoriesForTpl = (cats || [])
     .filter(c => c && typeof c.cid !== 'undefined' && c.name)
     .map(c => ({
@@ -52,19 +37,10 @@ controllers.renderAdminPage = async function (req, res) {
     }))
     .sort((a, b) => a.name.localeCompare(b.name));
 
-  const debug = {
-    uid: req.uid,
-    relative_path: meta.config && meta.config.relative_path,
-    url: meta.config && meta.config.url,
-    categories: result,
-    savedCidsCount: savedCids.length,
-    now: new Date().toISOString(),
-  };
-
   res.render('admin/plugins/discord-onekite', {
     settings: settings || {},
     categories: categoriesForTpl,
-    debug: JSON.stringify(debug, null, 2),
+    saved: req.query && (req.query.saved === '1' || req.query.saved === 'true'),
   });
 };
 

package/library.js

@@ -49,7 +49,7 @@ async function postToDiscord(webhookUrl, payload) {
   }
 }
 
-async function buildTopicEmbed({ tid, pid, type }) {
+async function buildTopicEmbed({ tid, pid, isReply }) {
   const baseUrl = meta.config.url;
 
   const topicData = await topics.getTopicFields(tid, ['tid', 'uid', 'cid', 'title', 'slug', 'timestamp', 'mainPid']);
@@ -58,11 +58,10 @@ async function buildTopicEmbed({ tid, pid, type }) {
   const topicUrl = `${baseUrl}/topic/${topicData.slug || topicData.tid}`;
   const u = await user.getUserFields(topicData.uid, ['username', 'picture']);
 
-  const isReply = type === 'reply';
   const embed = {
     title: topicData.title || (isReply ? 'Nouvelle réponse' : 'Nouveau sujet'),
     url: isReply && pid ? `${topicUrl}/${pid}` : topicUrl,
-    timestamp: new Date(isReply ? Date.now() : (topicData.timestamp || Date.now())).toISOString(),
+    timestamp: new Date(Date.now()).toISOString(),
     author: u?.username ? { name: u.username, icon_url: u.picture || undefined } : undefined,
     footer: { text: 'NodeBB → Discord (Onekite)' },
   };
@@ -72,11 +71,15 @@ async function buildTopicEmbed({ tid, pid, type }) {
   return { topicData, embed };
 }
 
+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 }) => {
-  console.log('[discord-onekite] init hook fired');
-
   routeHelpers.setupAdminPageRoute(
     router,
     '/admin/plugins/discord-onekite',
@@ -94,26 +97,11 @@ Plugin.init = async ({ router }) => {
           cids: req.body.cids || '',
         };
         await meta.settings.set(SETTINGS_KEY, payload);
-        console.log('[discord-onekite] settings saved');
       } catch (e) {
+        // eslint-disable-next-line no-console
         console.error('[discord-onekite] save failed', e);
       }
-      res.redirect('/admin/plugins/discord-onekite');
-    }
-  );
-
-  router.get('/admin/plugins/discord-onekite/ping',
-    middleware.admin.checkPrivileges,
-    (req, res) => {
-      res.json({
-        ok: true,
-        plugin: 'nodebb-plugin-discord-onekite',
-        version: '1.0.7',
-        uid: req.uid,
-        relative_path: meta.config && meta.config.relative_path,
-        url: meta.config && meta.config.url,
-        time: new Date().toISOString(),
-      });
+      res.redirect('/admin/plugins/discord-onekite?saved=1');
     }
   );
 };
@@ -122,58 +110,53 @@ Plugin.addAdminNavigation = (header) => {
   header.plugins.push({
     route: '/plugins/discord-onekite',
     icon: 'fa-bell',
-    name: 'Discord Onekite (Debug)',
+    name: 'Discord Onekite',
   });
   return header;
 };
 
-Plugin.onTopicSave = async (data) => {
+// Fired when a new topic is posted (creation)
+Plugin.onTopicPost = async (data) => {
   try {
     const settings = await getSettings();
     if (!settings.webhookUrl) return;
 
-    const tid = data?.tid || data?.topic?.tid;
+    const { tid } = extractTidPid(data);
     if (!tid) return;
 
-    const isNew =
-      data?.isNew === true ||
-      data?.topic?.isNew === true ||
-      (typeof data?.topic?.postcount === 'number' && data.topic.postcount === 1);
-
-    if (!isNew) return;
-
-    const built = await buildTopicEmbed({ tid, type: 'topic' });
+    const built = await buildTopicEmbed({ tid, isReply: false });
     if (!built) return;
 
     if (!cidAllowed(built.topicData.cid, settings.cids)) return;
 
     await postToDiscord(settings.webhookUrl, { embeds: [built.embed] });
   } catch (err) {
+    // eslint-disable-next-line no-console
     console.error(err);
   }
 };
 
-Plugin.onPostSave = async (data) => {
+// Fired when a reply is made in a topic
+Plugin.onTopicReply = async (data) => {
   try {
     const settings = await getSettings();
     if (!settings.notifyReplies) return;
     if (!settings.webhookUrl) return;
 
-    const pid = data?.pid || data?.post?.pid;
-    const tid = data?.tid || data?.post?.tid;
-    if (!pid || !tid) return;
+    const { tid, pid } = extractTidPid(data);
+    if (!tid || !pid) return;
 
-    const isNew = data?.isNew === true || data?.post?.isNew === true;
-    if (!isNew) return;
-
-    const built = await buildTopicEmbed({ tid, pid, type: 'reply' });
+    const built = await buildTopicEmbed({ tid, pid, isReply: true });
     if (!built) return;
 
+    // Safety: don't notify if somehow this is the main post
     if (built.topicData?.mainPid && String(built.topicData.mainPid) === String(pid)) return;
+
     if (!cidAllowed(built.topicData.cid, settings.cids)) return;
 
     await postToDiscord(settings.webhookUrl, { embeds: [built.embed] });
   } catch (err) {
+    // eslint-disable-next-line no-console
     console.error(err);
   }
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nodebb-plugin-discord-onekite",
-  "version": "1.0.9",
-  "description": "Discord webhook notifier for Onekite (NodeBB v4.x only) - debug build",
+  "version": "1.0.11",
+  "description": "Discord webhook notifier for Onekite (NodeBB v4.x only)",
   "main": "library.js",
   "license": "MIT",
   "keywords": [

package/plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "nodebb-plugin-discord-onekite",
   "name": "Discord Onekite Notifier",
-  "description": "Notifie Discord via webhook (v4.x). Version debug (ACP server-side).",
+  "description": "Notifie Discord via webhook pour nouveaux sujets et/ou r\u00e9ponses, filtrable par cat\u00e9gories (NodeBB v4.x uniquement).",
   "library": "./library.js",
   "hooks": [
     {
@@ -13,13 +13,16 @@
       "method": "addAdminNavigation"
     },
     {
-      "hook": "action:topic.save",
-      "method": "onTopicSave"
+      "hook": "action:topic.post",
+      "method": "onTopicPost"
     },
     {
-      "hook": "action:post.save",
-      "method": "onPostSave"
+      "hook": "action:topic.reply",
+      "method": "onTopicReply"
     }
   ],
-  "templates": "templates"
+  "templates": "templates",
+  "acpScripts": [
+    "static/lib/acp-toast.js"
+  ]
 }

package/static/lib/acp-toast.js

@@ -0,0 +1,26 @@
+'use strict';
+/* global $, app, ajaxify */
+
+(function () {
+  function showToastIfSaved() {
+    if (!ajaxify || !ajaxify.data || ajaxify.data.template !== 'admin/plugins/discord-onekite') return;
+
+    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 !');
+        }
+        // remove the query param to avoid re-toasting on navigation
+        url.searchParams.delete('saved');
+        window.history.replaceState({}, document.title, url.toString());
+      }
+    } catch (e) {
+      // ignore
+    }
+  }
+
+  $(window).on('action:ajaxify.end', showToastIfSaved);
+  $(showToastIfSaved);
+})();

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

@@ -1,9 +1,15 @@
 <div class="acp-page-container">
-  <h4>Discord Onekite (Debug)</h4>
+  <h4>Discord Onekite</h4>
   <p class="text-muted">
-    Cette page est en rendu serveur et inclut des informations de debug.
+    Notifications Discord via webhook (rendu serveur).
   </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}" />
 
@@ -15,7 +21,7 @@
     <div class="form-check mb-3">
       <input class="form-check-input" type="checkbox" id="notifyReplies" name="notifyReplies" <!-- IF settings.notifyReplies -->checked<!-- ENDIF settings.notifyReplies -->>
       <label class="form-check-label" for="notifyReplies">
-        Notifier aussi les réponses
+        Notifier aussi les réponses (si décoché : uniquement les nouveaux sujets)
       </label>
     </div>
 
@@ -33,13 +39,4 @@
 
     <button type="submit" class="btn btn-primary">Enregistrer</button>
   </form>
-
-  <hr />
-
-  <h5>Debug</h5>
-  <pre style="white-space: pre-wrap;">{debug}</pre>
-  <p>
-    Endpoint de test (doit répondre JSON) :
-    <code>/admin/plugins/discord-onekite/ping</code>
-  </p>
 </div>