nodebb-plugin-link-preview 1.0.1 → 1.0.3

package/library.js

@@ -4,9 +4,12 @@ const winston = require.main.require('winston');
 const dns = require('dns');
 
 const { getLinkPreview } = require('link-preview-js');
+const { load } = require('cheerio');
 
 const meta = require.main.require('./src/meta');
 const cache = require.main.require('./src/cache');
+const posts = require.main.require('./src/posts');
+const postsCache = require.main.require('./src/posts/cache');
 
 const controllers = require('./lib/controllers');
 
@@ -34,31 +37,30 @@ plugin.applyDefaults = async (data) => {
 	return data;
 };
 
-async function process(content) {
-	const anchorRegex = /<a\s+(?:[^>]*?\s+)?href=["']([^"']*)["'][^>]*>(.*?)<\/a>/g;
-	const matches = [];
-	let match;
-
+async function process(content, opts) {
 	const { embedHtml, embedImage, embedAudio, embedVideo } = await meta.settings.get('link-preview');
 	if (![embedHtml, embedImage, embedAudio, embedVideo].some(prop => prop === 'on')) {
 		return content;
 	}
 
-	// eslint-disable-next-line no-cond-assign
-	while ((match = anchorRegex.exec(content)) !== null) {
-		matches.push(match);
-	}
+	const $ = load(content, null, false);
+	for (const anchor of $('a')) {
+		const $anchor = $(anchor);
+		const url = $anchor.attr('href');
 
-	const previews = await Promise.all(matches.map(async (match) => {
-		const anchor = match[1];
+		if ($anchor.hasClass('plugin-mentions-a')) {
+			break;
+		}
 
-		const cached = cache.get(`link-preview:${anchor}`);
+		const cached = cache.get(`link-preview:${url}`);
 		if (cached) {
-			return await render(cached);
+			// eslint-disable-next-line no-await-in-loop
+			$anchor.replaceWith($(await render(cached)));
+			break;
 		}
 
 		// Generate the preview, but return false for now so as to not block response
-		getLinkPreview(anchor, {
+		getLinkPreview(url, {
 			resolveDNSHost: async url => new Promise((resolve, reject) => {
 				const { hostname } = new URL(url);
 				dns.lookup(hostname, (err, address) => {
@@ -84,34 +86,23 @@ async function process(content) {
 
 				return false;
 			},
-		}).then((preview) => {
-			const parsedUrl = new URL(anchor);
+		}).then(async (preview) => {
+			const parsedUrl = new URL(url);
 			preview.hostname = parsedUrl.hostname;
 
 			winston.verbose(`[link-preview] ${preview.url} (${preview.contentType}, cache: miss)`);
-			cache.set(`link-preview:${anchor}`, preview);
+			cache.set(`link-preview:${url}`, preview);
+
+			if (opts.hasOwnProperty('pid') && await posts.exists(opts.pid)) {
+				postsCache.del(String(opts.pid));
+			}
 		}).catch(() => {
-			winston.verbose(`[link-preview] ${anchor} (invalid, cache: miss)`);
-			cache.set(`link-preview:${anchor}`, {
-				url: anchor,
-			});
+			winston.verbose(`[link-preview] ${url} (invalid, cache: miss)`);
+			cache.set(`link-preview:${url}`, { url });
 		});
+	}
 
-		return false;
-	}));
-
-	// Replace match with embed
-	previews.forEach((preview, idx) => {
-		if (preview) {
-			const match = matches[idx];
-			const { index } = match;
-			const { length } = match[0];
-
-			content = `${content.substring(0, index)}${preview}${content.substring(index + length)}`;
-		}
-	});
-
-	return content;
+	return $.html();
 }
 
 async function render(preview) {
@@ -145,9 +136,9 @@ async function render(preview) {
 
 plugin.onParse = async (payload) => {
 	if (typeof payload === 'string') { // raw
-		payload = await process(payload);
+		payload = await process(payload, {});
 	} else if (payload && payload.postData && payload.postData.content) { // post
-		payload.postData.content = await process(payload.postData.content);
+		payload.postData.content = await process(payload.postData.content, { pid: payload.postData.pid });
 	}
 
 	return payload;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-link-preview",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "A starter kit for quickly creating NodeBB plugins",
   "main": "library.js",
   "repository": {
@@ -43,6 +43,7 @@
     "lint-staged": "13.2.2"
   },
   "dependencies": {
+    "cheerio": "^1.0.0-rc.12",
     "link-preview-js": "^3.0.4"
   }
 }

package/static/templates/partials/link-preview/html.tpl

@@ -1,8 +1,8 @@
-<div class="card col-6 position-relative link-preview">
+<div class="card col-md-9 col-lg-6 position-relative link-preview">
 	{{{ if images.length }}}
 	{{{ each images }}}
 	{{{ if @first }}}
-	<img src="{@value}" class="card-img-top" style="max-height: 15rem;" />
+	<img src="{@value}" class="card-img-top not-responsive" style="max-height: 15rem;" />
 	{{{ end }}}
 	{{{ end }}}
 	{{{ end }}}
@@ -18,7 +18,7 @@
 		{{{ if favicons.length }}}
 		{{{ each favicons }}}
 		{{{ if @first }}}
-		<img src="{@value}" alt="favicon" style="max-width: 21px; max-height: 21px;" />
+		<img src="{@value}" alt="favicon" class="not-responsive" style="max-width: 21px; max-height: 21px;" />
 		{{{ end }}}
 		{{{ end }}}
 		{{{ end }}}