Node.js based forum software built for the modern web
fix: use configured forum URL for shared links (#14226)
palmoni5bd4b34a55c4c
diff --git a/public/openapi/read/admin/config.yaml b/public/openapi/read/admin/config.yamlindex 9b8829710c..9f516d35cb 100644--- a/public/openapi/read/admin/config.yaml+++ b/public/openapi/read/admin/config.yaml@@ -11,6 +11,8 @@ get:schema:type: objectproperties:+ url:+ type: stringrelative_path:type: stringupload_url:diff --git a/public/openapi/read/config.yaml b/public/openapi/read/config.yamlindex 270ade9d93..a917eae060 100644--- a/public/openapi/read/config.yaml+++ b/public/openapi/read/config.yaml@@ -11,6 +11,8 @@ get:schema:type: objectproperties:+ url:+ type: stringrelative_path:type: stringupload_url:diff --git a/public/src/client/chats.js b/public/src/client/chats.jsindex 4614eea474..7ea45d8285 100644--- a/public/src/client/chats.js+++ b/public/src/client/chats.js@@ -261,7 +261,7 @@ define('forum/chats', [const copyEl = $(this);const mid = copyEl.attr('data-mid');if (mid) {- doCopy(copyEl, `${window.location.origin}/message/${mid}`);+ doCopy(copyEl, `${config.url}/message/${mid}`);}});diff --git a/public/src/modules/share.js b/public/src/modules/share.jsindex db6e4e19ac..a3289eeb70 100644--- a/public/src/modules/share.js+++ b/public/src/modules/share.js@@ -3,7 +3,6 @@define('share', ['hooks', 'translator'], function (hooks, translator) {const share = {};- const baseUrl = window.location.protocol + '//' + window.location.host;share.addShareHandlers = function (name) {function openShare(url, urlToPost, width, height) {@@ -89,7 +88,7 @@ define('share', ['hooks', 'translator'], function (hooks, translator) {function getPostUrl(clickedElement) {const pid = clickedElement.parents('[data-pid]').attr('data-pid');return pid ?- `${baseUrl + config.relative_path}/post/${pid}` :+ `${config.url}/post/${pid}` :window.location.href;}diff --git a/src/controllers/api.js b/src/controllers/api.jsindex ae9078e7d2..b7c10238dd 100644--- a/src/controllers/api.js+++ b/src/controllers/api.js@@ -14,6 +14,7 @@ const utils = require('../utils');const apiController = module.exports;+const url = nconf.get('url');const relative_path = nconf.get('relative_path');const upload_url = nconf.get('upload_url');const asset_base_url = nconf.get('asset_base_url');@@ -26,6 +27,7 @@ const fontawesome_version = utils.getFontawesomeVersion();apiController.loadConfig = async function (req) {const config = {+ url,relative_path,upload_url,asset_base_url,