nodebb-plugin-onekite-discord 1.0.9 → 1.0.11

package/library.js

@@ -1,10 +1,10 @@
 'use strict';
 
-
-
 /**
- * Discord doesn't support masked links like [text](url) inside embed descriptions.
- * To keep links clickable, convert them to plain URLs (Discord auto-linkifies).
+ * 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;
@@ -12,30 +12,28 @@ function formatDiscordLinks(str) {
   const normalizeUrl = (u) => {
     if (!u) return u;
     let url = String(u).trim();
-
-    // Strip wrapping <> if present
     url = url.replace(/^<(.+)>$/, '$1');
-
-    // Fix common "https:/" typo
     url = url.replace(/^https:\//i, 'https://');
     url = url.replace(/^http:\//i, 'http://');
-
-    // If it's a bare domain starting with www., add scheme
     if (/^www\./i.test(url)) url = 'https://' + url;
-
     return url;
   };
 
-  // HTML links -> URL
-  str = str.replace(/<a\s+[^>]*href=["']([^"']+)["'][^>]*>(.*?)<\/a>/gi, (_m, href, _text) => {
+  // HTML <a href="...">...</a> -> URL
+  str = str.replace(/<a\s+[^>]*href=["']([^"']+)["'][^>]*>.*?<\/a>/gi, (_m, href) => {
     return normalizeUrl(href);
   });
 
-  // Markdown links [text](url) -> URL
+  // Markdown [text](url) -> URL
   str = str.replace(/\[([^\]]+)\]\(([^)]+)\)/g, (_m, _text, url) => {
     return normalizeUrl(url);
   });
 
+  // Already-rendered form: texte(url)
+  str = str.replace(/([^\s(]+)\((https?:\/\/[^)]+|www\.[^)]+)\)/g, (_m, _text, url) => {
+    return normalizeUrl(url);
+  });
+
   return str;
 }
 
@@ -303,4 +301,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.9",
+  "version": "1.0.11",
   "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.9"
+  "version": "1.0.11"
 }