nodebb-plugin-discord-onekite 1.0.10 → 1.0.11

package/README.md

@@ -1,2 +1,4 @@
-# nodebb-plugin-discord-onekite v1.0.8
-Clean build (no debug). Server-side ACP + success alert.
+# 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/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,6 +71,12 @@ 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 }) => {
@@ -110,22 +115,16 @@ Plugin.addAdminNavigation = (header) => {
   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;
@@ -137,23 +136,22 @@ Plugin.onTopicSave = async (data) => {
   }
 };
 
-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 isNew = data?.isNew === true || data?.post?.isNew === true;
-    if (!isNew) return;
+    const { tid, pid } = extractTidPid(data);
+    if (!tid || !pid) 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] });

package/package.json

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

package/plugin.json

@@ -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);
+})();