nodebb-plugin-onekite-discord 1.0.10 → 1.0.12

package/library.js

@@ -1,56 +1,138 @@
+'use strict';
+
+
+
 /**
- * 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.
+ * 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.
  */
-function formatDiscordLinks(str) {
-  if (!str || typeof str !== 'string') return str;
+function extractDiscordLinks(str) {
+  if (!str || typeof str !== 'string') return [];
+
+  const links = [];
+  const seen = new Set();
 
   const normalizeUrl = (u) => {
-    if (!u) return u;
+    if (!u) return null;
     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 <a href>
-  str = str.replace(/<a\s+[^>]*href=["']([^"']+)["'][^>]*>.*?<\/a>/gi, (_m, href) => {
-    return normalizeUrl(href);
+  const push = (text, url) => {
+    const u = normalizeUrl(url);
+    if (!u) return;
+    const key = `${text || ''}||${u}`;
+    if (seen.has(key)) return;
+    seen.add(key);
+    links.push({ text: (text || '').trim(), url: u });
+  };
+
+  // HTML links
+  str.replace(/<a\s+[^>]*href=["']([^"']+)["'][^>]*>(.*?)<\/a>/gi, (_m, href, text) => {
+    push(text, href);
+    return _m;
   });
 
-  // Markdown [text](url)
-  str = str.replace(/\[([^\]]+)\]\(([^)]+)\)/g, (_m, _text, url) => {
-    return normalizeUrl(url);
+  // Markdown masked links
+  str.replace(/\[([^\]]+)\]\(([^)]+)\)/g, (_m, text, url) => {
+    push(text, url);
+    return _m;
   });
 
-  // Already-rendered form: texte(url)
-  str = str.replace(/([^\s(]+)\((https?:\/\/[^)]+|www\.[^)]+)\)/g, (_m, _text, url) => {
-    return normalizeUrl(url);
+  // NodeBB rendered: "texte du lien(url)" or "texte du lien (url)"
+  str.replace(/([^\n\r()]{1,200}?)\s*\((https?:\/\/[^)\s]+|www\.[^)\s]+)\)/g, (_m, text, url) => {
+    push(text, url);
+    return _m;
   });
 
-  return str;
+  // Bare URLs (avoid trailing punctuation)
+  str.replace(/\b(https?:\/\/[^\s<>()]+)\b/g, (_m, url) => {
+    push('', url.replace(/[),.;!?]+$/g, ''));
+    return _m;
+  });
+  str.replace(/\b(www\.[^\s<>()]+)\b/g, (_m, url) => {
+    push('', url.replace(/[),.;!?]+$/g, ''));
+    return _m;
+  });
+
+  return links;
 }
 
-'use strict';
+/**
+ * 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());
 
-  // HTML links -> URL
-  str = str.replace(/<a\s+[^>]*href=["']([^"']+)["'][^>]*>(.*?)<\/a>/gi, (_m, href, _text) => {
+  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) => {
     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 from NodeBB: texte du lien(url) or texte du lien (url)
+  // Convert to: "texte du lien https://url" so Discord auto-linkifies.
+  str = str.replace(/([^\n\r()]{1,200}?)\s*\((https?:\/\/[^)\s]+|www\.[^)\s]+)\)/g, (_m, text, url) => {
+    const cleanText = String(text).trim();
+    const cleanUrl = normalizeUrl(url);
+    if (!cleanUrl) return _m;
+    return cleanText ? `${cleanText} ${cleanUrl}` : cleanUrl;
+  });
+
   return str;
 }
 
@@ -248,6 +330,22 @@ async function buildEmbed({ tid, pid, isReply }) {
 
   const excerpt = await getPostExcerpt(isReply ? pid : topicData.mainPid);
 
+// Extract all links and put them in embed fields (Discord supports masked links in fields)
+const extractedLinks = extractDiscordLinks(excerpt || '');
+const linkFields = [];
+const maxFields = 25; // Discord limit
+for (let i = 0; i < extractedLinks.length && linkFields.length < maxFields; i += 1) {
+  const { text, url } = extractedLinks[i];
+  const label = text && text.length ? text : url;
+  // Field values have a 1024 char limit; keep it safe
+  const value = `[${label.substring(0, 200)}](${url})`;
+  linkFields.push({
+    name: `Lien ${linkFields.length + 1}`,
+    value: value.substring(0, 1024),
+    inline: false,
+  });
+}
+
   const postForUser = await posts.getPostFields(isReply ? pid : topicData.mainPid, ['uid']);
   const username = await user.getUserField(postForUser.uid, 'username');
 
@@ -255,7 +353,7 @@ async function buildEmbed({ tid, pid, isReply }) {
   const embedTitle = `${replyIcon}${safeTitle} – ${username}`.slice(0, 256);
 
   // Embed title becomes clickable via embed.url
-  return { topicData, content: '', embed: { title: embedTitle, url: targetUrl, description: formatDiscordLinks(excerpt || '') } };
+  return { topicData, content: '', embed: { title: embedTitle, url: targetUrl, description: stripLinkMarkup(excerpt || '') } };
 }
 
 function extractTidPid(data) {
@@ -318,4 +416,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.10",
+  "version": "1.0.12",
   "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.10"
+  "version": "1.0.12"
 }