nodebb-plugin-onekite-discord 1.0.13 → 1.0.15

package/library.js

@@ -3,133 +3,45 @@
 
 
 /**
- * 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.
+ * Discord embed descriptions do not support masked links like [text](url).
+ * To keep links clickable, flatten any link-like markup into plain URLs,
+ * which Discord auto-linkifies.
  */
-function extractDiscordLinks(str) {
-  if (!str || typeof str !== 'string') return [];
-
-  const links = [];
-  const seen = new Set();
-
-  const normalizeUrl = (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;
-  };
-
-  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 masked links
-  str.replace(/\[([^\]]+)\]\(([^)]+)\)/g, (_m, text, url) => {
-    push(text, url);
-    return _m;
-  });
-
-  // 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;
-  });
-
-  // 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;
-}
-
-/**
- * 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());
-
-  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) {
+function flattenLinksToUrls(str) {
   if (!str || typeof str !== 'string') return str;
 
   const normalizeUrl = (u) => {
-    if (!u) return u;
+    if (!u) return '';
     let url = String(u).trim();
     url = url.replace(/^<(.+)>$/, '$1');
+    // fix common typos
     url = url.replace(/^https:\//i, 'https://');
     url = url.replace(/^http:\//i, 'http://');
+    // add scheme for bare www.
     if (/^www\./i.test(url)) url = 'https://' + url;
     return url;
   };
 
-  // HTML <a href="...">...</a> -> URL
+  // HTML links -> URL
   str = str.replace(/<a\s+[^>]*href=["']([^"']+)["'][^>]*>.*?<\/a>/gi, (_m, href) => {
     return normalizeUrl(href);
   });
 
-  // Markdown [text](url) -> URL
+  // Markdown masked links -> 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;
+  // NodeBB rendered: "texte du lien(url)" or "texte du lien (url)" -> URL
+  str = str.replace(/([^\n\r()]{1,200}?)\s*\((https?:\/\/[^)\s]+|www\.[^)\s]+)\)/g, (_m, _text, url) => {
+    return normalizeUrl(url);
+  });
+
+  // Ensure bare "www.xxx" tokens become "https://www.xxx"
+  str = str.replace(/\b(www\.[^\s<>()]+)\b/g, (_m, url) => {
+    // strip trailing punctuation
+    const clean = url.replace(/[),.;!?]+$/g, '');
+    return normalizeUrl(clean);
   });
 
   return str;
@@ -176,26 +88,6 @@ function ensureAbsoluteUrl(baseUrl, maybeUrl) {
   return s;
 }
 
-
-function normalizeExcerptLinks(input) {
-  if (!input) return '';
-  let s = String(input);
-
-  // Convert HTML anchors to "text (url)" before stripping HTML
-  s = s.replace(/<a\s+[^>]*href=["']([^"']+)["'][^>]*>([\s\S]*?)<\/a>/gi, (m, href, inner) => {
-    const text = stripHtml(inner).trim() || href;
-    return `${text} (${href})`;
-  });
-
-  // Convert Markdown links [text](url) to "text (url)"
-  s = s.replace(/\[([^\]]+)\]\(([^\s)]+)\)/g, (m, label, url) => `${label} (${url})`);
-
-  // Fix common malformed scheme "https:/example.com" -> "https://example.com"
-  s = s.replace(/\b(https?):\/(?!\/)/g, '$1://');
-
-  return s;
-}
-
 function stripHtml(html) {
   if (!html) return '';
   return String(html)
@@ -297,8 +189,7 @@ async function getPostExcerpt(pid) {
   if (!pid) return '';
   try {
     const p = await posts.getPostFields(pid, ['content']);
-    const normalized = normalizeExcerptLinks(p && p.content);
-    const text = stripHtml(normalized);
+    const text = stripHtml(p && p.content);
     return truncate(text, 500);
   } catch {
     return '';
@@ -329,22 +220,6 @@ 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');
 
@@ -352,7 +227,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 || ''), fields: linkFields } };
+  return { topicData, content: '', embed: { title: embedTitle, url: targetUrl, description: flattenLinksToUrls(excerpt || '') } };
 }
 
 function extractTidPid(data) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-onekite-discord",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "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.13"
+  "version": "1.0.15"
 }