Node.js based forum software built for the modern web
fix: regression caused by cc6fd49c4d2ddc6970ea23011dece5ba91517ec0
Julian Lam06c382474029
diff --git a/src/posts/parse.js b/src/posts/parse.jsindex f2017c2106..46efafb0d6 100644--- a/src/posts/parse.js+++ b/src/posts/parse.js@@ -88,16 +88,9 @@ module.exports = function (Posts) {while (current !== null) {if (current[1]) {try {- parsed = new URL(current[1]);- if (!parsed.protocol) {- if (current[1].startsWith('/')) {- // Internal link- absolute = nconf.get('base_url') + current[1];- } else {- // External link- absolute = `//${current[1]}`;- }-+ parsed = new URL(current[1], nconf.get('url'));+ absolute = parsed.toString();+ if (absolute !== current[1]) {const offset = current[0].indexOf(current[1]);content = content.slice(0, current.index + offset) +absolute +diff --git a/test/posts.js b/test/posts.jsindex 2fc22904fc..4fce2f2ff5 100644--- a/test/posts.js+++ b/test/posts.js@@ -763,18 +763,18 @@ describe('Post\'s', () => {it('should turn relative links in post body to absolute urls', (done) => {const nconf = require('nconf');- const content = '<a href="/users">test</a> <a href="youtube.com">youtube</a>';+ const content = '<a href="/users">test</a> <a href="//youtube.com">youtube</a>';const parsedContent = posts.relativeToAbsolute(content, posts.urlRegex);- assert.equal(parsedContent, `<a href="${nconf.get('base_url')}/users">test</a> <a href="//youtube.com">youtube</a>`);+ assert.equal(parsedContent, `<a href="${nconf.get('base_url')}/users">test</a> <a href="https://youtube.com/">youtube</a>`);done();});it('should turn relative links in post body to absolute urls', (done) => {const nconf = require('nconf');- const content = '<a href="/users">test</a> <a href="youtube.com">youtube</a> some test <img src="/path/to/img"/>';+ const content = '<a href="/users">test</a> <a href="//youtube.com">youtube</a> some test <img src="/path/to/img"/>';let parsedContent = posts.relativeToAbsolute(content, posts.urlRegex);parsedContent = posts.relativeToAbsolute(parsedContent, posts.imgRegex);- assert.equal(parsedContent, `<a href="${nconf.get('base_url')}/users">test</a> <a href="//youtube.com">youtube</a> some test <img src="${nconf.get('base_url')}/path/to/img"/>`);+ assert.equal(parsedContent, `<a href="${nconf.get('base_url')}/users">test</a> <a href="https://youtube.com/">youtube</a> some test <img src="${nconf.get('base_url')}/path/to/img"/>`);done();});});