nodebb-plugin-onekite-discord 1.0.12 → 1.0.14

package/library.js

@@ -2,37 +2,49 @@
 
 
 
+
+
 /**
- * Extract links from text in several formats NodeBB may produce.
- * Returns array of { text, url }.
- *
- * Supported inputs:
- * - Markdown: [text](url)
- * - HTML: <a href="url">text</a>
- * - NodeBB rendered: text(url) or text (url)
- * - Bare URLs: https://... or http://... or www.example.com
- *
- * Note: We'll output masked links in embed fields, where Discord supports them.
+ * Flatten any link-like markup to plain URLs so Discord auto-linkifies them.
+ * Supported:
+ * - [text](url)
+ * - <a href="url">text</a>
+ * - text(url) / text (url)
+ * - bare URLs and www.*
  */
-function extractDiscordLinks(str) {
-  if (!str || typeof str !== 'string') return [];
-
-  const links = [];
-  const seen = new Set();
+function flattenLinksToUrls(str) {
+  if (!str || typeof str !== 'string') return str;
 
   const normalizeUrl = (u) => {
-    if (!u) return null;
+    if (!u) return u;
     let url = String(u).trim();
     url = url.replace(/^<(.+)>$/, '$1');
     url = url.replace(/^https:\//i, 'https://');
     url = url.replace(/^http:\//i, 'http://');
     if (/^www\./i.test(url)) url = 'https://' + url;
-    // Very small sanity check
-    if (!/^https?:\/\//i.test(url)) return null;
     return url;
-      fields: linkFields,
   };
 
+  // HTML links -> URL
+  str = str.replace(/<a\s+[^>]*href=["']([^"']+)["'][^>]*>.*?<\/a>/gi, (_m, href) => {
+    return normalizeUrl(href);
+  });
+
+  // Markdown [text](url) -> URL
+  str = str.replace(/\[([^\]]+)\]\(([^)]+)\)/g, (_m, _text, url) => {
+    return normalizeUrl(url);
+  });
+
+  // text(url) or text (url) -> URL
+  str = str.replace(/([^\n\r()]{1,200}?)\s*\((https?:\/\/[^)\s]+|www\.[^)\\s]+)\)/g, (_m, _text, url) => {
+    return normalizeUrl(url);
+  });
+
+  return str;
+}
+
+;
+
   const push = (text, url) => {
     const u = normalizeUrl(url);
     if (!u) return;
@@ -73,46 +85,12 @@ function extractDiscordLinks(str) {
   return links;
 }
 
-/**
- * Remove/flatten link markup from text for embed.description readability.
- * - [text](url) -> text
- * - <a href="url">text</a> -> text
- * - text(url) -> text
- * - leaves bare URLs as-is (optional), but we can also remove them if desired.
- */
-function stripLinkMarkup(str) {
-  if (!str || typeof str !== 'string') return str;
-
-  // HTML links -> text
-  str = str.replace(/<a\s+[^>]*href=["'][^"']+["'][^>]*>(.*?)<\/a>/gi, (_m, text) => text);
-
-  // Markdown masked -> text
-  str = str.replace(/\[([^\]]+)\]\(([^)]+)\)/g, (_m, text) => text);
-
-  // NodeBB rendered -> text
-  str = str.replace(/([^\n\r()]{1,200}?)\s*\((https?:\/\/[^)\s]+|www\.[^)\s]+)\)/g, (_m, text) => String(text).trim());
+?)\s*\((https?:\/\/[^)\s]+|www\.[^)\s]+)\)/g, (_m, text) => String(text).trim());
 
   return str;
 }
 
-/**
- * Normalize links for Discord embeds.
- * Discord does NOT support masked links in embed descriptions.
- * NodeBB may already render links as: texte(url)
- * We always output a plain URL so Discord auto-linkifies it.
- */
-function formatDiscordLinks(str) {
-  if (!str || typeof str !== 'string') return str;
-
-  const normalizeUrl = (u) => {
-    if (!u) return u;
-    let url = String(u).trim();
-    url = url.replace(/^<(.+)>$/, '$1');
-    url = url.replace(/^https:\//i, 'https://');
-    url = url.replace(/^http:\//i, 'http://');
-    if (/^www\./i.test(url)) url = 'https://' + url;
-    return url;
-  };
+;
 
   // HTML <a href="...">...</a> -> URL
   str = str.replace(/<a\s+[^>]*href=["']([^"']+)["'][^>]*>.*?<\/a>/gi, (_m, href) => {
@@ -353,7 +331,7 @@ for (let i = 0; i < extractedLinks.length && linkFields.length < maxFields; i +=
   const embedTitle = `${replyIcon}${safeTitle} – ${username}`.slice(0, 256);
 
   // Embed title becomes clickable via embed.url
-  return { topicData, content: '', embed: { title: embedTitle, url: targetUrl, description: stripLinkMarkup(excerpt || '') } };
+  return { topicData, content: '', embed: { title: embedTitle, url: targetUrl, description: flattenLinksToUrls(excerpt || ''), fields: linkFields } };
 }
 
 function extractTidPid(data) {
@@ -416,4 +394,4 @@ Plugin.onTopicReply = async (data) => {
   await sendDiscord(settings.webhookUrl, { content: built.content, embeds: [built.embed] });
 };
 
-module.exports = Plugin;
+module.exports = Plugin;

package/package.json

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

package/plugin.json

@@ -31,5 +31,5 @@
   "acpScripts": [
     "public/admin.js"
   ],
-  "version": "1.0.12"
+  "version": "1.0.14"
 }