Node.js based forum software built for the modern web
Benchpress escape (#14341)
Barış Uşaklı42a9f5f0cc1e
diff --git a/eslint.config.mjs b/eslint.config.mjsindex 41f76593e5..6a5643b2f0 100644--- a/eslint.config.mjs+++ b/eslint.config.mjs@@ -51,6 +51,7 @@ export default defineConfig([beforeEach: 'readonly',after: 'readonly',afterEach: 'readonly',+ nodebb: 'readonly',},},rules: {@@ -69,7 +70,6 @@ export default defineConfig([{files: ['nodebb-global.js',- 'src/test1.js'],languageOptions: {sourceType: 'module',diff --git a/install/package.json b/install/package.jsonindex 5914a23a7e..15b34389fe 100644--- a/install/package.json+++ b/install/package.json@@ -101,22 +101,22 @@"mousetrap": "1.6.5","multer": "2.1.1","nconf": "0.13.0",- "nodebb-plugin-2factor": "7.8.3",- "nodebb-plugin-composer-default": "10.3.34",- "nodebb-plugin-dbsearch": "6.5.1",- "nodebb-plugin-emoji": "6.0.11",+ "nodebb-plugin-2factor": "8.0.0",+ "nodebb-plugin-composer-default": "11.0.0",+ "nodebb-plugin-dbsearch": "7.0.0",+ "nodebb-plugin-emoji": "6.0.12","nodebb-plugin-emoji-android": "4.1.1","nodebb-plugin-link-preview": "2.2.8","nodebb-plugin-markdown": "13.2.5",- "nodebb-plugin-mentions": "4.8.22",+ "nodebb-plugin-mentions": "5.0.0","nodebb-plugin-spam-be-gone": "2.3.3","nodebb-plugin-web-push": "0.7.8","nodebb-rewards-essentials": "1.0.3",- "nodebb-theme-harmony": "2.2.72",- "nodebb-theme-lavender": "7.1.22",- "nodebb-theme-peace": "2.2.60",- "nodebb-theme-persona": "14.2.42",- "nodebb-widget-essentials": "7.0.44",+ "nodebb-theme-harmony": "3.0.1",+ "nodebb-theme-lavender": "8.0.3",+ "nodebb-theme-peace": "3.0.2",+ "nodebb-theme-persona": "15.0.2",+ "nodebb-widget-essentials": "8.0.0","nodemailer": "8.0.11","nprogress": "0.2.0","passport": "0.7.0",@@ -172,7 +172,7 @@"@eslint/js": "10.0.1","@stylistic/eslint-plugin": "5.10.0","ajv": "8.20.0",- "eslint-config-nodebb": "2.0.2",+ "eslint-config-nodebb": "2.0.3","globals": "17.6.0","grunt": "1.6.2","grunt-contrib-watch": "1.1.0",diff --git a/public/language/en-GB/admin/extend/rewards.json b/public/language/en-GB/admin/extend/rewards.jsonindex 2706a25f51..5899001893 100644--- a/public/language/en-GB/admin/extend/rewards.json+++ b/public/language/en-GB/admin/extend/rewards.json@@ -12,6 +12,6 @@"disable": "Disable","alert.delete-success": "Successfully deleted reward",- "alert.no-inputs-found": "Illegal reward - no inputs found!",+ "alert.no-inputs-found": "Illegal reward - no inputs found! %1","alert.save-success": "Successfully saved rewards"}\ No newline at end of filediff --git a/public/language/en-GB/error.json b/public/language/en-GB/error.jsonindex 65ef3580ac..0e23a05cb9 100644--- a/public/language/en-GB/error.json+++ b/public/language/en-GB/error.json@@ -199,6 +199,7 @@"cant-delete-chat-message": "You are not allowed to delete this message","chat-edit-duration-expired": "You are only allowed to edit chat messages for %1 second(s) after posting","chat-delete-duration-expired": "You are only allowed to delete chat messages for %1 second(s) after posting",+ "chat-message-editing-disabled": "Chat messaging editing is disabled.","chat-deleted-already": "This chat message has already been deleted.","chat-restored-already": "This chat message has already been restored.","chat-room-does-not-exist": "Chat room does not exist.",diff --git a/public/language/en-GB/global.json b/public/language/en-GB/global.jsonindex 8c2fa96789..7f86c9343b 100644--- a/public/language/en-GB/global.json+++ b/public/language/en-GB/global.json@@ -82,9 +82,9 @@"topics": "Topics","posts": "Posts","crossposts": "Cross-posts",- "x-posts": "<span class=\"formatted-number\">%1</span> posts",- "x-topics": "<span class=\"formatted-number\">%1</span> topics",- "x-reputation": "<span class=\"formatted-number\">%1</span> reputation",+ "x-posts": "%1 posts",+ "x-topics": "%1 topics",+ "x-reputation": "%1 reputation","best": "Best","controversial": "Controversial","votes": "Votes",diff --git a/public/language/en-GB/groups.json b/public/language/en-GB/groups.jsonindex 30bf4eafc4..b57a7f75b2 100644--- a/public/language/en-GB/groups.json+++ b/public/language/en-GB/groups.json@@ -55,6 +55,8 @@"details.hidden": "Hidden","details.hidden-help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually","details.delete-group": "Delete Group",+ "details.delete-group-confirm": "Are you sure you want to delete the group: <strong>\"%1\"</strong>?",+ "details.delete-group-confirm-label": "Please enter the name of this group in order to delete it:","details.private-system-help": "Private groups is disabled at system level, this option does not do anything","event.updated": "Group details have been updated",diff --git a/public/language/en-GB/modules.json b/public/language/en-GB/modules.jsonindex 48ca552d65..c3a0f3ee20 100644--- a/public/language/en-GB/modules.json+++ b/public/language/en-GB/modules.json@@ -6,8 +6,10 @@"chat.placeholder.message-room": "Message #%1","chat.scroll-up-alert": "Go to most recent message","chat.usernames-and-x-others": "%1 & %2 others",- "chat.chat-with-usernames": "Chat with %1",- "chat.chat-with-usernames-and-x-others": "Chat with %1 & %2 others",+ "chat.chat-with-usernames-and-x-others": "Chat with <a href=\"%1\">%2</a>, <a href=\"%3\">%4</a> & %5 others",+ "chat.chat-with-usernames-1": "Chat with <a href=\"%1\">%2</a>",+ "chat.chat-with-usernames-2": "Chat with <a href=\"%1\">%2</a> & <a href=\"%3\">%4</a>",+ "chat.chat-with-usernames-3": "Chat with <a href=\"%1\">%2</a>, <a href=\"%3\">%4</a> & <a href=\"%5\">%6</a>","chat.send": "Send","chat.no-active": "You have no active chats.","chat.user-typing-1": "<strong>%1</strong> is typing ...",@@ -78,7 +80,7 @@"chat.system.user-join": "%1 has joined the room <span class=\"timeago\" title=\"%2\"></span>","chat.system.user-leave": "%1 has left the room <span class=\"timeago\" title=\"%2\"></span>",- "chat.system.room-rename": "%2 has renamed this room to \"%1\" <span class=\"timeago\" title=\"%3\"></span>",+ "chat.system.room-rename": "%1 has renamed this room to \"%3\" <span class=\"timeago\" title=\"%2\"></span>","composer.compose": "Compose","composer.show-preview": "Show Preview",@@ -89,7 +91,7 @@"composer.discard": "Are you sure you wish to discard this post?","composer.submit-and-lock": "Submit and Lock","composer.toggle-dropdown": "Toggle Dropdown",- "composer.uploading": "Uploading %1",+ "composer.uploading": "Uploading %1%","composer.formatting.bold": "Bold","composer.formatting.italic": "Italic","composer.formatting.heading": "Heading",diff --git a/public/language/en-GB/user.json b/public/language/en-GB/user.jsonindex 34bf423d01..5baee47d84 100644--- a/public/language/en-GB/user.json+++ b/public/language/en-GB/user.json@@ -228,7 +228,7 @@"revoke-session": "Revoke Session","browser-version-on-platform": "%1 %2 on %3",- "consent.title": "Your Rights & Consent",+ "consent.title": "Your Rights & Consent","consent.lead": "This community forum collects and processes your personal information.","consent.intro": "We use this information strictly to personalise your experience in this community, as well as to associate the posts you make to your user account. During the registration step you were asked to provide a username and email address, you can also optionally provide additional information to complete your user profile on this website.<br /><br />We retain this information for the life of your user account, and you are able to withdraw consent at any time by deleting your account. At any time you may request a copy of your contribution to this website, via your Rights & Consent page.<br /><br />If you have any questions or concerns, we encourage you to reach out to this forum's administrative team.","consent.email-intro": "Occasionally, we may send emails to your registered email address in order to provide updates and/or to notify you of new activity that is pertinent to you. You can customise the frequency of the community digest (including disabling it outright), as well as select which types of notifications to receive via email, via your user settings page.",diff --git a/public/scss/client.scss b/public/scss/client.scssindex f15b5f54c2..6da4eb2a79 100644--- a/public/scss/client.scss+++ b/public/scss/client.scss@@ -1,6 +1,7 @@// core scss files shared by all themes@import "flags";@import "chats";+@import "groups";@import "global";@import "modals";@import "btn-ghost";@@ -9,4 +10,5 @@@import "modules/bottom-sheet";@import "modules/icon-picker";@import "modules/alerts.scss";-@import "modules/scrollbar.scss";\ No newline at end of file+@import "modules/scrollbar.scss";+@import "modules/cover";\ No newline at end of filediff --git a/public/scss/generics.scss b/public/scss/generics.scssindex ea6c2097cf..0c5dd63d90 100644--- a/public/scss/generics.scss+++ b/public/scss/generics.scss@@ -178,6 +178,7 @@ $hidden-elements-for-first-last-child: br, hr;}.trim-last-divider > *:last-child hr { display: none; }+.mb-last-0 > :last-child { margin-bottom: 0 !important; }// some classes that are used commonly in themes from bs3.hidden, .hide {diff --git a/public/scss/groups.scss b/public/scss/groups.scssnew file mode 100644index 0000000000..1c81dd78fd--- /dev/null+++ b/public/scss/groups.scss@@ -0,0 +1,20 @@+.template-groups-details #panel {+ margin-top: 0px!important;+}++.group-hover-bg {+ $hover-color: mix($body-bg, $body-color, 90%);+ $border-color: mix($body-bg, $body-color, 90%);+ border-color: $border-color!important;+ &:hover {+ background-color: $hover-color;+ }+}++.groups.details {+ margin-top: 200px;++ @include media-breakpoint-up(md) {+ margin-top: 300px;+ }+}diff --git a/public/scss/modules/cover.scss b/public/scss/modules/cover.scssnew file mode 100644index 0000000000..33c6571263--- /dev/null+++ b/public/scss/modules/cover.scss@@ -0,0 +1,104 @@+// used in group and account pages+.cover {+ background-size: cover;+ background-repeat: no-repeat;+ height: 200px;+ position: absolute;+ background-origin: content-box;+ width: 100%;+ top: var(--panel-offset)!important;+ left: auto;+ right: 0px;++ &:hover .controls, .controls:focus-within {+ opacity: 1;+ }++ .controls {+ height: 200px;+ line-height: 200px;+ opacity: 0;+ @include transition(opacity .15s linear);+ cursor: pointer;+ pointer-events: none;++ > * {+ pointer-events: all;+ }+ }++ &.active {+ &:hover {+ cursor: move;+ }++ .controls {+ > * {+ display: none;+ }+ }++ .save {+ display: inline-block;+ }+ }++ &.saving {+ .save {+ display: none;+ }++ .indicator {+ display: inline-block;+ }+ }++ .save, .indicator {+ display: inline-block;+ position: absolute;+ bottom: 1em;+ left: 50%;+ transform: translateX(-50%);+ opacity: 1;+ padding: 0.5em;+ font-weight: bold;++ &:hover {+ cursor: pointer;+ }+ }++ .save {+ display: none;+ }++ .indicator {+ display: none;+ }+}++.cover > .container {+ height: 200px;+ position: relative;+ pointer-events: none;+ .save {+ pointer-events: all;+ }+ .controls {+ pointer-events: none;+ > * {+ pointer-events: all;+ }+ }+}++@include media-breakpoint-up(md) {+ .cover, .cover > .container {+ height: 300px;++ .controls {+ height: 300px;+ line-height: 300px;+ }+ }+}\ No newline at end of filediff --git a/public/src/admin/admin.js b/public/src/admin/admin.jsindex c9bbd2bc5b..b984eb939d 100644--- a/public/src/admin/admin.js+++ b/public/src/admin/admin.js@@ -141,13 +141,13 @@ app.onDomReady();}function setupRestartLinks() {- require(['benchpress', 'bootbox', 'admin/modules/instance'], function (benchpress, bootbox, instance) {+ require(['benchpress', 'modals', 'admin/modules/instance'], function (benchpress, modals, instance) {// need to preload the compiled alert template// otherwise it can be unloaded when rebuild & restart is run// the client can't fetch the template file, resulting in an errorbenchpress.render('partials/toast', {}).then(function () {$('[component="rebuild-and-restart"]').off('click').on('click', function () {- bootbox.confirm('[[admin/admin:alert.confirm-rebuild-and-restart]]', function (confirm) {+ modals.confirm('[[admin/admin:alert.confirm-rebuild-and-restart]]', function (confirm) {if (confirm) {instance.rebuildAndRestart();}@@ -155,7 +155,7 @@ app.onDomReady();});$('[component="restart"]').off('click').on('click', function () {- bootbox.confirm('[[admin/admin:alert.confirm-restart]]', function (confirm) {+ modals.confirm('[[admin/admin:alert.confirm-restart]]', function (confirm) {if (confirm) {instance.restart();}diff --git a/public/src/admin/advanced/errors.js b/public/src/admin/advanced/errors.jsindex b457846a1e..3a5c0c2ec3 100644--- a/public/src/admin/advanced/errors.js+++ b/public/src/admin/advanced/errors.js@@ -9,7 +9,7 @@ import {Filler,} from 'chart.js';-import * as bootbox from 'bootbox';+import * as modals from 'modals';import * as alerts from '../../modules/alerts';Chart.register(@@ -30,7 +30,7 @@ export function init() {}function clear404() {- bootbox.confirm('[[admin/advanced/errors:clear404-confirm]]', function (ok) {+ modals.confirm('[[admin/advanced/errors:clear404-confirm]]', function (ok) {if (ok) {socket.emit('admin.errors.clear', {}, function (err) {if (err) {diff --git a/public/src/admin/advanced/events.js b/public/src/admin/advanced/events.jsindex ecf494bf31..ed1a086fe2 100644--- a/public/src/admin/advanced/events.js+++ b/public/src/admin/advanced/events.js@@ -1,12 +1,12 @@'use strict';-define('admin/advanced/events', ['bootbox', 'alerts', 'autocomplete'], function (bootbox, alerts, autocomplete) {+define('admin/advanced/events', ['modals', 'alerts', 'autocomplete'], function (modals, alerts, autocomplete) {const Events = {};Events.init = function () {$('[data-action="clear"]').on('click', function () {- bootbox.confirm('[[admin/advanced/events:confirm-delete-all-events]]', (confirm) => {+ modals.confirm('[[admin/advanced/events:confirm-delete-all-events]]', (confirm) => {if (confirm) {socket.emit('admin.deleteAllEvents', function (err) {if (err) {diff --git a/public/src/admin/appearance/skins.js b/public/src/admin/appearance/skins.jsindex 17cb426d6e..49000fb9f0 100644--- a/public/src/admin/appearance/skins.js+++ b/public/src/admin/appearance/skins.js@@ -94,34 +94,28 @@ define('admin/appearance/skins', [});};- function highlightSelectedTheme(themeId) {- translator.translate('[[admin/appearance/skins:select-skin]] || [[admin/appearance/skins:current-skin]]', function (text) {- text = text.split(' || ');- const select = text[0];- const current = text[1];-- $('[data-theme]')- .removeClass('selected')- .find('[data-action="use"]').each(function () {- if ($(this).parents('[data-theme]').attr('data-theme')) {- $(this)- .html(select)- .removeClass('btn-success')- .addClass('btn-primary');- }- });+ async function highlightSelectedTheme(themeId) {+ $('[data-theme]')+ .removeClass('selected')+ .find('[data-action="use"]').each(function () {+ if ($(this).parents('[data-theme]').attr('data-theme')) {+ $(this)+ .translateText('[[admin/appearance/skins:select-skin]]')+ .removeClass('btn-success')+ .addClass('btn-primary');+ }+ });- if (!themeId) {- return;- }+ if (!themeId) {+ return;+ }- $('[data-theme="' + themeId + '"]')- .addClass('selected')- .find('[data-action="use"]')- .html(current)- .removeClass('btn-primary')- .addClass('btn-success');- });+ $(`[data-theme="${themeId}"]`)+ .addClass('selected')+ .find('[data-action="use"]')+ .translateText('[[admin/appearance/skins:current-skin]]')+ .removeClass('btn-primary')+ .addClass('btn-success');}return Skins;diff --git a/public/src/admin/appearance/themes.js b/public/src/admin/appearance/themes.jsindex 2fe0022c77..958f6534ef 100644--- a/public/src/admin/appearance/themes.js+++ b/public/src/admin/appearance/themes.js@@ -1,7 +1,7 @@'use strict';-define('admin/appearance/themes', ['bootbox', 'translator', 'alerts'], function (bootbox, translator, alerts) {+define('admin/appearance/themes', ['modals', 'translator', 'alerts'], function (modals, translator, alerts) {const Themes = {};Themes.init = function () {@@ -49,7 +49,7 @@ define('admin/appearance/themes', ['bootbox', 'translator', 'alerts'], functionif (config['theme:id'] === 'nodebb-theme-harmony') {return;}- bootbox.confirm('[[admin/appearance/themes:revert-confirm]]', function (confirm) {+ modals.confirm('[[admin/appearance/themes:revert-confirm]]', function (confirm) {if (confirm) {socket.emit('admin.themes.set', {type: 'local',@@ -76,25 +76,19 @@ define('admin/appearance/themes', ['bootbox', 'translator', 'alerts'], function};function highlightSelectedTheme(themeId) {- translator.translate('[[admin/appearance/themes:select-theme]] || [[admin/appearance/themes:current-theme]]', function (text) {- text = text.split(' || ');- const select = text[0];- const current = text[1];+ $('[data-theme]')+ .removeClass('selected')+ .find('[data-action="use"]')+ .translateText('[[admin/appearance/themes:select-theme]]')+ .removeClass('btn-success')+ .addClass('btn-primary');- $('[data-theme]')- .removeClass('selected')- .find('[data-action="use"]')- .html(select)- .removeClass('btn-success')- .addClass('btn-primary');-- $('[data-theme="' + themeId + '"]')- .addClass('selected')- .find('[data-action="use"]')- .html(current)- .removeClass('btn-primary')- .addClass('btn-success');- });+ $('[data-theme="' + themeId + '"]')+ .addClass('selected')+ .find('[data-action="use"]')+ .translateText('[[admin/appearance/themes:current-theme]]')+ .removeClass('btn-primary')+ .addClass('btn-success');}return Themes;diff --git a/public/src/admin/dashboard.js b/public/src/admin/dashboard.jsindex a290a791c7..f52574df97 100644--- a/public/src/admin/dashboard.js+++ b/public/src/admin/dashboard.js@@ -12,11 +12,10 @@ import {Legend,} from 'chart.js';-import * as Benchpress from 'benchpressjs';-import * as bootbox from 'bootbox';+import * as modals from '../modules/modals';import * as alerts from '../modules/alerts';import * as translator from '../modules/translator';-import { formattedNumber } from '../modules/helpers';+import { formattedNumber, escape } from '../modules/helpers';import { setupFullscreen } from './modules/fullscreen';@@ -370,58 +369,57 @@ function setupGraphs(callback) {$('[data-action="updateGraph"] option[value="range"]').addClass('hidden');});- function throwCustomRangeSelector(targetEl) {- Benchpress.render('admin/partials/pageviews-range-select', {}).then(function (html) {- const modal = bootbox.dialog({- title: '[[admin/dashboard:page-views-custom]]',- message: html,- buttons: {- submit: {- label: '[[global:search]]',- className: 'btn-primary',- callback: submit,- },+ async function throwCustomRangeSelector(targetEl) {+ const html = await app.parseAndTranslate('admin/partials/pageviews-range-select', {});+ const modal = await modals.dialog({+ title: '[[admin/dashboard:page-views-custom]]',+ message: html,+ buttons: {+ submit: {+ label: '[[global:search]]',+ className: 'btn-primary',+ callback: submit,},- }).on('shown.bs.modal', function () {- const date = new Date();- const today = date.toISOString().slice(0, 10);- date.setDate(date.getDate() - 1);- const yesterday = date.toISOString().slice(0, 10);-- modal.find('#startRange').val(targetEl.attr('data-startRange') || yesterday);- modal.find('#endRange').val(targetEl.attr('data-endRange') || today);- });-- function submit() {- // NEED TO ADD VALIDATION HERE FOR YYYY-MM-DD- const formData = modal.find('form').serializeObject();- const validRegexp = /\d{4}-\d{2}-\d{2}/;-- // Input validation- if (!formData.startRange && !formData.endRange) {- // No range? Assume last 30 days- updateTrafficGraph('days');- return;- } else if (!validRegexp.test(formData.startRange) || !validRegexp.test(formData.endRange)) {- // Invalid Input- modal.find('.alert-danger').removeClass('hidden');- return false;- }-- let until = new Date(formData.endRange);- until.setDate(until.getDate() + 1);- until = until.getTime();- const amount = (until - new Date(formData.startRange).getTime()) / (1000 * 60 * 60 * 24);-- updateTrafficGraph('days', until, amount);-- // Update "custom range" label- targetEl.attr('data-startRange', formData.startRange);- targetEl.attr('data-endRange', formData.endRange);- targetEl.find('option[value="range"]').text(formData.startRange + ' - ' + formData.endRange);- targetEl.val('range');- }+ },+ }).on('shown.bs.modal', function () {+ const date = new Date();+ const today = date.toISOString().slice(0, 10);+ date.setDate(date.getDate() - 1);+ const yesterday = date.toISOString().slice(0, 10);++ modal.find('#startRange').val(targetEl.attr('data-startRange') || yesterday);+ modal.find('#endRange').val(targetEl.attr('data-endRange') || today);});++ function submit() {+ // NEED TO ADD VALIDATION HERE FOR YYYY-MM-DD+ const formData = modal.find('form').serializeObject();+ const validRegexp = /\d{4}-\d{2}-\d{2}/;++ // Input validation+ if (!formData.startRange && !formData.endRange) {+ // No range? Assume last 30 days+ updateTrafficGraph('days');+ return;+ } else if (!validRegexp.test(formData.startRange) || !validRegexp.test(formData.endRange)) {+ // Invalid Input+ modal.find('.alert-danger').removeClass('hidden');+ return false;+ }++ let until = new Date(formData.endRange);+ until.setDate(until.getDate() + 1);+ until = until.getTime();+ const amount = (until - new Date(formData.startRange).getTime()) / (1000 * 60 * 60 * 24);++ updateTrafficGraph('days', until, amount);++ // Update "custom range" label+ targetEl.attr('data-startRange', formData.startRange);+ targetEl.attr('data-endRange', formData.endRange);+ targetEl.find('option[value="range"]').text(formData.startRange + ' - ' + formData.endRange);+ targetEl.val('range');+ }}callback();@@ -454,10 +452,6 @@ function updateTrafficGraph(units, until, amount) {graphs.traffic.data.xLabels = utils.getDaysArray(until, amount);} else {graphs.traffic.data.xLabels = utils.getHoursArray();-- $('#pageViewsThirty').html(formattedNumber(data.summary.thirty));- $('#pageViewsSeven').html(formattedNumber(data.summary.seven));- $('#pageViewsPastDay').html(formattedNumber(data.pastDay));}graphs.traffic.data.datasets[0].data = data.pageviews;@@ -509,7 +503,7 @@ function updatePresenceGraph(users) {function updateTopicsGraph(topics) {if (!topics.length) {- translator.translate('[[admin/dashboard:no-users-browsing]]', function (translated) {+ translator.translateKey('[[admin/dashboard:no-users-browsing]]', function (translated) {topics = [{title: translated,count: 1,@@ -534,15 +528,19 @@ function updateTopicsGraph(topics) {function buildTopicsLegend() {let html = '';topics.forEach(function (t, i) {- const link = t.tid ? '<a title="' + t.title + '"href="' + config.relative_path + '/topic/' + t.tid + '" target="_blank"> ' + t.title + '</a>' : t.title;- const label = t.count === '0' ? t.title : link;+ const title = escape(t.title);+ const tidEscaped = escape(t.tid);+ const link = t.tid ?+ `<a title="${title}" href="${config.relative_path}/topic/${tidEscaped}" target="_blank">${title}</a>` :+ title;+ const label = t.count === '0' ? title : link;html += '<li>' +- '<div style="background-color: ' + topicColors[i] + ';"></div>' +- '<span> (' + t.count + ') ' + label + '</span>' ++ `<div style="background-color: ${topicColors[i]};"></div>` ++ `<span>(${t.count}) ${label}</span>` +'</li>';});- $('#topics-legend').translateHtml(html);+ $('#topics-legend').html(html);}buildTopicsLegend();diff --git a/public/src/admin/dashboard/searches.js b/public/src/admin/dashboard/searches.jsindex 8e53847b64..7144d8fd67 100644--- a/public/src/admin/dashboard/searches.js+++ b/public/src/admin/dashboard/searches.js@@ -1,11 +1,11 @@'use strict';-define('admin/dashboard/searches', ['alerts', 'bootbox'], (alerts, bootbox) => {+define('admin/dashboard/searches', ['alerts', 'modals'], (alerts, modals) => {const ACP = {};ACP.init = () => {$('#clear-search-history').on('click', () => {- bootbox.confirm('[[admin/dashboard:clear-search-history-confirm]]', function (ok) {+ modals.confirm('[[admin/dashboard:clear-search-history-confirm]]', function (ok) {if (ok) {socket.emit('admin.clearSearchHistory', function (err) {if (err) {diff --git a/public/src/admin/dashboard/topics.js b/public/src/admin/dashboard/topics.jsindex 32e2bede3e..58dcd581a2 100644--- a/public/src/admin/dashboard/topics.js+++ b/public/src/admin/dashboard/topics.js@@ -24,6 +24,7 @@ define('admin/dashboard/topics', [const tbodyEl = document.querySelector('.topics-list tbody');tbodyEl.innerHTML = '';tbodyEl.append(...html.map((idx, el) => el));+ html.find('.timeago').timeago();});});}diff --git a/public/src/admin/extend/plugins.js b/public/src/admin/extend/plugins.jsindex 5e73d9622f..0358859e5e 100644--- a/public/src/admin/extend/plugins.js+++ b/public/src/admin/extend/plugins.js@@ -3,11 +3,12 @@define('admin/extend/plugins', ['translator',- 'benchpress',- 'bootbox',+ 'modals','alerts',+ 'helpers',+ 'benchpress','jquery-ui/widgets/sortable',-], function (translator, Benchpress, bootbox, alerts) {+], function (translator, modals, alerts, helpers, Benchpress) {const Plugins = {};Plugins.init = function () {const pluginsList = $('.plugins');@@ -62,7 +63,7 @@ define('admin/extend/plugins', [if (pluginData.license && pluginData.active !== true) {Benchpress.render('admin/partials/plugins/license', pluginData).then(function (html) {- bootbox.dialog({+ modals.dialog({title: '[[admin/extend/plugins:license.title]]',message: html,size: 'large',@@ -101,7 +102,7 @@ define('admin/extend/plugins', [Plugins.suggest(pluginID, function (err, payload) {if (err) {- bootbox.confirm(translator.compile('admin/extend/plugins:alert.suggest-error', err.status, err.responseText), function (confirm) {+ modals.confirm(translator.compile('admin/extend/plugins:alert.suggest-error', err.status, err.responseText), function (confirm) {if (confirm) {Plugins.toggleInstall(pluginID, 'latest');} else {@@ -134,7 +135,7 @@ define('admin/extend/plugins', [Plugins.suggest(pluginID, function (err, payload) {if (err) {- return bootbox.alert('[[admin/extend/plugins:alert.package-manager-unreachable]]');+ return modals.alert('[[admin/extend/plugins:alert.package-manager-unreachable]]');}require(['compare-versions'], function (compareVersions) {@@ -148,7 +149,7 @@ define('admin/extend/plugins', [}});} else {- bootbox.alert(translator.compile('admin/extend/plugins:alert.incompatible', app.config.version, payload.version));+ modals.alert(translator.compile('admin/extend/plugins:alert.incompatible', app.config.version, payload.version));}});});@@ -195,8 +196,8 @@ define('admin/extend/plugins', [let html = '';activePlugins.forEach(function (plugin) {html += `- <li class="d-flex justify-content-between gap-1 pointer border-bottom pb-2" data-plugin="${plugin}">- ${plugin}+ <li class="d-flex justify-content-between gap-1 pointer border-bottom pb-2" data-plugin="${helpers.escape(plugin)}">+ ${helpers.escape(plugin)}<div class="d-flex gap-1"><div class="btn btn-ghost btn-sm move-up"><i class="fa fa-chevron-up"></i>@@ -209,9 +210,9 @@ define('admin/extend/plugins', [`;});if (!activePlugins.length) {- translator.translate('[[admin/extend/plugins:none-active]]', function (text) {- $('#order-active-plugins-modal .plugin-list').html(text).sortable();- });+ $('#order-active-plugins-modal .plugin-list')+ .translateText('[[admin/extend/plugins:none-active]]')+ .sortable();return;}const list = $('#order-active-plugins-modal .plugin-list');@@ -267,7 +268,7 @@ define('admin/extend/plugins', [}function confirmInstall(pluginID, callback) {- bootbox.confirm(translator.compile('admin/extend/plugins:alert.possibly-incompatible', pluginID), function (confirm) {+ modals.confirm(translator.compile('admin/extend/plugins:alert.possibly-incompatible', pluginID), function (confirm) {callback(confirm);});}diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.jsindex 25119c3a27..f51662ed35 100644--- a/public/src/admin/extend/rewards.js+++ b/public/src/admin/extend/rewards.js@@ -78,11 +78,10 @@ define('admin/extend/rewards', [}}- function selectReward(el) {+ async function selectReward(el) {const parent = el.parents('[data-rid]');const div = parent.find('.inputs');let inputs;- let html = '';const selectedReward = available.find(reward => reward.rid === el.attr('data-selected'));if (selectedReward) {@@ -91,25 +90,9 @@ define('admin/extend/rewards', [}if (!inputs) {- return alerts.error('[[admin/extend/rewards:alert.no-inputs-found]] ' + el.attr('data-selected'));+ return alerts.error(`[[admin/extend/rewards:alert.no-inputs-found, ${el.attr('data-selected')}`);}-- inputs.forEach(function (input) {- html += `<label class="form-label text-nowrap" for="${input.name}">${input.label}<br />`;- switch (input.type) {- case 'select':- html += `<select class="form-select form-select-sm" name="${input.name}" >`;- input.values.forEach(function (value) {- html += `<option value="${value.value}">${value.name}</option>`;- });- break;- case 'text':- html += `<input type="text" class="form-control form-control-sm" name="${input.name}" />`;- break;- }- html += '</label>';- });-+ const html = await app.parseAndTranslate('admin/partials/rewards/inputs', { inputs });div.html(html);}diff --git a/public/src/admin/extend/widgets.js b/public/src/admin/extend/widgets.jsindex 73ba9a046a..9de05c5d95 100644--- a/public/src/admin/extend/widgets.js+++ b/public/src/admin/extend/widgets.js@@ -2,12 +2,12 @@define('admin/extend/widgets', [- 'bootbox',+ 'modals','alerts','jquery-ui/widgets/sortable','jquery-ui/widgets/draggable','jquery-ui/widgets/droppable',-], function (bootbox, alerts) {+], function (modals, alerts) {const Widgets = {};Widgets.init = function () {@@ -89,7 +89,7 @@ define('admin/extend/widgets', [}).on('click', '.delete-widget', function () {const panel = $(this).parents('.widget-panel');- bootbox.confirm('[[admin/extend/widgets:alert.confirm-delete]]', function (confirm) {+ modals.confirm('[[admin/extend/widgets:alert.confirm-delete]]', function (confirm) {if (confirm) {panel.remove();}diff --git a/public/src/admin/federation/relays.js b/public/src/admin/federation/relays.jsindex 3b4a2d4c31..e4495bb2db 100644--- a/public/src/admin/federation/relays.js+++ b/public/src/admin/federation/relays.js@@ -5,6 +5,7 @@ import { error } from 'alerts';import { render } from 'benchpress';import { get } from 'api';import { translate } from 'translator';+import * as modals from 'modals';import {Chart,LineController,@@ -82,7 +83,7 @@ function setupRelays() {}function throwModal() {- render('admin/partials/activitypub/relays', {}).then(function (html) {+ render('admin/partials/activitypub/relays', {}).then(async function (html) {const submit = function () {const formEl = modal.find('form').get(0);if (!formEl.reportValidity()) {@@ -98,7 +99,7 @@ function throwModal() {}}).catch(error);};- const modal = bootbox.dialog({+ const modal = await modals.dialog({title: '[[admin/settings/activitypub:relays.add]]',message: html,buttons: {diff --git a/public/src/admin/federation/rules.js b/public/src/admin/federation/rules.jsindex e948ed8938..1c25de2493 100644--- a/public/src/admin/federation/rules.js+++ b/public/src/admin/federation/rules.js@@ -5,6 +5,7 @@ import { error } from 'alerts';import { render } from 'benchpress';import { translate } from 'translator';import * as categorySelector from 'categorySelector';+import * as modals from 'modals';export function init() {setupRules();@@ -65,7 +66,7 @@ function setupRules() {}function throwModal() {- render('admin/partials/activitypub/rules', {}).then(function (html) {+ render('admin/partials/activitypub/rules', {}).then(async function (html) {const submit = function () {const formEl = modal.find('form').get(0);if (!formEl.reportValidity()) {@@ -84,7 +85,7 @@ function throwModal() {return false;};- const modal = bootbox.dialog({+ const modal = await modals.dialog({title: '[[admin/settings/activitypub:rules.add]]',message: html,buttons: {diff --git a/public/src/admin/federation/safety.js b/public/src/admin/federation/safety.jsindex 87bf72b915..6dbd475f26 100644--- a/public/src/admin/federation/safety.js+++ b/public/src/admin/federation/safety.js@@ -3,8 +3,8 @@import { get, post, del } from 'api';import { error } from 'alerts';import { render } from 'benchpress';-import { alert, dialog } from 'bootbox';import { translate } from 'translator';+import * as modals from 'modals';export function init() {setupBlocklists();@@ -55,7 +55,7 @@ async function renderList(blocklists) {}function throwModal() {- render('admin/partials/activitypub/blocklists', {}).then(function (html) {+ render('admin/partials/activitypub/blocklists', {}).then(async function (html) {const submit = function () {const formEl = modal.find('form').get(0);if (!formEl.reportValidity()) {@@ -71,7 +71,7 @@ function throwModal() {}}).catch(error);};- const modal = bootbox.dialog({+ const modal = await modals.dialog({title: '[[admin/settings/activitypub:blocklists.add]]',message: html,buttons: {@@ -163,10 +163,9 @@ async function removeDomain(domain) {}async function view(url) {- console.log('ehjre');try {const { domains, count } = await get(`/admin/activitypub/blocklists/${encodeURIComponent(url)}`);- dialog({+ modals.dialog({title: '[[admin/settings/activitypub:blocklists.view.title]]',message: `\<p>[[admin/settings/activitypub:blocklists.view.intro, ${count}]]</p> \diff --git a/public/src/admin/manage/admins-mods.js b/public/src/admin/manage/admins-mods.jsindex 634436fd12..282713f8d3 100644--- a/public/src/admin/manage/admins-mods.js+++ b/public/src/admin/manage/admins-mods.js@@ -1,8 +1,8 @@'use strict';define('admin/manage/admins-mods', [- 'autocomplete', 'api', 'bootbox', 'alerts', 'categorySelector',-], function (autocomplete, api, bootbox, alerts, categorySelector) {+ 'autocomplete', 'api', 'modals', 'alerts', 'categorySelector',+], function (autocomplete, api, modals, alerts, categorySelector) {const AdminsMods = {};AdminsMods.init = function () {@@ -30,7 +30,7 @@ define('admin/manage/admins-mods', [if (parseInt(uid, 10) === parseInt(app.user.uid, 10)) {return alerts.error('[[admin/manage/users:alerts.no-remove-yourself-admin]]');}- bootbox.confirm('[[admin/manage/users:alerts.confirm-remove-admin]]', function (confirm) {+ modals.confirm('[[admin/manage/users:alerts.confirm-remove-admin]]', function (confirm) {if (confirm) {socket.emit('admin.user.removeAdmins', [uid], function (err) {if (err) {@@ -61,7 +61,7 @@ define('admin/manage/admins-mods', [const userCard = $(this).parents('[data-uid]');const uid = userCard.attr('data-uid');- bootbox.confirm('[[admin/manage/users:alerts.confirm-remove-global-mod]]', function (confirm) {+ modals.confirm('[[admin/manage/users:alerts.confirm-remove-global-mod]]', function (confirm) {if (confirm) {api.del('/groups/global-moderators/membership/' + uid).then(() => {userCard.remove();@@ -109,7 +109,7 @@ define('admin/manage/admins-mods', [const userCard = $(this).parents('[data-uid]');const uid = userCard.attr('data-uid');- bootbox.confirm('[[admin/manage/users:alerts.confirm-remove-moderator]]', function (confirm) {+ modals.confirm('[[admin/manage/users:alerts.confirm-remove-moderator]]', function (confirm) {if (confirm) {api.del(`/categories/${cid}/moderator/${uid}`, {}, function (err) {if (err) {diff --git a/public/src/admin/manage/api.js b/public/src/admin/manage/api.jsindex d97ff95499..78bee71572 100644--- a/public/src/admin/manage/api.js+++ b/public/src/admin/manage/api.js@@ -1,6 +1,6 @@'use strict';-define('admin/manage/api', ['settings', 'clipboard', 'bootbox', 'benchpress', 'api', 'alerts'], function (settings, clipboard, bootbox, Benchpress, api, alerts) {+define('admin/manage/api', ['settings', 'clipboard', 'modals', 'benchpress', 'api', 'alerts'], function (settings, clipboard, modals, Benchpress, api, alerts) {const ACP = {};ACP.init = function () {@@ -81,7 +81,7 @@ define('admin/manage/api', ['settings', 'clipboard', 'bootbox', 'benchpress', 'areturn false;};- bootbox.dialog({+ modals.dialog({title: '[[admin/settings/api:create-token]]',message: html,buttons: {@@ -125,7 +125,7 @@ define('admin/manage/api', ['settings', 'clipboard', 'bootbox', 'benchpress', 'a};const html = await Benchpress.render('admin/partials/edit-token-modal', { uid, description });- bootbox.dialog({+ modals.dialog({title: '[[admin/settings/api:update-token]]',message: html,buttons: {@@ -142,7 +142,7 @@ define('admin/manage/api', ['settings', 'clipboard', 'bootbox', 'benchpress', 'aconst rowEl = el.closest('[data-token]');const token = rowEl.getAttribute('data-token');- bootbox.confirm('[[admin/settings/api:delete-confirm]]', async (ok) => {+ modals.confirm('[[admin/settings/api:delete-confirm]]', async (ok) => {if (ok) {try {await api.del(`/admin/tokens/${token}`);@@ -159,7 +159,7 @@ define('admin/manage/api', ['settings', 'clipboard', 'bootbox', 'benchpress', 'aconst rowEl = el.closest('[data-token]');const token = rowEl.getAttribute('data-token');- bootbox.confirm('[[admin/settings/api:roll-confirm]]', async (ok) => {+ modals.confirm('[[admin/settings/api:roll-confirm]]', async (ok) => {if (ok) {try {const tokenObj = await api.post(`/admin/tokens/${token}/roll`);diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.jsindex 7499965385..ce5dbf373c 100644--- a/public/src/admin/manage/categories.js+++ b/public/src/admin/manage/categories.js@@ -1,14 +1,13 @@'use strict';define('admin/manage/categories', [- 'translator','benchpress','categorySelector','api','Sortable',- 'bootbox',+ 'modals','alerts',-], function (translator, Benchpress, categorySelector, api, Sortable, bootbox, alerts) {+], function (Benchpress, categorySelector, api, Sortable, modals, alerts) {Sortable = Sortable.default;const Categories = {};let newCategoryId = '-1';@@ -53,12 +52,12 @@ define('admin/manage/categories', [}});- $('.categories').on('click', '.set-order', function () {+ $('.categories').on('click', '.set-order', async function () {const cid = $(this).attr('data-cid');const order = $(this).attr('data-order');- const modal = bootbox.dialog({+ const modal = await modals.dialog({title: '[[admin/manage/categories:set-order]]',- message: '<input type="number" min="1" class="form-control input-lg" value=' + order + ' /><p class="form-text">[[admin/manage/categories:set-order-help]]</p>',+ message: `<input type="number" min="1" class="form-control input-lg" value="${order}" /><p class="form-text">[[admin/manage/categories:set-order-help]]</p>`,show: true,buttons: {save: {@@ -115,8 +114,8 @@ define('admin/manage/categories', [};Categories.throwCreateModal = function () {- Benchpress.render('admin/partials/categories/create', {}).then(function (html) {- const modal = bootbox.dialog({+ Benchpress.render('admin/partials/categories/create', {}).then(async (html) => {+ const modal = await modals.dialog({title: '[[admin/manage/categories:alert.create]]',message: html,buttons: {@@ -169,8 +168,8 @@ define('admin/manage/categories', [};Categories.throwAddModal = function () {- Benchpress.render('admin/partials/categories/add', {}).then(function (html) {- const modal = bootbox.dialog({+ Benchpress.render('admin/partials/categories/add', {}).then(async (html) => {+ const modal = await modals.dialog({title: '[[admin/manage/categories:alert.add]]',message: html,buttons: {@@ -196,7 +195,7 @@ define('admin/manage/categories', [};Categories.remove = function (cid) {- bootbox.confirm('[[admin/manage/categories:alert.confirm-remove]]', (ok) => {+ modals.confirm('[[admin/manage/categories:alert.confirm-remove]]', (ok) => {if (ok) {api.del(`/api/admin/manage/categories/${encodeURIComponent(cid)}`).then(ajaxify.refresh);}@@ -204,7 +203,7 @@ define('admin/manage/categories', [};Categories.rename = function (cid) {- bootbox.prompt({+ modals.prompt({title: '[[admin/manage/categories:alert.rename]]',message: '<p class="mb-3">[[admin/manage/categories:alert.rename-help]]</p>',callback: (name) => {@@ -235,12 +234,10 @@ define('admin/manage/categories', [const container = $('.categories');if (!categories || !categories.length) {- translator.translate('[[admin/manage/categories:alert.none-active]]', function (text) {- $('<div></div>')- .addClass('alert alert-info text-center')- .text(text)- .appendTo(container);- });+ $('<div></div>')+ .addClass('alert alert-info text-center')+ .translateText('[[admin/manage/categories:alert.none-active]]')+ .appendTo(container);} else {sortables = {};renderList(categories, container, { cid: 0 });@@ -254,7 +251,11 @@ define('admin/manage/categories', [}).then(() => {const categoryEl = listEl.querySelector(`li[data-cid="${cid}"]`);categoryEl.classList[disabled ? 'add' : 'remove']('disabled');- $(categoryEl).find('li a[data-action="toggle"]').first().translateText(disabled ? '[[admin/manage/categories:enable]]' : '[[admin/manage/categories:disable]]');+ $(categoryEl).find('li a[data-action="toggle"]').first()+ .translateText(disabled ?+ '[[admin/manage/categories:enable]]' :+ '[[admin/manage/categories:disable]]'+ );}).catch(alerts.error)));};@@ -314,61 +315,41 @@ define('admin/manage/categories', [* @param parentId {number} parent category identifier*/function renderList(categories, container, parentCategory) {- // Translate category names if needed- let count = 0;const parentId = parentCategory.cid;- categories.forEach(function (category, idx, parent) {- translator.translate(category.name, function (translated) {- if (category.name !== translated) {- category.name = translated;- }- count += 1;- if (count === parent.length) {- continueRender();- }- });- });-- if (!categories.length) {- continueRender();- }-- function continueRender() {- app.parseAndTranslate('admin/partials/categories/category-rows', {- cid: parentCategory.cid,- categories: categories,- parentCategory: parentCategory,- }, function (html) {- if (container.find('.category-row').length) {- container.find('.category-row').after(html);- } else {- container.append(html);- }+ app.parseAndTranslate('admin/partials/categories/category-rows', {+ cid: parentCategory.cid,+ categories: categories,+ parentCategory: parentCategory,+ }, function (html) {+ if (container.find('.category-row').length) {+ container.find('.category-row').after(html);+ } else {+ container.append(html);+ }- // Disable expand toggle- if (!categories.length) {- const toggleEl = container.get(0).querySelector('.toggle');- toggleEl.classList.toggle('invisible', true);- }+ // Disable expand toggle+ if (!categories.length) {+ const toggleEl = container.get(0).querySelector('.toggle');+ toggleEl.classList.toggle('invisible', true);+ }- // Handle and children categories in this level have- for (let x = 0, numCategories = categories.length; x < numCategories; x += 1) {- renderList(categories[x].children, $('li[data-cid="' + categories[x].cid + '"]'), categories[x]);- }+ // Handle and children categories in this level have+ for (let x = 0, numCategories = categories.length; x < numCategories; x += 1) {+ renderList(categories[x].children, $('li[data-cid="' + categories[x].cid + '"]'), categories[x]);+ }- // Make list sortable- sortables[parentId] = Sortable.create($('ul[data-cid="' + parentId + '"]')[0], {- group: 'cross-categories',- animation: 150,- handle: '.information',- dataIdAttr: 'data-cid',- ghostClass: 'placeholder',- onAdd: itemDidAdd,- onEnd: itemDragDidEnd,- });+ // Make list sortable+ sortables[parentId] = Sortable.create($('ul[data-cid="' + parentId + '"]')[0], {+ group: 'cross-categories',+ animation: 150,+ handle: '.information',+ dataIdAttr: 'data-cid',+ ghostClass: 'placeholder',+ onAdd: itemDidAdd,+ onEnd: itemDragDidEnd,});- }+ });}return Categories;diff --git a/public/src/admin/manage/category.js b/public/src/admin/manage/category.jsindex 5a3df2391c..a914094a61 100644--- a/public/src/admin/manage/category.js+++ b/public/src/admin/manage/category.js@@ -6,11 +6,11 @@ define('admin/manage/category', ['categorySelector','benchpress','api',- 'bootbox',+ 'modals','translator','alerts','admin/settings',-], function (uploader, iconSelect, categorySelector, Benchpress, api, bootbox, translator, alerts, settings) {+], function (uploader, iconSelect, categorySelector, Benchpress, api, modals, translator, alerts, settings) {const Category = {};let updateHash = {};@@ -94,13 +94,11 @@ define('admin/manage/category', [$('.purge').on('click', async function (e) {e.preventDefault();- let name = ajaxify.data.category.name;- name = utils.escapeHTML(await translator.translate(translator.unescape(name)));Benchpress.render('admin/partials/categories/purge', {- name: name,+ name: ajaxify.data.category.name,topic_count: ajaxify.data.category.topic_count,- }).then(function (html) {- const modal = bootbox.dialog({+ }).then(async function (html) {+ const modal = await modals.dialog({title: '[[admin/manage/categories:purge]]',message: html,size: 'large',@@ -152,9 +150,9 @@ define('admin/manage/category', [});$('.copy-settings').on('click', function () {- Benchpress.render('admin/partials/categories/copy-settings', {}).then(function (html) {+ Benchpress.render('admin/partials/categories/copy-settings', {}).then(async (html) => {let selectedCid;- const modal = bootbox.dialog({+ const modal = await modals.dialog({title: '[[modules:composer.select-category]]',message: html,buttons: {@@ -238,7 +236,9 @@ define('admin/manage/category', [disabled: disabled ? 0 : 1,}).then(() => {$this.find('.label').translateText(- !disabled ? '[[admin/manage/categories:enable]]' : '[[admin/manage/categories:disable]]'+ !disabled ?+ '[[admin/manage/categories:enable]]' :+ '[[admin/manage/categories:disable]]');$this.find('i').toggleClass(['fa-check', 'text-success'], !disabled)diff --git a/public/src/admin/manage/digest.js b/public/src/admin/manage/digest.jsindex 365ac776b6..f88c58a210 100644--- a/public/src/admin/manage/digest.js+++ b/public/src/admin/manage/digest.js@@ -1,7 +1,7 @@'use strict';-define('admin/manage/digest', ['bootbox', 'alerts'], function (bootbox, alerts) {+define('admin/manage/digest', ['modals', 'alerts'], function (modals, alerts) {const Digest = {};Digest.init = function () {@@ -11,7 +11,7 @@ define('admin/manage/digest', ['bootbox', 'alerts'], function (bootbox, alerts)if (action.startsWith('resend-')) {const interval = action.slice(7);- bootbox.confirm('[[admin/manage/digest:resend-all-confirm]]', function (ok) {+ modals.confirm('[[admin/manage/digest:resend-all-confirm]]', function (ok) {if (ok) {Digest.send(action, undefined, function (err) {if (err) {diff --git a/public/src/admin/manage/group.js b/public/src/admin/manage/group.jsindex fc68fc8f63..597db188bc 100644--- a/public/src/admin/manage/group.js+++ b/public/src/admin/manage/group.js@@ -3,17 +3,16 @@define('admin/manage/group', ['forum/groups/memberlist','iconSelect',- 'translator','categorySelector','groupSearch','slugify','api',- 'bootbox',+ 'modals','alerts','admin/settings',], function (- memberList, iconSelect, translator, categorySelector, groupSearch,- slugify, api, bootbox, alerts, settings+ memberList, iconSelect, categorySelector, groupSearch,+ slugify, api, modals, alerts, settings) {const Groups = {};@@ -89,7 +88,7 @@ define('admin/manage/group', [});$('[data-action="delete"]').on('click', function () {- bootbox.confirm('[[admin/manage/groups:alerts.confirm-delete]]', function (confirm) {+ modals.confirm('[[admin/manage/groups:alerts.confirm-delete]]', function (confirm) {if (confirm) {api.del(`/groups/${slugify(ajaxify.data.group.name)}`, {}).then(() => {ajaxify.go('/admin/manage/groups');@@ -142,7 +141,7 @@ define('admin/manage/group', [break;case 'kick':- bootbox.confirm('[[admin/manage/groups:edit.confirm-remove-user]]', function (confirm) {+ modals.confirm('[[admin/manage/groups:edit.confirm-remove-user]]', function (confirm) {if (!confirm) {return;}@@ -161,13 +160,11 @@ define('admin/manage/group', [if (cid) {const url = 'admin/manage/privileges/' + cid + '?group=' + ajaxify.data.group.nameEncoded;if (app.flags && app.flags._unsaved === true) {- translator.translate('[[global:unsaved-changes]]', function (text) {- bootbox.confirm(text, function (navigate) {- if (navigate) {- app.flags._unsaved = false;- ajaxify.go(url);- }- });+ modals.confirm('[[global:unsaved-changes]]', function (navigate) {+ if (navigate) {+ app.flags._unsaved = false;+ ajaxify.go(url);+ }});return;}diff --git a/public/src/admin/manage/groups.js b/public/src/admin/manage/groups.jsindex a12881af26..c081f0f466 100644--- a/public/src/admin/manage/groups.js+++ b/public/src/admin/manage/groups.js@@ -3,9 +3,9 @@define('admin/manage/groups', ['slugify','api',- 'bootbox',+ 'modals','alerts',-], function (slugify, api, bootbox, alerts) {+], function (slugify, api, modals, alerts) {const Groups = {};Groups.init = function () {@@ -21,7 +21,7 @@ define('admin/manage/groups', [switch (action) {case 'delete':- bootbox.confirm('[[admin/manage/groups:alerts.confirm-delete]]', function (confirm) {+ modals.confirm('[[admin/manage/groups:alerts.confirm-delete]]', function (confirm) {if (confirm) {api.del(`/groups/${slugify(groupName)}`, {}).then(ajaxify.refresh).catch(alerts.error);}diff --git a/public/src/admin/manage/privileges.js b/public/src/admin/manage/privileges.jsindex f5f3b689c1..97abb4b5bb 100644--- a/public/src/admin/manage/privileges.js+++ b/public/src/admin/manage/privileges.js@@ -3,7 +3,7 @@define('admin/manage/privileges', ['api','autocomplete',- 'bootbox',+ 'modals','alerts','translator','categorySelector',@@ -11,7 +11,7 @@ define('admin/manage/privileges', ['admin/modules/checkboxRowSelector','admin/settings',], function (- api, autocomplete, bootbox, alerts, translator,+ api, autocomplete, modals, alerts, translator,categorySelector, mousetrap, checkboxRowSelector, settings) {const Privileges = {};@@ -60,7 +60,7 @@ define('admin/manage/privileges', [if (member) {if (isGroup && privilege === 'groups:moderate' && !isPrivate && state) {- bootbox.confirm('[[admin/manage/privileges:alert.confirm-moderate]]', function (confirm) {+ modals.confirm('[[admin/manage/privileges:alert.confirm-moderate]]', function (confirm) {if (confirm) {$wrapperEl.attr('data-delta', delta);Privileges.applyDeltaState(checkboxEl, delta);@@ -70,7 +70,7 @@ define('admin/manage/privileges', [}});} else if (privilege.endsWith('admin:admins-mods') && state) {- bootbox.confirm('[[admin/manage/privileges:alert.confirm-admins-mods]]', function (confirm) {+ modals.confirm('[[admin/manage/privileges:alert.confirm-admins-mods]]', function (confirm) {if (confirm) {$wrapperEl.attr('data-delta', delta);Privileges.applyDeltaState(checkboxEl, delta);@@ -158,7 +158,7 @@ define('admin/manage/privileges', [function throwConfirmModal(method, onConfirm) {const privilegeSubset = getPrivilegeSubset();- bootbox.confirm(`[[admin/manage/privileges:alert.confirm-${method}, ${privilegeSubset}]]<br /><br />[[admin/manage/privileges:alert.no-undo]]`, function (ok) {+ modals.confirm(`[[admin/manage/privileges:alert.confirm-${method}, ${privilegeSubset}]]<br /><br />[[admin/manage/privileges:alert.no-undo]]`, function (ok) {if (ok) {onConfirm.call();}@@ -250,8 +250,8 @@ define('admin/manage/privileges', [Privileges.setPrivilege = (member, privilege, state) => api[state ? 'put' : 'del'](`/categories/${isNaN(cid) ? 0 : cid}/privileges/${encodeURIComponent(privilege)}`, { member });- Privileges.addUserToPrivilegeTable = function () {- const modal = bootbox.dialog({+ Privileges.addUserToPrivilegeTable = async function () {+ const modal = await modals.dialog({title: '[[admin/manage/categories:alert.find-user]]',message: '<input class="form-control input-lg" placeholder="[[admin/manage/categories:alert.user-search]]" />',show: true,@@ -269,8 +269,8 @@ define('admin/manage/privileges', [});};- Privileges.addGroupToPrivilegeTable = function () {- const modal = bootbox.dialog({+ Privileges.addGroupToPrivilegeTable = async function () {+ const modal = await modals.dialog({title: '[[admin/manage/categories:alert.find-group]]',message: '<input class="form-control input-lg" placeholder="[[admin/manage/categories:alert.group-search]]" />',show: true,@@ -426,7 +426,6 @@ define('admin/manage/privileges', [groups: [{name: group,- nameEscaped: translator.escape(group),privileges: privilegeSet,types: typesMap,},diff --git a/public/src/admin/manage/registration.js b/public/src/admin/manage/registration.jsindex c4b2c5ac4f..b107cda868 100644--- a/public/src/admin/manage/registration.js+++ b/public/src/admin/manage/registration.js@@ -1,7 +1,7 @@'use strict';-define('admin/manage/registration', ['bootbox', 'alerts'], function (bootbox, alerts) {+define('admin/manage/registration', ['modals', 'alerts'], function (modals, alerts) {const Registration = {};Registration.init = function () {@@ -37,7 +37,7 @@ define('admin/manage/registration', ['bootbox', 'alerts'], function (bootbox, alparent.remove();};if (action === 'delete') {- bootbox.confirm('[[admin/manage/registration:invitations.confirm-delete]]', function (confirm) {+ modals.confirm('[[admin/manage/registration:invitations.confirm-delete]]', function (confirm) {if (confirm) {socket.emit(method, { email: email, invitedBy: invitedBy }, function (err) {if (err) {diff --git a/public/src/admin/manage/tags.js b/public/src/admin/manage/tags.jsindex aba143ddf7..eff46ca14e 100644--- a/public/src/admin/manage/tags.js+++ b/public/src/admin/manage/tags.js@@ -2,10 +2,10 @@define('admin/manage/tags', [- 'bootbox',+ 'modals','alerts','admin/modules/selectable',-], function (bootbox, alerts, selectable) {+], function (modals, alerts, selectable) {const Tags = {};Tags.init = function () {@@ -79,13 +79,13 @@ define('admin/manage/tags', [}function handleRename() {- $('#rename').on('click', function () {+ $('#rename').on('click', async function () {const tagsToModify = $('.tag-row.ui-selected');if (!tagsToModify.length) {return;}- const modal = bootbox.dialog({+ const modal = await modals.dialog({title: '[[admin/manage/tags:alerts.editing]]',message: $('.rename-modal').html(),buttons: {@@ -123,7 +123,7 @@ define('admin/manage/tags', [return;}- bootbox.confirm('[[admin/manage/tags:alerts.confirm-delete]]', function (confirm) {+ modals.confirm('[[admin/manage/tags:alerts.confirm-delete]]', function (confirm) {if (!confirm) {return;}diff --git a/public/src/admin/manage/uploads.js b/public/src/admin/manage/uploads.jsindex b93f76f3d1..39917d3b3c 100644--- a/public/src/admin/manage/uploads.js+++ b/public/src/admin/manage/uploads.js@@ -1,6 +1,6 @@'use strict';-define('admin/manage/uploads', ['api', 'bootbox', 'alerts', 'uploader'], function (api, bootbox, alerts, uploader) {+define('admin/manage/uploads', ['api', 'modals', 'alerts', 'uploader'], function (api, modals, alerts, uploader) {const Uploads = {};Uploads.init = function () {@@ -16,7 +16,7 @@ define('admin/manage/uploads', ['api', 'bootbox', 'alerts', 'uploader'], functio$('.delete').on('click', function () {const file = $(this).parents('[data-path]');- bootbox.confirm('[[admin/manage/uploads:confirm-delete]]', function (ok) {+ modals.confirm('[[admin/manage/uploads:confirm-delete]]', function (ok) {if (!ok) {return;}@@ -30,7 +30,7 @@ define('admin/manage/uploads', ['api', 'bootbox', 'alerts', 'uploader'], functio});$('#new-folder').on('click', async function () {- bootbox.prompt('[[admin/manage/uploads:name-new-folder]]', (newFolderName) => {+ modals.prompt('[[admin/manage/uploads:name-new-folder]]', (newFolderName) => {if (!newFolderName || !newFolderName.trim()) {return;}diff --git a/public/src/admin/manage/users.js b/public/src/admin/manage/users.jsindex 889fe55017..82cf963b76 100644--- a/public/src/admin/manage/users.js+++ b/public/src/admin/manage/users.js@@ -1,9 +1,9 @@'use strict';define('admin/manage/users', [- 'translator', 'benchpress', 'autocomplete', 'api', 'slugify', 'bootbox', 'alerts',+ 'translator', 'benchpress', 'autocomplete', 'api', 'slugify', 'modals', 'alerts','accounts/invite', 'accounts/moderate','helpers', 'admin/modules/change-email',-], function (translator, Benchpress, autocomplete, api, slugify, bootbox, alerts,+], function (translator, Benchpress, autocomplete, api, slugify, modals, alerts,AccountInvite, AccountModerate, helpers, changeEmail) {const Users = {};@@ -15,7 +15,7 @@ define('admin/manage/users', [ajaxify.go(window.location.pathname + '?' + qs);});- $('.export-csv').on('click', function () {+ $('.export-csv').on('click', async function () {socket.once('event:export-users-csv', function () {alerts.remove('export-users-start');alerts.alert({@@ -63,7 +63,7 @@ define('admin/manage/users', [</div>`)).join('');- const modal = bootbox.dialog({+ const modal = await modals.dialog({message: options,title: '[[admin/manage/users:export-users-fields-title]]',buttons: {@@ -154,8 +154,8 @@ define('admin/manage/users', [if (err) {return alerts.error(err);}- Benchpress.render('admin/partials/manage_user_groups', data).then(function (html) {- const modal = bootbox.dialog({+ Benchpress.render('admin/partials/manage_user_groups', data).then(async function (html) {+ const modal = await modals.dialog({message: html,title: '[[admin/manage/users:manage-groups]]',onEscape: true,@@ -164,7 +164,6 @@ define('admin/manage/users', [autocomplete.group(modal.find('.group-search'), function (ev, ui) {const uid = $(ev.target).attr('data-uid');api.put('/groups/' + ui.item.group.slug + '/membership/' + uid, undefined).then(() => {- ui.item.group.nameEscaped = translator.escape(ui.item.group.displayName);app.parseAndTranslate('admin/partials/manage_user_groups', { users: [{ groups: [ui.item.group] }] }, function (html) {$('[data-uid=' + uid + '] .group-area').append(html.find('.group-area').html());});@@ -187,7 +186,7 @@ define('admin/manage/users', [});});- $('.set-reputation').on('click', function () {+ $('.set-reputation').on('click', async function () {const uids = getSelectedUids();if (!uids.length) {alerts.error('[[error:no-users-selected]]');@@ -200,7 +199,7 @@ define('admin/manage/users', [currentValue = String(user.reputation);}}- const modal = bootbox.dialog({+ const modal = await modals.dialog({message: `<input id="new-reputation" type="text" class="form-control" value="${currentValue}">`,title: '[[admin/manage/users:set-reputation]]',onEscape: true,@@ -362,7 +361,7 @@ define('admin/manage/users', [return;}- bootbox.confirm('[[admin/manage/users:alerts.confirm-validate-email]]', function (confirm) {+ modals.confirm('[[admin/manage/users:alerts.confirm-validate-email]]', function (confirm) {if (!confirm) {return;}@@ -411,7 +410,7 @@ define('admin/manage/users', [})));}- const modal = bootbox.dialog({+ const modal = await modals.dialog({message: `<div class="d-flex flex-column gap-2"><label class="form-label">[[user:new-password]]</label><input id="newPassword" class="form-control" type="text">@@ -445,7 +444,7 @@ define('admin/manage/users', [return;}- bootbox.confirm('[[admin/manage/users:alerts.password-reset-confirm]]', function (confirm) {+ modals.confirm('[[admin/manage/users:alerts.password-reset-confirm]]', function (confirm) {if (confirm) {socket.emit('admin.user.sendPasswordResetEmail', uids, done('[[admin/manage/users:alerts.password-reset-email-sent]]'));}@@ -458,7 +457,7 @@ define('admin/manage/users', [return;}- bootbox.confirm('[[admin/manage/users:alerts.confirm-force-password-reset]]', function (confirm) {+ modals.confirm('[[admin/manage/users:alerts.confirm-force-password-reset]]', function (confirm) {if (confirm) {socket.emit('admin.user.forcePasswordReset', uids, done('[[admin/manage/users:alerts.validate-force-password-reset-success]]'));}@@ -553,7 +552,7 @@ define('admin/manage/users', [return;}- bootbox.confirm(confirmMsg, function (confirm) {+ modals.confirm(confirmMsg, function (confirm) {if (confirm) {Promise.all(uids.map(@@ -580,8 +579,8 @@ define('admin/manage/users', [function handleUserCreate() {$('[data-action="create"]').on('click', function () {- Benchpress.render('admin/partials/create_user_modal', {}).then(function (html) {- const modal = bootbox.dialog({+ Benchpress.render('admin/partials/create_user_modal', {}).then(async function (html) {+ const modal = await modals.dialog({message: html,title: '[[admin/manage/users:alerts.create]]',onEscape: true,@@ -696,11 +695,11 @@ define('admin/manage/users', [return;}if (data && data.users.length === 0) {- $('#user-notfound-notify').translateHtml('[[admin/manage/users:search.not-found]]')+ $('#user-notfound-notify').translateText('[[admin/manage/users:search.not-found]]').removeClass('hidden');$('#user-found-notify').addClass('hidden');} else {- $('#user-found-notify').translateHtml(+ $('#user-found-notify').translateText(translator.compile('admin/manage/users:alerts.x-users-found', data.matchCount, data.timing)).removeClass('hidden');$('#user-notfound-notify').addClass('hidden');diff --git a/public/src/admin/manage/users/custom-fields.js b/public/src/admin/manage/users/custom-fields.jsindex a7b0b65ca2..5e2a58aa13 100644--- a/public/src/admin/manage/users/custom-fields.js+++ b/public/src/admin/manage/users/custom-fields.js@@ -1,6 +1,6 @@define('admin/manage/user/custom-fields', [- 'bootbox', 'alerts', 'iconSelect', 'jquery-ui/widgets/sortable',-], function (bootbox, alerts, iconSelect) {+ 'modals', 'alerts', 'iconSelect', 'jquery-ui/widgets/sortable',+], function (modals, alerts, iconSelect) {const manageUserFields = {};manageUserFields.init = function () {@@ -14,7 +14,7 @@ define('admin/manage/user/custom-fields', [table.on('click', '[data-action="delete"]', function () {const key = $(this).attr('data-key');const row = $(this).parents('[data-key]');- bootbox.confirm(`[[admin/manage/user-custom-fields:delete-field-confirm-x, ${key}]]`, function (ok) {+ modals.confirm(`[[admin/manage/user-custom-fields:delete-field-confirm-x, ${key}]]`, function (ok) {if (!ok) {return;}@@ -59,7 +59,7 @@ define('admin/manage/user/custom-fields', [async function showModal(field = null) {const html = await app.parseAndTranslate('admin/partials/manage-custom-user-fields-modal', field);- const modal = bootbox.dialog({+ const modal = await modals.dialog({message: html,onEscape: true,title: field ?diff --git a/public/src/admin/manage/users/custom-reasons.js b/public/src/admin/manage/users/custom-reasons.jsindex 923f601cae..4af9515424 100644--- a/public/src/admin/manage/users/custom-reasons.js+++ b/public/src/admin/manage/users/custom-reasons.js@@ -1,6 +1,6 @@define('admin/manage/user/custom-reasons', [- 'benchpress', 'bootbox', 'alerts', 'translator', 'jquery-ui/widgets/sortable',-], function (benchpress, bootbox, alerts, translator) {+ 'benchpress', 'modals', 'alerts', 'jquery-ui/widgets/sortable',+], function (benchpress, modals, alerts) {const manageCustomReasons = {};manageCustomReasons.init = function () {@@ -16,7 +16,7 @@ define('admin/manage/user/custom-reasons', [table.on('click', '[data-action="delete"]', function () {const row = $(this).parents('[data-key]');const title = row.attr('data-title');- bootbox.confirm(`[[admin/manage/custom-reasons:delete-reason-confirm-x, "${title}"]]`, function (ok) {+ modals.confirm(`[[admin/manage/custom-reasons:delete-reason-confirm-x, "${title}"]]`, function (ok) {if (!ok) {return;}@@ -55,7 +55,7 @@ define('admin/manage/user/custom-reasons', [async function showModal(reason = null) {const html = await benchpress.render('admin/partials/manage-custom-reasons-modal', reason);- const modal = bootbox.dialog({+ const modal = await modals.dialog({message: html,onEscape: true,title: reason ?@@ -67,8 +67,7 @@ define('admin/manage/user/custom-reasons', [callback: async function () {const formData = modal.find('form').serializeObject();formData.key = reason ? reason.key : Date.now();- formData.body = translator.escape(formData.body);- formData.parsedBody = translator.escape(await socket.emit('admin.parseRaw', formData.body));+ formData.parsedBody = await socket.emit('admin.parseRaw', formData.body);app.parseAndTranslate('admin/manage/users/custom-reasons', 'reasons', {reasons: [formData],diff --git a/public/src/admin/modules/change-email.js b/public/src/admin/modules/change-email.jsindex f237792854..a652890576 100644--- a/public/src/admin/modules/change-email.js+++ b/public/src/admin/modules/change-email.js@@ -1,12 +1,12 @@'use strict';define('admin/modules/change-email', [- 'api', 'bootbox', 'alerts',-], function (api, bootbox, alerts) {+ 'api', 'modals', 'alerts',+], function (api, modals, alerts) {const ChangeEmail = {};- ChangeEmail.init = function (params) {- const modal = bootbox.dialog({+ ChangeEmail.init = async function (params) {+ const modal = await modals.dialog({message: `<label class="form-label">[[admin/manage/users:new-email]]</label><input id="newEmail" class="form-control" type="text" value="${utils.escapeHTML(params.email || '')}">diff --git a/public/src/admin/modules/dashboard-line-graph.js b/public/src/admin/modules/dashboard-line-graph.jsindex cbc2bcf5bf..0db4cec0ad 100644--- a/public/src/admin/modules/dashboard-line-graph.js+++ b/public/src/admin/modules/dashboard-line-graph.js@@ -10,7 +10,7 @@ import {} from 'chart.js';import * as Benchpress from 'benchpressjs';-import * as bootbox from 'bootbox';+import * as modals from 'modals';import * as translator from '../../modules/translator';import * as api from '../../modules/api';import * as hooks from '../../modules/hooks';@@ -127,8 +127,8 @@ function handleUpdateControls({ set }) {});function throwCustomRangeSelector(targetEl) {- Benchpress.render('admin/partials/pageviews-range-select', {}).then(function (html) {- const modal = bootbox.dialog({+ Benchpress.render('admin/partials/pageviews-range-select', {}).then(async (html) => {+ const modal = await modals.dialog({title: '[[admin/dashboard:page-views-custom]]',message: html,buttons: {diff --git a/public/src/admin/settings/navigation.js b/public/src/admin/settings/navigation.jsindex 375398cbee..c3f7a6a037 100644--- a/public/src/admin/settings/navigation.js+++ b/public/src/admin/settings/navigation.js@@ -81,33 +81,22 @@ define('admin/settings/navigation', [} : available[id];data.index = (parseInt($('#enabled').children().last().attr('data-index'), 10) || 0) + 1;- data.title = translator.escape(data.title);- data.text = translator.escape(data.text);data.groups = ajaxify.data.groups;- const renderNav = new Promise((resolve) => {- Benchpress.parse('admin/settings/navigation', 'navigation', { navigation: [data] }, function (li) {- translator.translate(li, function (li) {- li = $(translator.unescape(li));- el.after(li);- el.remove();- resolve();- });- });- });- const renderForm = new Promise((resolve) => {- Benchpress.parse('admin/settings/navigation', 'enabled', { enabled: [data] }, function (li) {- translator.translate(li, function (li) {- li = $(translator.unescape(li));- $('#enabled').append(li);- resolve();- });- });- });+ const renderNav = async function () {+ const li = await app.parseAndTranslate('admin/settings/navigation', 'navigation', { navigation: [data] });+ el.after(li);+ el.remove();+ };++ const renderForm = async function () {+ const li = await app.parseAndTranslate('admin/settings/navigation', 'enabled', { enabled: [data] });+ $('#enabled').append(li);+ };Promise.all([- renderNav,- renderForm,+ renderNav(),+ renderForm(),]).then(() => selectIndex(data.index));}diff --git a/public/src/ajaxify.js b/public/src/ajaxify.jsindex a17f7c1fc0..f69963b71b 100644--- a/public/src/ajaxify.js+++ b/public/src/ajaxify.js@@ -257,6 +257,7 @@ ajaxify.widgets = { render: render };function renderTemplate(url, tpl_url, data, callback) {hooks.fire('action:ajaxify.loadingTemplates', {});benchpress.render(tpl_url, data)+ // TODO: remove once all tx tokens are migrated to tx("") helper.then(rendered => translator.translate(rendered)).then(function (translated) {translated = translator.unescape(translated);@@ -285,21 +286,23 @@ ajaxify.widgets = { render: render };const data = { title: title };hooks.fire('action:ajaxify.updateTitle', data);- const [titleTranslated, browserTitleTranslated] = await translator.translateKeys([- data.title, config.browserTitle || '',+ const [titleTranslated, browserTitleTranslated] = await Promise.all([+ ajaxify.data.template.topic ? data.title : translator.translateKey(data.title),+ translator.translateKey(config.browserTitle || ''),]);const documentTitle = config.titleLayout.replace(/{/g, '{').replace(/}/g, '}')- .replace('{pageTitle}', () => titleTranslated)+ .replace('{pageTitle}', () => titleTranslated.slice(0, 60)).replace('{browserTitle}', () => browserTitleTranslated);-- window.document.title = $('<div></div>').html(documentTitle).text();+ window.document.title = utils.decodeHTMLEntities(documentTitle);}ajaxify.updateTitle = updateTitle;function updateTags() {const metaWhitelist = ['title', 'description', /og:.+/, /article:.+/, 'robots'].map(val => new RegExp(val));+ const validMetaAttributes = ['name', 'property', 'content', 'http-equiv'];const linkWhitelist = ['canonical', 'alternate', 'up'];+ const validLinkAttributes = ['rel', 'href', 'type', 'sizes', 'hreflang', 'media'];// Delete the old meta tagsdocument.querySelectorAll('head meta').forEach(el => {@@ -313,11 +316,10 @@ ajaxify.widgets = { render: render };ajaxify.data._header.tags.meta.forEach(async (tagObj) => {const name = tagObj.name || tagObj.property;if (metaWhitelist.some(exp => exp.test(name))) {- if (tagObj.content) {- tagObj.content = await translator.translate(tagObj.content);- }const metaEl = document.createElement('meta');- Object.keys(tagObj).forEach(prop => metaEl.setAttribute(prop, tagObj[prop]));+ validMetaAttributes.forEach(+ attr => Object.hasOwn(tagObj, attr) && metaEl.setAttribute(attr, tagObj[attr])+ );document.head.appendChild(metaEl);}});@@ -334,7 +336,9 @@ ajaxify.widgets = { render: render };ajaxify.data._header.tags.link.forEach(async (tagObj) => {if (linkWhitelist.some(item => item === tagObj.rel)) {const linkEl = document.createElement('link');- Object.keys(tagObj).forEach(prop => linkEl.setAttribute(prop, tagObj[prop]));+ validLinkAttributes.forEach(+ attr => Object.hasOwn(tagObj, attr) && linkEl.setAttribute(attr, tagObj[attr])+ );document.head.appendChild(linkEl);}});@@ -612,8 +616,8 @@ $(document).ready(function () {return;}- require(['bootbox'], function (bootbox) {- bootbox.confirm('[[global:unsaved-changes]]', function (navigate) {+ require(['modals'], function (modals) {+ modals.confirm('[[global:unsaved-changes]]', function (navigate) {if (navigate) {app.flags._unsaved = false;process.call(_self);diff --git a/public/src/app.js b/public/src/app.jsindex 0206ebf2ba..eb57dab0a0 100644--- a/public/src/app.js+++ b/public/src/app.js@@ -18,8 +18,6 @@ require('./sockets');require('./overrides');require('./ajaxify');-app = window.app || {};-Object.defineProperty(app, 'isFocused', {get() {return document.visibilityState === 'visible';@@ -268,14 +266,9 @@ if (document.readyState === 'loading') {if (!el.length) {return;}-- require(['translator'], function (translator) {- translator.translate('[[global:' + status + ']]', function (translated) {- el.removeClass('online offline dnd away')- .addClass(status)- .attr('data-new-title', translated);- });- });+ el.removeClass('online offline dnd away')+ .addClass(status)+ .translateAttr('data-new-title', `[[global:${status}]]`);};app.newTopic = function (params) {@@ -308,8 +301,8 @@ if (document.readyState === 'loading') {const [hooks, api] = await app.require(['hooks', 'api']);params.title = (ajaxify.data.template.topic ?- ajaxify.data.titleRaw :- (await api.get(`/topics/${params.tid}`)).titleRaw);+ ajaxify.data.title :+ (await api.get(`/topics/${params.tid}`)).title);hooks.fire('action:composer.post.new', params);};@@ -337,12 +330,24 @@ if (document.readyState === 'loading') {return new Promise((resolve, reject) => {require(['translator', 'benchpress'], function (translator, Benchpress) {Benchpress.render(template, data, blockName)+ // TODO: remove once all tx tokens are migrated to tx("") helper.then(rendered => translator.translate(rendered)).then(translated => translator.unescape(translated)).then(resolve, reject);});}).then((html) => {- html = $(html);+ try {+ html = $(html);+ } catch (err) {+ // handle cases where the template parsed has multiple elements at the root level+ // this breaks the jquery selector so we wrap it in a div+ if (err.startsWith('Syntax error, unrecognized expression')) {+ html = $(`<div>${html}</div>`);+ } else {+ throw err;+ }+ }+if (callback && typeof callback === 'function') {setTimeout(callback, 0, html);}diff --git a/public/src/client/account/edit.js b/public/src/client/account/edit.jsindex 1268f41d01..a35c30dbe4 100644--- a/public/src/client/account/edit.js+++ b/public/src/client/account/edit.js@@ -6,10 +6,10 @@ define('forum/account/edit', ['translator','api','hooks',- 'bootbox',+ 'modals','alerts','admin/modules/change-email',-], function (header, picture, translator, api, hooks, bootbox, alerts, changeEmail) {+], function (header, picture, translator, api, hooks, modals, alerts, changeEmail) {const AccountEdit = {};AccountEdit.init = function () {@@ -80,41 +80,39 @@ define('forum/account/edit', [function handleAccountDelete() {- $('#deleteAccountBtn').on('click', function () {- translator.translate('[[user:delete-account-confirm]]', function (translated) {- const modal = bootbox.confirm(translated + '<p><input type="password" class="form-control" id="confirm-password" /></p>', function (confirm) {- if (!confirm) {- return;+ $('#deleteAccountBtn').on('click', async function () {+ const modal = await modals.confirm('<p>[[user:delete-account-confirm]]</p><p><input type="password" class="form-control" id="confirm-password" /></p>', function (confirm) {+ if (!confirm) {+ return;+ }++ const confirmBtn = modal.find('.btn-primary');+ confirmBtn.html('<i class="fa fa-spinner fa-spin"></i>');+ confirmBtn.prop('disabled', true);+ api.del(`/users/${ajaxify.data.uid}/account`, {+ password: $('#confirm-password').val(),+ }, function (err) {+ function restoreButton() {+ translator.translate('[[modules:bootbox.confirm]]', function (confirmText) {+ confirmBtn.text(confirmText);+ confirmBtn.prop('disabled', false);+ });}- const confirmBtn = modal.find('.btn-primary');- confirmBtn.html('<i class="fa fa-spinner fa-spin"></i>');- confirmBtn.prop('disabled', true);- api.del(`/users/${ajaxify.data.uid}/account`, {- password: $('#confirm-password').val(),- }, function (err) {- function restoreButton() {- translator.translate('[[modules:bootbox.confirm]]', function (confirmText) {- confirmBtn.text(confirmText);- confirmBtn.prop('disabled', false);- });- }-- if (err) {- restoreButton();- return alerts.error(err);- }-- confirmBtn.html('<i class="fa fa-check"></i>');- window.location.href = `${config.relative_path}/`;- });-- return false;- });+ if (err) {+ restoreButton();+ return alerts.error(err);+ }- modal.on('shown.bs.modal', function () {- modal.find('input').focus();+ confirmBtn.html('<i class="fa fa-check"></i>');+ window.location.href = `${config.relative_path}/`;});++ return false;+ });++ modal.on('shown.bs.modal', function () {+ modal.find('input').focus();});return false;});@@ -139,19 +137,19 @@ define('forum/account/edit', [function updateSignature() {const el = $('#signature');- $('#signatureCharCountLeft').html(getCharsLeft(el, ajaxify.data.maximumSignatureLength));+ $('#signatureCharCountLeft').text(getCharsLeft(el, ajaxify.data.maximumSignatureLength));el.on('keyup change', function () {- $('#signatureCharCountLeft').html(getCharsLeft(el, ajaxify.data.maximumSignatureLength));+ $('#signatureCharCountLeft').text(getCharsLeft(el, ajaxify.data.maximumSignatureLength));});}function updateAboutMe() {const el = $('#aboutme');- $('#aboutMeCharCountLeft').html(getCharsLeft(el, ajaxify.data.maximumAboutMeLength));+ $('#aboutMeCharCountLeft').text(getCharsLeft(el, ajaxify.data.maximumAboutMeLength));el.on('keyup change', function () {- $('#aboutMeCharCountLeft').html(getCharsLeft(el, ajaxify.data.maximumAboutMeLength));+ $('#aboutMeCharCountLeft').text(getCharsLeft(el, ajaxify.data.maximumAboutMeLength));});}diff --git a/public/src/client/account/header.js b/public/src/client/account/header.jsindex b016c580e5..a31a39f681 100644--- a/public/src/client/account/header.js+++ b/public/src/client/account/header.js@@ -10,10 +10,10 @@ define('forum/account/header', ['accounts/moderate','accounts/picture','api',- 'bootbox',+ 'modals','alerts',], function (coverPhoto, pictureCropper, components, translator,- AccountsDelete, AccountsModerate, AccountsPicture, api, bootbox, alerts) {+ AccountsDelete, AccountsModerate, AccountsPicture, api, modals, alerts) {const AccountHeader = {};let isAdminOrSelfOrGlobalMod;@@ -134,7 +134,7 @@ define('forum/account/header', [function rescindAccountFlag() {const flagId = $(this).data('flag-id');require(['flags'], function (flags) {- bootbox.confirm('[[flags:modal-confirm-rescind]]', function (confirm) {+ modals.confirm('[[flags:modal-confirm-rescind]]', function (confirm) {if (!confirm) {return;}@@ -161,21 +161,19 @@ define('forum/account/header', [}function removeCover() {- translator.translate('[[user:remove-cover-picture-confirm]]', function (translated) {- bootbox.confirm(translated, function (confirm) {- if (!confirm) {- return;- }+ modals.confirm('[[user:remove-cover-picture-confirm]]', function (confirm) {+ if (!confirm) {+ return;+ }- socket.emit('user.removeCover', {- uid: ajaxify.data.uid,- }, function (err) {- if (!err) {- ajaxify.refresh();- } else {- alerts.error(err);- }- });+ socket.emit('user.removeCover', {+ uid: ajaxify.data.uid,+ }, function (err) {+ if (!err) {+ ajaxify.refresh();+ } else {+ alerts.error(err);+ }});});}diff --git a/public/src/client/account/profile.js b/public/src/client/account/profile.jsindex dc2885e80e..47d18b5109 100644--- a/public/src/client/account/profile.js+++ b/public/src/client/account/profile.js@@ -3,8 +3,8 @@define('forum/account/profile', ['forum/account/header',- 'bootbox',-], function (header, bootbox) {+ 'modals',+], function (header, modals) {const Account = {};Account.init = function () {@@ -15,7 +15,7 @@ define('forum/account/profile', [processPage();if (parseInt(ajaxify.data.emailChanged, 10) === 1) {- bootbox.alert({+ modals.alert({message: '[[user:emailUpdate.change-instructions]]',closeButton: false,});diff --git a/public/src/client/category.js b/public/src/client/category.jsindex 0205342311..a7980c3072 100644--- a/public/src/client/category.js+++ b/public/src/client/category.js@@ -110,7 +110,7 @@ define('forum/category', [ajaxify.data.nextSubCategoryStart += ajaxify.data.subCategoriesPerPage;ajaxify.data.subCategoriesLeft -= data.length;btn.toggleClass('hidden', ajaxify.data.subCategoriesLeft <= 0)- .translateText('[[category:x-more-categories, ' + ajaxify.data.subCategoriesLeft + ']]');+ .translateText(`[[category:x-more-categories, ${ajaxify.data.subCategoriesLeft}]]`);});return false;diff --git a/public/src/client/category/tools.js b/public/src/client/category/tools.jsindex 17be8c65c2..3bb6b5f95b 100644--- a/public/src/client/category/tools.js+++ b/public/src/client/category/tools.js@@ -7,10 +7,10 @@ define('forum/category/tools', ['forum/topic/threadTools','components','api',- 'bootbox',+ 'modals','alerts','bootstrap',-], function (topicSelect, threadTools, components, api, bootbox, alerts, bootstrap) {+], function (topicSelect, threadTools, components, api, modals, alerts, bootstrap) {const CategoryTools = {};CategoryTools.init = function (containerEl) {@@ -164,7 +164,7 @@ define('forum/category/tools', [case 'delete':case 'restore':case 'purge':- bootbox.confirm(`[[topic:thread-tools.${command}-confirm]]`, execute);+ modals.confirm(`[[topic:thread-tools.${command}-confirm]]`, execute);break;case 'pin':diff --git a/public/src/client/chats.js b/public/src/client/chats.jsindex 206208bc08..bbaa8bdd85 100644--- a/public/src/client/chats.js+++ b/public/src/client/chats.js@@ -15,17 +15,17 @@ define('forum/chats', ['forum/chats/search','autocomplete','hooks',- 'bootbox',+ 'modals',+ 'benchpress','alerts','chat','api','uploadHelpers',- 'translator',], function (components, mousetrap, recentChats, create,manage, messages, userList, messageSearch, pinnedMessages,- events, search, autocomplete, hooks, bootbox, alerts,- chatModule, api, uploadHelpers, translator+ events, search, autocomplete, hooks, modals, benchpress, alerts,+ chatModule, api, uploadHelpers) {const Chats = {activeAutocomplete: {},@@ -473,7 +473,7 @@ define('forum/chats', [Chats.addLeaveHandler = function (roomId, buttonEl) {buttonEl.on('click', function () {- bootbox.confirm({+ modals.confirm({size: 'small',title: '[[modules:chat.leave]]',message: '<p>[[modules:chat.leave-prompt]]</p><p class="form-text">[[modules:chat.leave-help]]</p>',@@ -497,7 +497,7 @@ define('forum/chats', [Chats.addDeleteHandler = function (roomId, buttonEl) {buttonEl.on('click', function () {- bootbox.confirm({+ modals.confirm({size: 'small',title: '[[modules:chat.delete]]',message: '<p>[[modules:chat.delete-prompt]]</p>',@@ -522,8 +522,8 @@ define('forum/chats', [Chats.addRenameHandler = function (roomId, buttonEl) {buttonEl.on('click', async function () {const { roomName } = await api.get(`/chats/${roomId}`);- const html = await app.parseAndTranslate('modals/rename-room', {});- const modal = bootbox.dialog({+ const html = await benchpress.render('modals/rename-room', { roomName });+ const modal = await modals.dialog({title: '[[modules:chat.rename-room]]',message: html,onEscape: true,@@ -542,12 +542,8 @@ define('forum/chats', [},},});- modal.on('show.bs.modal', function () {- const val = translator.unescape(roomName);- modal.find('#roomName').val(val).selectRange(0, val.length);- });modal.on('shown.bs.modal', function () {- modal.find('#roomName').focus();+ modal.find('#roomName').selectRange(0, roomName.length).focus();});});};diff --git a/public/src/client/chats/create.js b/public/src/client/chats/create.jsindex ce70fa8bab..71189183a2 100644--- a/public/src/client/chats/create.js+++ b/public/src/client/chats/create.js@@ -2,8 +2,8 @@define('forum/chats/create', [- 'components', 'api', 'alerts', 'forum/chats/user-search',-], function (components, api, alerts, userSearch) {+ 'components', 'api', 'alerts', 'forum/chats/user-search', 'modals', 'benchpress',+], function (components, api, alerts, userSearch, modals, Benchpress) {const create = {};create.init = function () {components.get('chat/create').on('click', handleCreate);@@ -18,12 +18,12 @@ define('forum/chats/create', [return { name, displayName };});}- const html = await app.parseAndTranslate('modals/create-room', {+ const html = await Benchpress.render('modals/create-room', {user: app.user,groups,});- const modal = bootbox.dialog({+ const modal = await modals.dialog({title: '[[modules:chat.create-room]]',message: html,onEscape: true,diff --git a/public/src/client/chats/events.js b/public/src/client/chats/events.jsindex 774aa8c2c1..5441a63a63 100644--- a/public/src/client/chats/events.js+++ b/public/src/client/chats/events.js@@ -5,7 +5,8 @@ define('forum/chats/events', ['forum/chats/messages','chat','components',-], function (messages, chatModule, components) {+ 'helpers',+], function (messages, chatModule, components, helpers) {const Events = {};const events = {@@ -52,11 +53,14 @@ define('forum/chats/events', [messages.appendChatMessage($('[component="chat/message/content"]'), data.message);}- Chats.updateTeaser(data.roomId, {- content: utils.stripHTMLTags(utils.decodeHTMLEntities(data.message.content)),- user: data.message.fromUser,- timestampISO: data.message.timestampISO,- });++ if (!data.message.system) {+ Chats.updateTeaser(data.roomId, {+ content: utils.stripHTMLTags(utils.decodeHTMLEntities(data.message.content)),+ user: data.message.fromUser,+ timestampISO: data.message.timestampISO,+ });+ }}function publicChatUnread(data) {@@ -80,17 +84,26 @@ define('forum/chats/events', [function onRoomRename(data) {const roomEl = components.get('chat/recent/room', data.roomId);+ const publicRoomEl = components.get('chat/public/room', data.roomId);+if (roomEl.length) {const titleEl = roomEl.find('[component="chat/room/title"]');ajaxify.data.roomName = data.newName;- titleEl.translateText(data.newName ? data.newName : ajaxify.data.usernames);+ if (data.newName) {+ titleEl.text(data.newName);+ } else {+ titleEl.translateText(ajaxify.data.usernames);+ }+ } else if (publicRoomEl.length) {+ publicRoomEl.find('[component="chat/room/title"]').text(data.newName);}+const titleEl = $(`[component="chat/main-wrapper"][data-roomid="${data.roomId}"] [component="chat/header/title"]`);if (titleEl.length) {- titleEl.html(+ titleEl.translateHtml(data.newName ?- `<i class="fa ${ajaxify.data.icon} text-muted"></i> ${data.newName}` :- ajaxify.data.chatWithMessage+ `<i class="fa ${helpers.escape(ajaxify.data.icon)} text-muted"></i> ${helpers.escape(data.newName)}` :+ data.chatWithMessage);}}diff --git a/public/src/client/chats/manage.js b/public/src/client/chats/manage.jsindex f2e5cbc04c..bffc9053af 100644--- a/public/src/client/chats/manage.js+++ b/public/src/client/chats/manage.js@@ -2,8 +2,8 @@define('forum/chats/manage', [- 'api', 'alerts', 'translator', 'autocomplete', 'forum/chats/user-list',-], function (api, alerts, translator, autocomplete, userList) {+ 'api', 'alerts', 'autocomplete', 'forum/chats/user-list', 'modals',+], function (api, alerts, autocomplete, userList, modals) {const manage = {};manage.init = function (roomId, buttonEl) {@@ -30,7 +30,7 @@ define('forum/chats/manage', [user: app.user,room: ajaxify.data,});- modal = bootbox.dialog({+ modal = await modals.dialog({title: '[[modules:chat.manage-room]]',size: 'large',message: html,@@ -67,9 +67,7 @@ define('forum/chats/manage', [refreshParticipantsList(roomId, modal, body);searchInput.val('');}).catch((err) => {- translator.translate(err.message, function (translated) {- errorEl.text(translated);- });+ errorEl.translateText(err.message);});});@@ -137,7 +135,7 @@ define('forum/chats/manage', [data = await api.get(`/chats/${roomId}/users`, {});} catch (err) {console.error(err);- listEl.find('li').text(await translator.translate('[[error:invalid-data]]'));+ listEl.find('li').translateText('[[error:invalid-data]]');}}listEl.find('[data-bs-toggle="tooltip"]').tooltip('dispose');diff --git a/public/src/client/chats/messages.js b/public/src/client/chats/messages.jsindex 7b1b7694ed..e5e2133e94 100644--- a/public/src/client/chats/messages.js+++ b/public/src/client/chats/messages.js@@ -2,10 +2,10 @@define('forum/chats/messages', [- 'components', 'hooks', 'bootbox', 'alerts',- 'messages', 'api', 'forum/topic/images', 'imagesloaded',+ 'components', 'hooks', 'modals', 'alerts',+ 'messages', 'api', 'forum/topic/images', 'imagesloaded', 'translator',], function (- components, hooks, bootbox, alerts, messagesModule, api, images, imagesLoaded+ components, hooks, modals, alerts, messagesModule, api, images, imagesLoaded, tx) {const messages = {};@@ -196,7 +196,7 @@ define('forum/chats/messages', [const replyToEl = composerEl.find('[component="chat/composer/replying-to"]');replyToEl.attr('data-tomid', mid).find('[component="chat/composer/replying-to-text"]')- .translateText(`[[modules:chat.replying-to, ${msgEl.attr('data-displayname')}]]`);+ .translateHtml(tx.compile('modules:chat.replying-to', tx.escape(msgEl.attr('data-displayname'))));replyToEl.removeClass('hidden');replyToEl.find('[component="chat/composer/replying-to-cancel"]').off('click').on('click', () => {@@ -326,12 +326,12 @@ define('forum/chats/messages', [msgEl.toggleClass('deleted', true);parentEl.toggleClass('deleted', true);if (!isSelf) {- msgEl.find('[component="chat/message/body"]')- .translateHtml('<p>[[modules:chat.message-deleted]]</p>');+ msgEl.find('[component="chat/message/body"]').html('<p></p>')+ .translateText('[[modules:chat.message-deleted]]');}if (!isParentSelf) {- parentEl.find('[component="chat/message/parent/content"]')- .translateHtml('<p>[[modules:chat.message-deleted]]</p>');+ parentEl.find('[component="chat/message/parent/content"]').html('<p></p>')+ .translateText('[[modules:chat.message-deleted]]');}}@@ -403,7 +403,7 @@ define('forum/chats/messages', [};messages.delete = function (messageId, roomId) {- bootbox.confirm('[[modules:chat.delete-message-confirm]]', function (ok) {+ modals.confirm('[[modules:chat.delete-message-confirm]]', function (ok) {if (!ok) {return;}diff --git a/public/src/client/flags/detail.js b/public/src/client/flags/detail.jsindex 4567520eda..2479b676f7 100644--- a/public/src/client/flags/detail.js+++ b/public/src/client/flags/detail.js@@ -1,8 +1,8 @@'use strict';define('forum/flags/detail', [- 'components', 'translator', 'benchpress', 'accounts/moderate', 'accounts/delete', 'api', 'bootbox', 'alerts',-], function (components, translator, Benchpress, AccountModerate, AccountsDelete, api, bootbox, alerts) {+ 'components', 'benchpress', 'accounts/moderate', 'accounts/delete', 'api', 'modals', 'alerts',+], function (components, Benchpress, AccountModerate, AccountsDelete, api, modals, alerts) {const Detail = {};Detail.init = function () {@@ -43,7 +43,7 @@ define('forum/flags/detail', [value = ajaxify.data.notes[index].content;}- bootbox.prompt({+ modals.prompt({title: `[[flags:${datetime ? 'edit' : 'add'}-note]]`,inputType: 'textarea',rows: 3,@@ -81,7 +81,7 @@ define('forum/flags/detail', [case 'delete-note': {const datetime = parseInt(this.closest('[data-datetime]').getAttribute('data-datetime'), 10);- bootbox.confirm('[[flags:delete-note-confirm]]', function (ok) {+ modals.confirm('[[flags:delete-note-confirm]]', function (ok) {if (ok) {api.del(`/flags/${ajaxify.data.flagId}/notes/${datetime}`, {}).then((payload) => {alerts.success('[[flags:note-deleted]]');@@ -139,7 +139,7 @@ define('forum/flags/detail', [break;case 'delete-flag': {- bootbox.confirm('[[flags:delete-flag-confirm]]', function (ok) {+ modals.confirm('[[flags:delete-flag-confirm]]', function (ok) {if (ok) {api.del(`/flags/${ajaxify.data.flagId}`, {}).then(() => {alerts.success('[[flags:flag-deleted]]');@@ -154,14 +154,12 @@ define('forum/flags/detail', [};function postAction(action, method, path) {- translator.translate('[[topic:post-' + action + '-confirm]]', function (msg) {- bootbox.confirm(msg, function (confirm) {- if (!confirm) {- return;- }+ modals.confirm(`[[topic:post-${action}-confirm]]`, function (confirm) {+ if (!confirm) {+ return;+ }- method(path).then(ajaxify.refresh).catch(alerts.error);- });+ method(path).then(ajaxify.refresh).catch(alerts.error);});}diff --git a/public/src/client/flags/list.js b/public/src/client/flags/list.jsindex 8d13124280..900b98a18c 100644--- a/public/src/client/flags/list.js+++ b/public/src/client/flags/list.js@@ -12,6 +12,7 @@ import {import * as categoryFilter from '../../modules/categoryFilter';import * as userFilter from '../../modules/userFilter';import * as autocomplete from '../../modules/autocomplete';+import * as modals from '../../modules/modals';import * as api from '../../modules/api';import * as alerts from '../../modules/alerts';import * as components from '../../modules/components';@@ -214,7 +215,7 @@ export function handleBulkActions() {let confirmed;if (action === 'bulk-purge') {confirmed = new Promise((resolve, reject) => {- bootbox.confirm('[[flags:confirm-purge]]', (confirmed) => {+ modals.confirm('[[flags:confirm-purge]]', (confirmed) => {if (confirmed) {resolve();} else {diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.jsindex 7a6d2ba6f2..d19e03134a 100644--- a/public/src/client/groups/details.js+++ b/public/src/client/groups/details.js@@ -9,9 +9,10 @@ define('forum/groups/details', ['api','slugify','categorySelector',- 'bootbox',+ 'modals','alerts','helpers',+ 'translator',], function (memberList,iconSelect,@@ -21,9 +22,10 @@ define('forum/groups/details', [api,slugify,categorySelector,- bootbox,+ modals,alerts,- helpers+ helpers,+ tx,) {const Details = {};let groupName;@@ -86,7 +88,7 @@ define('forum/groups/details', [break;case 'kick':- bootbox.confirm('[[groups:details.kick-confirm]]', function (confirm) {+ modals.confirm('[[groups:details.kick-confirm]]', function (confirm) {if (!confirm) {return;}@@ -282,9 +284,9 @@ define('forum/groups/details', [};Details.deleteGroup = function () {- bootbox.confirm('Are you sure you want to delete the group: ' + utils.escapeHTML(groupName), function (confirm) {+ modals.confirm(tx.compile('groups:details.delete-group-confirm', utils.escapeHTML(groupName)), function (confirm) {if (confirm) {- bootbox.prompt('Please enter the name of this group in order to delete it:', function (response) {+ modals.prompt('[[groups:details.delete-group-confirm-label]]', function (response) {if (response === groupName) {api.del(`/groups/${ajaxify.data.group.slug}`, {}).then(() => {alerts.success('[[groups:event.deleted, ' + utils.escapeHTML(groupName) + ']]');@@ -348,7 +350,7 @@ define('forum/groups/details', [}function removeCover() {- bootbox.confirm('[[groups:remove-group-cover-confirm]]', function (confirm) {+ modals.confirm('[[groups:remove-group-cover-confirm]]', function (confirm) {if (!confirm) {return;}diff --git a/public/src/client/groups/list.js b/public/src/client/groups/list.jsindex a68b87bf9a..520ad50fe2 100644--- a/public/src/client/groups/list.js+++ b/public/src/client/groups/list.js@@ -1,14 +1,14 @@'use strict';define('forum/groups/list', [- 'api', 'bootbox', 'alerts',-], function (api, bootbox, alerts) {+ 'api', 'modals', 'alerts',+], function (api, modals, alerts) {const Groups = {};Groups.init = function () {// Group creation- $('button[data-action="new"]').on('click', function () {- const modal = bootbox.prompt('[[groups:new-group.group-name]]', function (name) {+ $('button[data-action="new"]').on('click', async function () {+ const modal = await modals.prompt('[[groups:new-group.group-name]]', function (name) {if (name === '') {return false;}diff --git a/public/src/client/groups/memberlist.js b/public/src/client/groups/memberlist.jsindex 80c319371d..e4565d8dea 100644--- a/public/src/client/groups/memberlist.js+++ b/public/src/client/groups/memberlist.js@@ -1,6 +1,8 @@'use strict';-define('forum/groups/memberlist', ['api', 'bootbox', 'alerts', 'helpers'], function (api, bootbox, alerts, helpers) {+define('forum/groups/memberlist', [+ 'api', 'modals', 'alerts', 'helpers', 'benchpress',+], function (api, modals, alerts, helpers, Benchpress) {const MemberList = {};let templateName;@@ -33,9 +35,9 @@ define('forum/groups/memberlist', ['api', 'bootbox', 'alerts', 'helpers'], functfunction handleMemberAdd() {$('[component="groups/members/add"]').on('click', function () {- app.parseAndTranslate('admin/partials/groups/add-members', {}, function (html) {+ Benchpress.render('admin/partials/groups/add-members', {}).then(async function (html) {const foundUsers = [];- const modal = bootbox.dialog({+ const modal = await modals.dialog({title: '[[groups:details.add-member]]',message: html,buttons: {diff --git a/public/src/client/ip-blacklist.js b/public/src/client/ip-blacklist.jsindex a5a1ed051e..fc0ce49d4c 100644--- a/public/src/client/ip-blacklist.js+++ b/public/src/client/ip-blacklist.js@@ -10,7 +10,7 @@ import {} from 'chart.js';import * as Benchpress from 'benchpressjs';-import * as bootbox from 'bootbox';+import * as modals from 'modals';import * as alerts from '../modules/alerts';Chart.register(LineController, CategoryScale, LinearScale, LineElement, PointElement, Tooltip, Filler);@@ -35,18 +35,14 @@ export function init() {});});- $('[data-action="test"]').on('click', function () {- socket.emit('blacklist.validate', {+ $('[data-action="test"]').on('click', async function () {+ const data = await socket.emit('blacklist.validate', {rules: blacklist.val(),- }, function (err, data) {- if (err) {- return alerts.error(err);- }+ }).catch(alerts.error);- Benchpress.render('admin/partials/blacklist-validate', data).then(function (html) {- bootbox.alert(html);- });- });+ const html = await Benchpress.render('admin/partials/blacklist-validate', data);+ console.log('html', html);+ modals.alert(html);});setupAnalytics();diff --git a/public/src/client/pagination.js b/public/src/client/pagination.jsindex 5a2a53b52c..06b9b76534 100644--- a/public/src/client/pagination.js+++ b/public/src/client/pagination.js@@ -1,12 +1,12 @@'use strict';-define('forum/pagination', ['bootbox'], function (bootbox) {+define('forum/pagination', ['modals'], function (modals) {const pagination = {};pagination.init = function () {$('body').on('click', '[component="pagination/select-page"]', function () {- bootbox.prompt('[[global:enter-page-number]]', function (pageNum) {+ modals.prompt('[[global:enter-page-number]]', function (pageNum) {pagination.loadPage(pageNum);});return false;diff --git a/public/src/client/post-queue.js b/public/src/client/post-queue.jsindex 95b4460b9e..edaebea8dd 100644--- a/public/src/client/post-queue.js+++ b/public/src/client/post-queue.js@@ -3,11 +3,11 @@define('forum/post-queue', ['categoryFilter', 'categorySelector', 'api', 'alerts',- 'translator', 'bootbox', 'accounts/moderate', 'accounts/delete',- 'autocomplete', 'uploader',+ 'translator', 'modals', 'accounts/moderate', 'accounts/delete',+ 'autocomplete', 'uploader', 'benchpress',], function (categoryFilter, categorySelector, api, alerts, translator,- bootbox, AccountModerate, AccountsDelete, autocomplete, uploader+ modals, AccountModerate, AccountsDelete, autocomplete, uploader, Benchpress) {const PostQueue = {};@@ -130,7 +130,7 @@ define('forum/post-queue', [function confirmReject(msg) {return new Promise((resolve) => {- bootbox.confirm(msg, resolve);+ modals.confirm(msg, resolve);});}@@ -400,51 +400,52 @@ define('forum/post-queue', [}async function getMessage(title) {- const reasons = await socket.emit('user.getCustomReasons', { type: 'post-queue' });- const html = await app.parseAndTranslate('partials/custom-reason', { reasons });-- return new Promise((resolve) => {+ let done;+ const userInputPromise = new Promise((resolve) => {let resolved = false;- const done = (value) => {+ done = (value) => {if (resolved) {return;}resolved = true;resolve(value);};+ });- const modal = bootbox.dialog({- title: title,- message: `<form class="form">${html.html()}</form>`,- show: true,- onEscape: true,- buttons: {- close: {- label: '[[global:close]]',- className: 'btn-link',- callback: function () {- done(false);- },+ const reasons = await socket.emit('user.getCustomReasons', { type: 'post-queue' });+ const html = await Benchpress.render('partials/custom-reason', { reasons });+ const modal = await modals.dialog({+ title: title,+ message: `<form class="form">${html}</form>`,+ show: true,+ onEscape: true,+ buttons: {+ close: {+ label: '[[global:close]]',+ className: 'btn-link',+ callback: function () {+ done(false);},- submit: {- label: '[[modules:bootbox.confirm]]',- callback: function () {- done(modal.find('[name="reason"]').val());- },+ },+ submit: {+ label: '[[modules:bootbox.confirm]]',+ callback: function () {+ done(modal.find('[name="reason"]').val());},},- });+ },+ });- modal.on('hidden.bs.modal', () => {- done(false);- });- modal.find('[data-key]').on('click', function () {- const reason = reasons.find(r => String(r.key) === $(this).attr('data-key'));- if (reason && reason.body) {- modal.find('[name="reason"]').val(translator.unescape(reason.body));- }- });+ modal.on('hidden.bs.modal', () => {+ done(false);+ });+ modal.find('[data-key]').on('click', function () {+ const reason = reasons.find(r => String(r.key) === $(this).attr('data-key'));+ if (reason && reason.body) {+ modal.find('[name="reason"]').val(reason.body);+ }});+ return userInputPromise;}async function doAction(action, id, message = '') {diff --git a/public/src/client/register.js b/public/src/client/register.jsindex ad3878d7d2..550e6ab003 100644--- a/public/src/client/register.js+++ b/public/src/client/register.js@@ -2,8 +2,8 @@define('forum/register', [- 'translator', 'slugify', 'api', 'bootbox', 'forum/login', 'zxcvbn', 'jquery-form',-], function (translator, slugify, api, bootbox, Login, zxcvbn) {+ 'translator', 'slugify', 'api', 'modals', 'forum/login', 'zxcvbn', 'jquery-form',+], function (translator, slugify, api, modals, Login, zxcvbn) {const Register = {};let validationError = false;const successIcon = '';@@ -14,8 +14,6 @@ define('forum/register', [const password_confirm = $('#password-confirm');const register = $('#register');- handleLanguageOverride();-$('#content #noscript').val('false');const query = utils.params();@@ -89,10 +87,8 @@ define('forum/register', [window.location.href = pathname + '?' + qs;} else if (data.message) {- translator.translate(data.message, function (msg) {- bootbox.alert(msg);- ajaxify.go('/');- });+ modals.alert(data.message);+ ajaxify.go('/');}},error: function (data) {@@ -212,14 +208,5 @@ define('forum/register', [});}- function handleLanguageOverride() {- if (!app.user.uid && config.defaultLang !== config.userLang) {- const formEl = $('[component="register/local"]');- const langEl = $('<input type="hidden" name="userLang" value="' + config.userLang + '" />');-- formEl.append(langEl);- }- }-return Register;});diff --git a/public/src/client/search.js b/public/src/client/search.jsindex d2c1bb1c03..d6c5ef314a 100644--- a/public/src/client/search.js+++ b/public/src/client/search.js@@ -10,7 +10,7 @@ define('forum/search', ['translator','categoryFilter','userFilter',-], function (searchModule, storage, hooks, alerts, api, translator, categoryFilter, userFilter) {+], function (searchModule, storage, hooks, alerts, api, tx, categoryFilter, userFilter) {const Search = {};let selectedUsers = [];let selectedTags = [];@@ -71,13 +71,13 @@ define('forum/search', [const isActive = selectedTags.length > 0;let labelText = '[[search:tags]]';if (selectedTags.length) {- labelText = translator.compile(- 'search:tags-x', selectedTags.map(u => u.value).join(', ')+ labelText = tx.compile(+ 'search:tags-x', selectedTags.map(u => tx.escape(u.value)).join(', '));}$('[component="tag/filter/button"]').toggleClass('active-filter', isActive- ).find('.filter-label').translateHtml(labelText);+ ).find('.filter-label').translateText(labelText);}function updateTimeFilter() {@@ -302,8 +302,8 @@ define('forum/search', [const isActive = _selectedUsers.length > 0;let labelText = '[[search:posted-by]]';if (isActive) {- labelText = translator.compile(- 'search:posted-by-usernames', selectedUsers.map(u => u.username).join(', ')+ labelText = tx.compile(+ 'search:posted-by-usernames', selectedUsers.map(u => tx.escape(u.username)).join(', '));}el.find('[component="user/filter/button"]').toggleClass(@@ -322,12 +322,10 @@ define('forum/search', [el.find('[component="tag/filter/selected"]').html(html);}function tagValueToObject(value) {- const escapedTag = utils.escapeHTML(value);return {value: value,- valueEscaped: escapedTag,valueEncoded: encodeURIComponent(value),- class: escapedTag.replace(/\s/g, '-'),+ class: value.replace(/\s/g, '-'),};}@@ -345,7 +343,7 @@ define('forum/search', [}if (!result.tags.length) {- el.find('[component="tag/filter/results"]').translateHtml(+ el.find('[component="tag/filter/results"]').translateText('[[tags:no-tags-found]]');return;diff --git a/public/src/client/tag.js b/public/src/client/tag.jsindex 199aaa362b..65bbbcd306 100644--- a/public/src/client/tag.js+++ b/public/src/client/tag.js@@ -1,8 +1,8 @@'use strict';define('forum/tag', [- 'topicList', 'api', 'alerts', 'hooks', 'translator', 'bootstrap', 'components',-], function (topicList, api, alerts, hooks, translator, bootstrap, components) {+ 'topicList', 'api', 'alerts', 'hooks', 'bootstrap', 'components',+], function (topicList, api, alerts, hooks, bootstrap, components) {const Tag = {};Tag.init = function () {@@ -41,24 +41,12 @@ define('forum/tag', [}function setFollowState(state) {- const titles = {- follow: '[[tags:watching]]',- unfollow: '[[tags:not-watching]]',- };-- translator.translate(titles[state], function (translatedTitle) {- const tooltip = bootstrap.Tooltip.getInstance('[component="tag/watch"]');- if (tooltip) {- tooltip.setContent({ '.tooltip-inner': translatedTitle });- }- });-- let menu = components.get('tag/following/menu');- menu.toggleClass('hidden', state !== 'follow');+ const followingMenu = components.get('tag/following/menu');+ followingMenu.toggleClass('hidden', state !== 'follow');components.get('tag/following/check').toggleClass('fa-check', state === 'follow');- menu = components.get('tag/not-following/menu');- menu.toggleClass('hidden', state !== 'unfollow');+ const notFollowingMenu = components.get('tag/not-following/menu');+ notFollowingMenu.toggleClass('hidden', state !== 'unfollow');components.get('tag/not-following/check').toggleClass('fa-check', state === 'unfollow');}};diff --git a/public/src/client/topic.js b/public/src/client/topic.jsindex 16036401c1..16e7a0023b 100644--- a/public/src/client/topic.js+++ b/public/src/client/topic.js@@ -15,14 +15,15 @@ define('forum/topic', ['hooks','api','alerts',- 'bootbox',+ 'modals',+ 'benchpress','clipboard','modules/intents',], function (infinitescroll, threadTools, postTools,events, posts, navigator, sort, quickreply,components, storage, hooks, api, alerts,- bootbox, clipboard, intents+ modals, Benchpress, clipboard, intents) {const Topic = {};let tid = '0';@@ -191,12 +192,12 @@ define('forum/topic', [thumbs.forEach((t, i) => {t.selected = i === clickedThumbIndex;});- const html = await app.parseAndTranslate('modals/topic-thumbs-view', {+ const html = await Benchpress.render('modals/topic-thumbs-view', {src: clickedThumb.href,thumbs: thumbs,});- const modal = bootbox.dialog({+ const modal = await modals.dialog({size: 'lg',onEscape: true,backdrop: true,@@ -452,7 +453,7 @@ define('forum/topic', [anchorEl.addEventListener('click', async () => {const { crossposts } = ajaxify.data;const html = await app.parseAndTranslate('modals/crossposts', { crossposts });- bootbox.dialog({+ modals.dialog({onEscape: true,backdrop: true,title: '[[global:crossposts]]',@@ -475,12 +476,13 @@ define('forum/topic', [function updateTopicTitle() {const span = components.get('navbar/title').find('span');- if ($(window).scrollTop() > 50 && span.hasClass('hidden')) {- span.html(ajaxify.data.title).removeClass('hidden');- } else if ($(window).scrollTop() <= 50 && !span.hasClass('hidden')) {- span.html('').addClass('hidden');+ const scrollTop = $(window).scrollTop();+ if (scrollTop > 50 && span.hasClass('hidden')) {+ span.text(ajaxify.data.title).removeClass('hidden');+ } else if (scrollTop <= 50 && !span.hasClass('hidden')) {+ span.text('').addClass('hidden');}- if ($(window).scrollTop() > 300) {+ if (scrollTop > 300) {alerts.remove('bookmark');}}diff --git a/public/src/client/topic/change-owner.js b/public/src/client/topic/change-owner.jsindex 9be031b62a..4ff5fb58e3 100644--- a/public/src/client/topic/change-owner.js+++ b/public/src/client/topic/change-owner.js@@ -47,9 +47,9 @@ define('forum/topic/change-owner', [function showPostsSelected() {if (postSelect.pids.length) {- modal.find('#pids').translateHtml('[[topic:fork-pid-count, ' + postSelect.pids.length + ']]');+ modal.find('#pids').translateText('[[topic:fork-pid-count, ' + postSelect.pids.length + ']]');} else {- modal.find('#pids').translateHtml('[[topic:fork-no-pids]]');+ modal.find('#pids').translateText('[[topic:fork-no-pids]]');}}diff --git a/public/src/client/topic/delete-posts.js b/public/src/client/topic/delete-posts.jsindex 8e01a839e0..c1b41e2032 100644--- a/public/src/client/topic/delete-posts.js+++ b/public/src/client/topic/delete-posts.js@@ -64,9 +64,9 @@ define('forum/topic/delete-posts', [function showPostsSelected() {if (postSelect.pids.length) {- modal.find('#pids').translateHtml('[[topic:fork-pid-count, ' + postSelect.pids.length + ']]');+ modal.find('#pids').translateText('[[topic:fork-pid-count, ' + postSelect.pids.length + ']]');} else {- modal.find('#pids').translateHtml('[[topic:fork-no-pids]]');+ modal.find('#pids').translateText('[[topic:fork-no-pids]]');}}diff --git a/public/src/client/topic/diffs.js b/public/src/client/topic/diffs.jsindex 6fb5c9e018..0838dce51f 100644--- a/public/src/client/topic/diffs.js+++ b/public/src/client/topic/diffs.js@@ -1,6 +1,8 @@'use strict';-define('forum/topic/diffs', ['api', 'bootbox', 'alerts', 'forum/topic/images'], function (api, bootbox, alerts) {+define('forum/topic/diffs', [+ 'api', 'modals', 'alerts', 'benchpress', 'forum/topic/images',+], function (api, modals, alerts, Benchpress) {const Diffs = {};const localeStringOpts = { year: 'numeric', month: 'short', day: 'numeric', hour: 'numeric', minute: 'numeric' };@@ -10,10 +12,10 @@ define('forum/topic/diffs', ['api', 'bootbox', 'alerts', 'forum/topic/images'],}api.get(`/posts/${encodeURIComponent(pid)}/diffs`, {}).then((data) => {- parsePostHistory(data).then(($html) => {- const $modal = bootbox.dialog({+ parsePostHistory(data).then(async (html) => {+ const $modal = await modals.dialog({title: '[[topic:diffs.title]]',- message: $html,+ message: html,size: 'large',onEscape: true,backdrop: true,@@ -82,8 +84,8 @@ define('forum/topic/diffs', ['api', 'bootbox', 'alerts', 'forum/topic/images'],Diffs.delete = function (pid, timestamp, $selectEl, $numberOfDiffCon) {api.del(`/posts/${encodeURIComponent(pid)}/diffs/${timestamp}`).then((data) => {- parsePostHistory(data, 'diffs').then(($html) => {- $selectEl.empty().append($html);+ parsePostHistory(data, 'diffs').then((html) => {+ $selectEl.empty().append(html);$selectEl.trigger('change');const numberOfDiffs = $selectEl.find('option').length;$numberOfDiffCon.text(numberOfDiffs);@@ -92,31 +94,28 @@ define('forum/topic/diffs', ['api', 'bootbox', 'alerts', 'forum/topic/images'],}).catch(alerts.error);};- function parsePostHistory(data, blockName) {- return new Promise((resolve) => {- const params = [{- diffs: data.revisions.map(function (revision) {- const timestamp = parseInt(revision.timestamp, 10);-- return {- username: revision.username,- timestamp: timestamp,- pretty: new Date(timestamp).toLocaleString(config.userLang.replace('_', '-'), localeStringOpts),- };- }),- numDiffs: data.timestamps.length,- editable: data.editable,- deletable: data.deletable,- }, function ($html) {- resolve($html);- }];+ async function parsePostHistory(data, blockName) {+ const params = [{+ diffs: data.revisions.map(function (revision) {+ const timestamp = parseInt(revision.timestamp, 10);++ return {+ username: revision.username,+ timestamp: timestamp,+ pretty: new Date(timestamp).toLocaleString(config.userLang.replace('_', '-'), localeStringOpts),+ };+ }),+ numDiffs: data.timestamps.length,+ editable: data.editable,+ deletable: data.deletable,+ }];++ if (blockName) {+ params.unshift(blockName);+ }- if (blockName) {- params.unshift(blockName);- }+ return await Benchpress.render('modals/post-history', ...params);- app.parseAndTranslate('modals/post-history', ...params);- });}return Diffs;diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.jsindex 6d66e85d0b..11f33e8818 100644--- a/public/src/client/topic/events.js+++ b/public/src/client/topic/events.js@@ -120,19 +120,23 @@ define('forum/topic/events', [history.replaceState({ url: newUrl }, null, window.location.protocol + '//' + window.location.host + config.relative_path + '/' + newUrl);topicTitle.fadeOut(250, function () {- topicTitle.html(data.topic.title).fadeIn(250);- });- breadCrumb.fadeOut(250, function () {- breadCrumb.html(data.topic.title).fadeIn(250);+ topicTitle.text(data.topic.title).fadeIn(250);});++ if (breadCrumb.is(':visible')) {+ breadCrumb.fadeOut(250, function () {+ breadCrumb.find('span').text(data.topic.title);+ breadCrumb.fadeIn(250);+ });+ }navbarTitle.fadeOut(250, function () {- navbarTitle.html(data.topic.title).fadeIn(250);+ navbarTitle.text(data.topic.title).fadeIn(250);});}if (data.post.changed) {editedPostEl.fadeOut(250, function () {- editedPostEl.html(translator.unescape(data.post.content));+ editedPostEl.html(data.post.content);editedPostEl.find('img:not(.not-responsive)').addClass('img-fluid');images.wrapImagesInLinks(editedPostEl.parent());posts.addBlockquoteEllipses(editedPostEl.parent());@@ -157,9 +161,7 @@ define('forum/topic/events', [const parentEl = $(`[component="post/parent"][data-parent-pid="${data.post.pid}"]`);if (parentEl.length) {- parentEl.find('[component="post/parent/content"]').html(- translator.unescape(data.post.content)- );+ parentEl.find('[component="post/parent/content"]').html(data.post.content);parentEl.find('img:not(.not-responsive)').addClass('img-fluid');parentEl.find('[component="post/parent/content"] img:not(.emoji)').each(function () {images.wrapImageInLink($(this));@@ -213,9 +215,9 @@ define('forum/topic/events', [if (!isAdminOrMod && !isSelfPost) {postEl.find('[component="post/tools"]').toggleClass('hidden', isDeleted);if (isDeleted) {- postEl.find('[component="post/content"]').translateHtml('[[topic:post-is-deleted]]');+ postEl.find('[component="post/content"]').translateText('[[topic:post-is-deleted]]');} else {- postEl.find('[component="post/content"]').html(translator.unescape(data.content));+ postEl.find('[component="post/content"]').html(data.content);}}}@@ -225,9 +227,9 @@ define('forum/topic/events', [parentEl.each((i, el) => {const $parent = $(el);if (isDeleted) {- $parent.find('[component="post/parent/content"]').translateHtml('[[topic:post-is-deleted]]');+ $parent.find('[component="post/parent/content"]').translateText('[[topic:post-is-deleted]]');} else {- $parent.find('[component="post/parent/content"]').html(translator.unescape(data.content));+ $parent.find('[component="post/parent/content"]').html(data.content);}});}diff --git a/public/src/client/topic/fork.js b/public/src/client/topic/fork.jsindex b420acc5c7..05c90ab448 100644--- a/public/src/client/topic/fork.js+++ b/public/src/client/topic/fork.js@@ -100,9 +100,9 @@ define('forum/topic/fork', [function showPostsSelected() {if (postSelect.pids.length) {- forkModal.find('#fork-pids').translateHtml('[[topic:fork-pid-count, ' + postSelect.pids.length + ']]');+ forkModal.find('#fork-pids').translateText('[[topic:fork-pid-count, ' + postSelect.pids.length + ']]');} else {- forkModal.find('#fork-pids').translateHtml('[[topic:fork-no-pids]]');+ forkModal.find('#fork-pids').translateText('[[topic:fork-no-pids]]');}}diff --git a/public/src/client/topic/merge.js b/public/src/client/topic/merge.jsindex 7c96f0b9e7..59fffa828b 100644--- a/public/src/client/topic/merge.js+++ b/public/src/client/topic/merge.js@@ -143,7 +143,7 @@ define('forum/topic/merge', ['search', 'alerts', 'api'], function (search, alert);});} else {- modal.find('.topics-section').translateHtml('[[error:no-topics-selected]]');+ modal.find('.topics-section').translateText('[[error:no-topics-selected]]');modal.find('.merge-main-topic-select').html('');}}diff --git a/public/src/client/topic/move-post.js b/public/src/client/topic/move-post.jsindex 62863f16bf..b7d116c9da 100644--- a/public/src/client/topic/move-post.js+++ b/public/src/client/topic/move-post.js@@ -107,13 +107,13 @@ define('forum/topic/move-post', [return alerts.error('[[error:cant-move-posts-to-scheduled]]');}const translateStr = translator.compile('topic:x-posts-will-be-moved-to-y', postSelect.pids.length, data.title);- moveModal.find('#pids').translateHtml(translateStr);+ moveModal.find('#pids').translateText(translateStr);});} else {- moveModal.find('#pids').translateHtml('[[topic:x-posts-selected, ' + postSelect.pids.length + ']]');+ moveModal.find('#pids').translateText('[[topic:x-posts-selected, ' + postSelect.pids.length + ']]');}} else {- moveModal.find('#pids').translateHtml('[[topic:no-posts-selected]]');+ moveModal.find('#pids').translateText('[[topic:no-posts-selected]]');}}diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.jsindex 7160a1ed51..4f758f15df 100644--- a/public/src/client/topic/postTools.js+++ b/public/src/client/topic/postTools.js@@ -2,8 +2,8 @@define('forum/topic/postTools', ['share', 'navigator', 'components', 'translator', 'forum/topic/votes',- 'api', 'bootbox', 'alerts', 'hooks', 'helpers', 'slugify',-], function (share, navigator, components, translator, votes, api, bootbox, alerts, hooks, helpers, slugify) {+ 'api', 'modals', 'alerts', 'hooks', 'helpers', 'slugify',+], function (share, navigator, components, translator, votes, api, modals, alerts, hooks, helpers, slugify) {const PostTools = {};let staleReplyAnyway = false;@@ -15,7 +15,7 @@ define('forum/topic/postTools', [addPostHandlers(tid);- share.addShareHandlers(ajaxify.data.titleRaw);+ share.addShareHandlers(ajaxify.data.title);votes.addVoteHandler();@@ -107,12 +107,10 @@ define('forum/topic/postTools', [onReplyClicked($(this), tid);});- $('.topic').on('click', '[component="topic/reply-as-topic"]', function () {- translator.translate(`[[topic:link-back, ${ajaxify.data.titleRaw}, ${config.relative_path}/topic/${ajaxify.data.slug}]]`, function (body) {- hooks.fire('action:composer.topic.new', {- cid: ajaxify.data.cid,- body: body,- });+ $('.topic').on('click', '[component="topic/reply-as-topic"]', async function () {+ hooks.fire('action:composer.topic.new', {+ cid: ajaxify.data.cid,+ body: await getLinkBackBody(),});});@@ -149,7 +147,7 @@ define('forum/topic/postTools', [postContainer.on('click', '[component="post/already-flagged"]', function () {const flagId = $(this).data('flag-id');require(['flags'], function (flags) {- bootbox.confirm('[[flags:modal-confirm-rescind]]', function (confirm) {+ modals.confirm('[[flags:modal-confirm-rescind]]', function (confirm) {if (!confirm) {return;}@@ -301,7 +299,7 @@ define('forum/topic/postTools', [hooks.fire('action:composer.addQuote', {tid: tid,pid: toPid,- title: ajaxify.data.titleRaw,+ title: ajaxify.data.title,username: username,body: selectedNode.text,selectedPid: selectedNode.pid,@@ -310,7 +308,7 @@ define('forum/topic/postTools', [hooks.fire('action:composer.post.new', {tid: tid,pid: toPid,- title: ajaxify.data.titleRaw,+ title: ajaxify.data.title,body: username ? username + ' ' : ($('[component="topic/quickreply/text"]').val() || ''),});}@@ -332,7 +330,7 @@ define('forum/topic/postTools', [tid: tid,pid: toPid,username: username,- title: ajaxify.data.titleRaw,+ title: ajaxify.data.title,body: body,});});@@ -419,7 +417,7 @@ define('forum/topic/postTools', [return;}- bootbox.confirm('[[topic:post-' + action + '-confirm]]', function (confirm) {+ modals.confirm('[[topic:post-' + action + '-confirm]]', function (confirm) {if (!confirm) {return;}@@ -439,7 +437,7 @@ define('forum/topic/postTools', [return false;}- function showStaleWarning(callback) {+ async function showStaleWarning(callback) {const topicStaleDays = parseInt(ajaxify.data.topicStaleDays, 10);if (!topicStaleDays) {return callback();@@ -452,7 +450,7 @@ define('forum/topic/postTools', [return callback();}- const warning = bootbox.dialog({+ modals.dialog({title: '[[topic:stale.title]]',message: '[[topic:stale.warning]]',buttons: {@@ -467,20 +465,16 @@ define('forum/topic/postTools', [create: {label: '[[topic:stale.create]]',className: 'btn-primary',- callback: function () {- translator.translate(`[[topic:link-back, ${ajaxify.data.title}, ${config.relative_path}/topic/${ajaxify.data.slug}]]`, function (body) {- hooks.fire('action:composer.topic.new', {- cid: ajaxify.data.cid,- body: body,- fromStaleTopic: true,- });+ callback: async function () {+ hooks.fire('action:composer.topic.new', {+ cid: ajaxify.data.cid,+ body: await getLinkBackBody(),+ fromStaleTopic: true,});},},},});-- warning.modal();}const selectionChangeFn = utils.debounce(selectionChange, 250);@@ -555,5 +549,15 @@ define('forum/topic/postTools', [}}+ async function getLinkBackBody() {+ // brackets confuse markdown parsing, so we need to escape them+ // "link-back": "Re: [%1](%2)\n\n",+ const title = ajaxify.data.title.replace(/\]\]/g, '\\]\\]').replace(/\[\[/g, '\\[\\[')+ .replace(/[/g, '&lsqb;')+ .replace(/]/g, '&rsqb;');+ const href = `${config.relative_path}/topic/${ajaxify.data.slug}`;+ return await translator.translateKey('topic:link-back', [title, href]);+ }+return PostTools;});diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.jsindex 7e1a001ada..122f7ee64c 100644--- a/public/src/client/topic/threadTools.js+++ b/public/src/client/topic/threadTools.js@@ -8,11 +8,12 @@ define('forum/topic/threadTools', ['forum/topic/posts','api','hooks',- 'bootbox',+ 'modals','alerts','bootstrap','helpers',-], function (components, translator, handleBack, posts, api, hooks, bootbox, alerts, bootstrap, helpers) {+ 'benchpress',+], function (components, translator, handleBack, posts, api, hooks, modals, alerts, bootstrap, helpers, Benchpress) {const ThreadTools = {};ThreadTools.init = function (tid, topicContainer) {@@ -86,7 +87,7 @@ define('forum/topic/threadTools', [topicContainer.on('click', '[component="topic/event/delete"]', function () {const eventId = $(this).attr('data-topic-event-id');const eventEl = $(this).parents('[data-topic-event-id]');- bootbox.confirm('[[topic:delete-event-confirm]]', (ok) => {+ modals.confirm('[[topic:delete-event-confirm]]', (ok) => {if (ok) {api.del(`/topics/${tid}/events/${eventId}`, {}).then(function () {@@ -258,7 +259,7 @@ define('forum/topic/threadTools', [case 'delete':case 'restore':case 'purge':- bootbox.confirm(`[[topic:thread-tools.${command}-confirm]]`, execute);+ modals.confirm(`[[topic:thread-tools.${command}-confirm]]`, execute);break;case 'pin':@@ -272,8 +273,8 @@ define('forum/topic/threadTools', [}ThreadTools.requestPinExpiry = function (body, onSuccess) {- app.parseAndTranslate('modals/set-pin-expiry', {}, function (html) {- const modal = bootbox.dialog({+ Benchpress.render('modals/set-pin-expiry', {}).then(async (html) => {+ const modal = await modals.dialog({title: '[[topic:thread-tools.pin]]',message: html,onEscape: true,diff --git a/public/src/client/topic/votes.js b/public/src/client/topic/votes.jsindex 746fd30561..c3695a97e7 100644--- a/public/src/client/topic/votes.js+++ b/public/src/client/topic/votes.js@@ -2,8 +2,8 @@define('forum/topic/votes', [- 'components', 'translator', 'api', 'hooks', 'bootbox', 'alerts', 'bootstrap',-], function (components, translator, api, hooks, bootbox, alerts, bootstrap) {+ 'components', 'translator', 'api', 'hooks', 'modals', 'alerts', 'bootstrap', 'benchpress',+], function (components, translator, api, hooks, modals, alerts, bootstrap, Benchpress) {const Votes = {};let _showTooltip = {};@@ -67,7 +67,7 @@ define('forum/topic/votes', [});}- function createTooltip(el, data) {+ async function createTooltip(el, data) {function doCreateTooltip(title) {el.attr('title', title);(new bootstrap.Tooltip(el, {@@ -75,20 +75,17 @@ define('forum/topic/votes', [html: true,})).show();}- let usernames = data.usernames+ const usernames = data.usernames.filter(name => name !== '[[global:former-user]]');if (!usernames.length) {return;}+ const usersList = usernames.join(', ');if (usernames.length + data.otherCount > data.cutoff) {- usernames = usernames.join(', ').replace(/,/g, '|');- translator.translate('[[topic:users-and-others, ' + usernames + ', ' + data.otherCount + ']]', function (translated) {- translated = translated.replace(/\|/g, ',');- doCreateTooltip(translated);- });+ const translated = await translator.translateKey('topic:users-and-others', [usersList, data.otherCount]);+ doCreateTooltip(translated);} else {- usernames = usernames.join(', ');- doCreateTooltip(usernames);+ doCreateTooltip(usersList);}}@@ -129,29 +126,23 @@ define('forum/topic/votes', [return false;};- Votes.showVotes = function (pid) {+ Votes.showVotes = async function (pid) {if (!canSeeVotes()) {return;}- api.get(`/posts/${encodeURIComponent(pid)}/voters`, {}, function (err, data) {- if (err) {- return alerts.error(err);- }+ const data = await api.get(`/posts/${encodeURIComponent(pid)}/voters`, {});+ const html = await Benchpress.render('modals/votes', data);+ const dialog = await modals.dialog({+ title: '[[global:voters]]',+ message: html,+ className: 'vote-modal',+ show: true,+ onEscape: true,+ backdrop: true,+ });- app.parseAndTranslate('modals/votes', data, function (html) {- const dialog = bootbox.dialog({- title: '[[global:voters]]',- message: html,- className: 'vote-modal',- show: true,- onEscape: true,- backdrop: true,- });-- dialog.on('click', function () {- dialog.modal('hide');- });- });+ dialog.on('click', function () {+ dialog.modal('hide');});};@@ -160,7 +151,7 @@ define('forum/topic/votes', [.catch(err => alerts.error(err));const html = await app.parseAndTranslate('modals/announcers', data);- const dialog = bootbox.dialog({+ const dialog = await modals.dialog({title: `[[topic:announcers-x, ${data.announceCount}]]`,message: html,className: 'announce-modal',diff --git a/public/src/client/world.js b/public/src/client/world.jsindex 1ad948082c..92c451803d 100644--- a/public/src/client/world.js+++ b/public/src/client/world.js@@ -2,12 +2,12 @@define('forum/world', ['forum/infinitescroll', 'search', 'sort', 'hooks',- 'alerts', 'api', 'bootbox', 'helpers', 'forum/category/tools',+ 'alerts', 'api', 'modals', 'helpers', 'forum/category/tools','translator', 'quickreply', 'handleBack', 'imagesloaded','forum/topic/votes','modules/intents',], function (infinitescroll, search, sort, hooks,- alerts, api, bootbox, helpers, categoryTools,+ alerts, api, modals, helpers, categoryTools,translator, quickreply, handleBack, imagesLoaded, votes, intents) {const World = {};@@ -208,7 +208,7 @@ define('forum/world', [];trigger.addEventListener('click', () => {- bootbox.dialog({+ modals.dialog({title: '[[world:help.title]]',message: content.join('\n'),size: 'large',diff --git a/public/src/modules/accounts/delete.js b/public/src/modules/accounts/delete.jsindex bba2a0b2e7..dfd84f63b9 100644--- a/public/src/modules/accounts/delete.js+++ b/public/src/modules/accounts/delete.js@@ -1,6 +1,6 @@'use strict';-define('accounts/delete', ['api', 'bootbox', 'alerts'], function (api, bootbox, alerts) {+define('accounts/delete', ['api', 'modals', 'alerts'], function (api, modals, alerts) {const Delete = {};Delete.account = function (uid, callback) {@@ -34,7 +34,7 @@ define('accounts/delete', ['api', 'bootbox', 'alerts'], function (api, bootbox,};function executeAction(uid, confirmText, path, successText, callback) {- bootbox.confirm(confirmText, function (confirm) {+ modals.confirm(confirmText, function (confirm) {if (!confirm) {return;}diff --git a/public/src/modules/accounts/invite.js b/public/src/modules/accounts/invite.jsindex ed83914765..306effb1d8 100644--- a/public/src/modules/accounts/invite.js+++ b/public/src/modules/accounts/invite.js@@ -1,6 +1,6 @@'use strict';-define('accounts/invite', ['api', 'benchpress', 'bootbox', 'alerts'], function (api, Benchpress, bootbox, alerts) {+define('accounts/invite', ['api', 'benchpress', 'modals', 'alerts'], function (api, Benchpress, modals, alerts) {const Invite = {};function isACP() {@@ -11,8 +11,8 @@ define('accounts/invite', ['api', 'benchpress', 'bootbox', 'alerts'], function ($('[component="user/invite"]').on('click', function (e) {e.preventDefault();api.get(`/api/v3/users/${app.user.uid}/invites/groups`, {}).then((groups) => {- Benchpress.parse('modals/invite', { groups: groups }, function (html) {- bootbox.dialog({+ Benchpress.parse('modals/invite', { groups }, function (html) {+ modals.dialog({message: html,title: `[[${isACP() ? 'admin/manage/users:invite' : 'users:invite'}]]`,onEscape: true,diff --git a/public/src/modules/accounts/moderate.js b/public/src/modules/accounts/moderate.jsindex 9e0b602893..f175477638 100644--- a/public/src/modules/accounts/moderate.js+++ b/public/src/modules/accounts/moderate.js@@ -2,10 +2,10 @@define('forum/account/moderate', ['api',- 'bootbox',+ 'modals','alerts',- 'translator',-], function (api, bootbox, alerts, translator) {+ 'benchpress',+], function (api, modals, alerts, Benchpress) {const AccountModerate = {};AccountModerate.banAccount = function (theirid, onSuccess) {@@ -81,11 +81,10 @@ define('forum/account/moderate', [async function throwModal(options) {const reasons = await socket.emit('user.getCustomReasons', { type: options.type || '' });- const html = await app.parseAndTranslate(options.tpl, { reasons });- const modal = bootbox.dialog({+ const html = await Benchpress.render(options.tpl, { reasons });+ const modal = await modals.dialog({title: options.title,message: html,- show: true,onEscape: true,buttons: {close: {@@ -118,9 +117,10 @@ define('forum/account/moderate', [modal.find('[data-key]').on('click', function () {const reason = reasons.find(r => String(r.key) === $(this).attr('data-key'));if (reason && reason.body) {- modal.find('[name="reason"]').val(translator.unescape(reason.body));+ modal.find('[name="reason"]').val(reason.body);}});+ return modal;}AccountModerate.throwModal = throwModal;diff --git a/public/src/modules/accounts/picture.js b/public/src/modules/accounts/picture.jsindex bd38d10250..e5422e13a3 100644--- a/public/src/modules/accounts/picture.js+++ b/public/src/modules/accounts/picture.js@@ -3,98 +3,82 @@define('accounts/picture', ['pictureCropper','api',- 'bootbox',+ 'modals','alerts',-], (pictureCropper, api, bootbox, alerts) => {+ 'benchpress',+], (pictureCropper, api, modals, alerts, Benchpress) => {const Picture = {};- Picture.openChangeModal = () => {- socket.emit('user.getProfilePictures', {+ Picture.openChangeModal = async () => {+ const pictures = await socket.emit('user.getProfilePictures', {uid: ajaxify.data.uid,- }, function (err, pictures) {- if (err) {- return alerts.error(err);- }+ });- // boolean to signify whether an uploaded picture is present in the pictures list- const uploaded = pictures.reduce(function (memo, cur) {- return memo || cur.type === 'uploaded';- }, false);-- app.parseAndTranslate('modals/change-picture', {- pictures: pictures,- uploaded: uploaded,- icon: { text: ajaxify.data['icon:text'], bgColor: ajaxify.data['icon:bgColor'] },- defaultAvatar: ajaxify.data.defaultAvatar,- allowProfileImageUploads: ajaxify.data.allowProfileImageUploads,- iconBackgrounds: ajaxify.data.iconBackgrounds.map((color) => {- return {- color,- selected: color === ajaxify.data['icon:bgColor'],- };- }),- user: {- uid: ajaxify.data.uid,- username: ajaxify.data.username,- picture: ajaxify.data.picture,- 'icon:text': ajaxify.data['icon:text'],- 'icon:bgColor': ajaxify.data['icon:bgColor'],+ const html = await Benchpress.render('modals/change-picture', {+ pictures: pictures,+ icon: { text: ajaxify.data['icon:text'], bgColor: ajaxify.data['icon:bgColor'] },+ defaultAvatar: ajaxify.data.defaultAvatar,+ allowProfileImageUploads: ajaxify.data.allowProfileImageUploads,+ iconBackgrounds: ajaxify.data.iconBackgrounds.map((color) => {+ return {+ color,+ selected: color === ajaxify.data['icon:bgColor'],+ };+ }),+ user: {+ uid: ajaxify.data.uid,+ username: ajaxify.data.username,+ picture: ajaxify.data.picture,+ 'icon:text': ajaxify.data['icon:text'],+ 'icon:bgColor': ajaxify.data['icon:bgColor'],+ },+ });++ const modal = await modals.dialog({+ className: 'picture-switcher',+ title: '[[user:change-picture]]',+ message: html,+ show: true,+ size: 'large',+ buttons: {+ close: {+ label: '[[global:close]]',+ className: 'btn-link',},- }, function (html) {- const modal = bootbox.dialog({- className: 'picture-switcher',- title: '[[user:change-picture]]',- message: html,- show: true,- size: 'large',- buttons: {- close: {- label: '[[global:close]]',- callback: onCloseModal,- className: 'btn-link',- },- update: {- label: '[[global:save-changes]]',- callback: saveSelection,- },+ update: {+ label: '[[global:save-changes]]',+ callback: function () {+ const activeBtn = modal.find('[component="profile/picture/button"].active');+ const type = activeBtn.attr('data-type');+ const picture = activeBtn.find('img').attr('src');+ const bgColor = modal.find('[data-bg-color].selected').attr('data-bg-color') || 'transparent';++ api.put(`/users/${ajaxify.data.theirid}/picture`, {+ type, picture, bgColor,+ }).then(() => {+ Picture.updateHeader(+ type === 'default' ? '' : picture,+ bgColor+ );+ ajaxify.refresh();+ }).catch(alerts.error);},- });-- modal.on('click', '[component="profile/picture/button"]', function selectImageType() {- modal.find('[component="profile/picture/button"]').removeClass('active');- $(this).addClass('active');- });-- modal.on('click', '[data-bg-color]', function () {- const value = $(this).attr('data-bg-color');- $(this).addClass('selected').siblings().removeClass('selected');- modal.find('[component="avatar/icon"]').css('background-color', value);- });+ },+ },+ });- handleImageUpload(modal);-- function saveSelection() {- const activeBtn = modal.find('[component="profile/picture/button"].active');- const type = activeBtn.attr('data-type');- const picture = activeBtn.find('img').attr('src');- const bgColor = modal.find('[data-bg-color].selected').attr('data-bg-color') || 'transparent';-- api.put(`/users/${ajaxify.data.theirid}/picture`, {- type, picture, bgColor,- }).then(() => {- Picture.updateHeader(- type === 'default' ? '' : picture,- bgColor- );- ajaxify.refresh();- }).catch(alerts.error);- }+ modal.on('click', '[component="profile/picture/button"]', function () {+ modal.find('[component="profile/picture/button"]').removeClass('active');+ $(this).addClass('active');+ });- function onCloseModal() {- modal.modal('hide');- }- });+ modal.on('click', '[data-bg-color]', function () {+ const value = $(this).attr('data-bg-color');+ $(this).addClass('selected').siblings().removeClass('selected');+ modal.find('[component="avatar/icon"]').css('background-color', value);});++ handleImageUpload(modal);};Picture.updateHeader = (picture, iconBgColor) => {diff --git a/public/src/modules/alerts.js b/public/src/modules/alerts.jsindex 725772f5a3..56b2524b32 100644--- a/public/src/modules/alerts.js+++ b/public/src/modules/alerts.js@@ -69,9 +69,9 @@ export function remove(id) {$('#alert_button_' + id).remove();}-function updateAlert(alert, params) {- alert.find('strong').translateHtml(params.title);- alert.find('p').translateHtml(params.message);+async function updateAlert(alert, params) {+ const newEl = await app.parseAndTranslate('partials/toast', params);+ alert.find('[component="toast/body"]').replaceWith(newEl.find('[component="toast/body"]'));alert.removeClass('alert-success alert-danger alert-info alert-warning').addClass(`alert-${params.type}`);diff --git a/public/src/modules/autocomplete.js b/public/src/modules/autocomplete.jsindex 24ca324392..5466af1ded 100644--- a/public/src/modules/autocomplete.js+++ b/public/src/modules/autocomplete.js@@ -45,10 +45,9 @@ define('autocomplete', [if (result && result.users) {const names = result.users.map(function (user) {- const username = $('<div></div>').html(user.username).text();return user && {- label: username,- value: username,+ label: user.username,+ value: user.username,user: {uid: user.uid,name: user.username,diff --git a/public/src/modules/categorySelector.js b/public/src/modules/categorySelector.jsindex f76364286a..00db488162 100644--- a/public/src/modules/categorySelector.js+++ b/public/src/modules/categorySelector.js@@ -1,8 +1,8 @@'use strict';define('categorySelector', [- 'categorySearch', 'bootbox', 'hooks', 'translator',-], function (categorySearch, bootbox, hooks, translator) {+ 'categorySearch', 'modals', 'hooks', 'translator', 'benchpress',+], function (categorySearch, modals, hooks, translator, Benchpress) {const categorySelector = {};categorySelector.init = function (el, options) {@@ -71,39 +71,41 @@ define('categorySelector', [return selector;};- categorySelector.modal = function (options) {+ categorySelector.modal = async function (options) {options = options || {};options.onSelect = options.onSelect || function () {};options.onSubmit = options.onSubmit || function () {};- app.parseAndTranslate('admin/partials/categories/select-category', { message: options.message }, function (html) {- const modal = bootbox.dialog({- title: options.title || '[[modules:composer.select-category]]',- message: html,- buttons: {- save: {- label: '[[global:select]]',- className: 'btn-primary',- callback: submit,- },+ const html = await Benchpress.render('admin/partials/categories/select-category', {+ message: options.message,+ });+ console.log('pre translate', html);+ const modal = await modals.dialog({+ title: options.title || '[[modules:composer.select-category]]',+ message: html,+ buttons: {+ save: {+ label: '[[global:select]]',+ className: 'btn-primary',+ callback: submit,},- });+ },+ });- const selector = categorySelector.init(modal.find('[component="category-selector"]'), options);- function submit(ev) {- ev.preventDefault();- if (selector.selectedCategory) {- options.onSubmit(selector.selectedCategory);- modal.modal('hide');- }- return false;- }- if (options.openOnLoad) {- modal.on('shown.bs.modal', function () {- modal.find('.dropdown-toggle').dropdown('toggle');- });+ const selector = categorySelector.init(modal.find('[component="category-selector"]'), options);+ function submit(ev) {+ ev.preventDefault();+ if (selector.selectedCategory) {+ options.onSubmit(selector.selectedCategory);+ modal.modal('hide');}- modal.find('form').on('submit', submit);- });+ return false;+ }+ if (options.openOnLoad) {+ modal.on('shown.bs.modal', function () {+ modal.find('.dropdown-toggle').dropdown('toggle');+ });+ }+ modal.find('form').on('submit', submit);};return categorySelector;diff --git a/public/src/modules/chat.js b/public/src/modules/chat.jsindex 836d85ddf0..9c6425accc 100644--- a/public/src/modules/chat.js+++ b/public/src/modules/chat.js@@ -1,8 +1,8 @@'use strict';define('chat', [- 'components', 'taskbar', 'translator', 'hooks', 'bootbox', 'alerts', 'api', 'scrollStop', 'resizable',-], function (components, taskbar, translator, hooks, bootbox, alerts, api, scrollStop, resizable) {+ 'components', 'taskbar', 'translator', 'hooks', 'modals', 'alerts', 'api', 'scrollStop', 'resizable', 'helpers',+], function (components, taskbar, translator, hooks, modals, alerts, api, scrollStop, resizable, helpers) {const Chat = {};Chat.openChat = function (roomId, uid) {@@ -74,7 +74,7 @@ define('chat', [return createChat();}- bootbox.confirm('[[modules:chat.confirm-chat-with-dnd-user]]', function (ok) {+ modals.confirm('[[modules:chat.confirm-chat-with-dnd-user]]', function (ok) {if (ok) {createChat();}@@ -236,14 +236,12 @@ define('chat', [if (titleEl.length) {titleEl.html(data.newName ?- `<i class="fa ${icon} text-muted"></i> ${data.newName}` :+ `<i class="fa ${helpers.escape(icon)} text-muted"></i> ${helpers.escape(data.newName)}` :data.chatWithMessage);}-- const newTitle = $('<div></div>').html(data.newName).text();taskbar.update('chat', modal.attr('data-uuid'), {- title: newTitle,+ title: helpers.escape(data.newName),});hooks.fire('action:chat.renamed', Object.assign(data, {modal: modal,@@ -275,15 +273,20 @@ define('chat', [const usernames = [];typingUsersList.children().each((i, el) => {- usernames.push($(el).text());+ usernames.push(translator.escape($(el).text()));});+ const totalTyping = usernames.length;const typingTextEl = typingEl.find('[component="chat/composer/typing/text"]');- const count = usernames.length > 3 ? 'n' : usernames.length;- if (count) {- const key = `modules:chat.user-typing-${count}`;- const compiled = translator.compile.apply(null, [key, ...usernames]);- typingTextEl.html(await translator.translate(compiled));+ if (totalTyping) {+ const key = `modules:chat.user-typing-${totalTyping > 3 ? 'n' : totalTyping}`;+ const args = [];+ if (totalTyping > 3) {+ args.push(usernames[0], usernames[1], totalTyping - 2);+ } else {+ args.push(...usernames);+ }+ typingTextEl.html(await translator.translateKey(key, args));}typingTextEl.toggleClass('hidden', !usernames.length);};diff --git a/public/src/modules/components.js b/public/src/modules/components.jsindex 2ebd952f91..a6704ccccd 100644--- a/public/src/modules/components.js+++ b/public/src/modules/components.js@@ -58,6 +58,10 @@ define('components', function () {'chat/recent/room': function (roomid) {return $('[component="chat/recent/room"][data-roomid="' + roomid + '"]');},++ 'chat/public/room': function (roomid) {+ return $('[component="chat/public/room"][data-roomid="' + roomid + '"]');+ },};components.get = function () {diff --git a/public/src/modules/helpers.common.js b/public/src/modules/helpers.common.jsindex 7ce9b29e4a..029e931ed1 100644--- a/public/src/modules/helpers.common.js+++ b/public/src/modules/helpers.common.js@@ -1,16 +1,20 @@'use strict';-module.exports = function (utils, Benchpress, translator, relative_path) {+module.exports = function (utils, Benchpress, tx, relative_path) {Benchpress.setGlobal('true', true);Benchpress.setGlobal('false', false);const oneDayInMs = 24 * 60 * 60 * 1000;const helpers = {- displayMenuItem,+ __escape: escape,+ escape,+ txEscape: tx.escape,+ txEscapeArg: tx.escapeArg,+ tx: _tx,buildMetaTag,buildLinkTag,stringify,- escape,+ displayMenuItem,stripTags,buildCategoryIcon,buildCategoryLabel,@@ -27,6 +31,11 @@ module.exports = function (utils, Benchpress, translator, relative_path) {increment,lessthan,greaterthan,+ max,+ min,+ clamp,+ quote,+ renderContent,generateWroteReplied,generateRepliedTo,generateWrote,@@ -36,43 +45,59 @@ module.exports = function (utils, Benchpress, translator, relative_path) {humanReadableNumber,formattedNumber,isNumber,- tx,- txEscape,uploadBasename,generatePlaceholderWave,register,- __escape: identity,};- function identity(str) {- return str;+ function escape(str) {+ // decoding HTML entities before escaping to prevent double escaping+ // and allow translators to use HTML entities in translations+ return tx.escape(+ utils.escapeHTML(utils.decodeHTMLEntities(str))+ );}- function displayMenuItem(data, index) {- const item = data.navigation[index];- if (!item) {- return false;+ function _tx(token, ...args) {+ if (Array.isArray(token) && token.length) {+ args = [...token.slice(1)];+ token = token[0];}-- if (item.route.match('/users') && data.user && !data.user.privileges['view:users']) {- return false;+ if (!token) {+ return '';}- if (item.route.match('/tags') && data.user && !data.user.privileges['view:tags']) {- return false;+ const hasPassedArgs = args.length > 0;+ const [txToken, argsFromToken] = tx.normalizeToken(token, hasPassedArgs);+ if (!hasPassedArgs && argsFromToken.length > 0) {+ args = argsFromToken;}-- if (item.route.match('/groups') && data.user && !data.user.privileges['view:groups']) {- return false;+ const [namespace, key] = txToken.split(':', 2);+ if (!namespace || !key || !this?._i18n?.[namespace]?.[key]) {+ return tx.escape(tx.fixDoubleEscaped(tx.escapeHTML(token)));}- return true;+ const escapedArgs = args.map((arg) => {+ const escapedArg = tx.fixDoubleEscaped(tx.escapeHTML(arg));++ if (escapedArg.startsWith('[[') && escapedArg.endsWith(']]')) {+ return _tx.call(this, escapedArg);+ }+ return escapedArg;+ });++ const translation = this._i18n[namespace][key];+ const result = tx.replaceArguments(translation, escapedArgs);+ // prevents the translator.translate() in+ // app.parseAndTraslate and page render from translating again+ // can be removed once whole page translation is removed+ return tx.escape(result);}function buildMetaTag(tag) {- const name = tag.name ? 'name="' + tag.name + '" ' : '';- const property = tag.property ? 'property="' + tag.property + '" ' : '';- const content = tag.content ? 'content="' + helpers.txEscape(tag.content).replace(/\n/g, ' ') + '" ' : '';+ const name = tag.name ? `name="${escape(tag.name)}" ` : '';+ const property = tag.property ? `property="${escape(tag.property)}" ` : '';+ const content = tag.content ? `content="${escape(tag.content).replace(/\n/g, ' ')}" ` : '';return '<meta ' + name + property + content + '/>\n\t';}@@ -81,7 +106,9 @@ module.exports = function (utils, Benchpress, translator, relative_path) {const attributes = ['link', 'rel', 'as', 'type', 'href', 'hreflang', 'sizes', 'title', 'crossorigin',];- const [link, rel, as, type, href, hreflang, sizes, title, crossorigin] = attributes.map(attr => (tag[attr] ? `${attr}="${tag[attr]}" ` : ''));+ const [link, rel, as, type, href, hreflang, sizes, title, crossorigin] = attributes.map(+ attr => (tag[attr] ? `${attr}="${escape(tag[attr])}" ` : '')+ );return '<link ' + link + rel + as + type + sizes + title + href + hreflang + crossorigin + '/>\n\t';}@@ -92,8 +119,25 @@ module.exports = function (utils, Benchpress, translator, relative_path) {.replace(/"/g, '"');}- function escape(str) {- return utils.escapeHTML(str);+ function displayMenuItem(data, index) {+ const item = data.navigation[index];+ if (!item) {+ return false;+ }++ if (item.route.match('/users') && data.user && !data.user.privileges['view:users']) {+ return false;+ }++ if (item.route.match('/tags') && data.user && !data.user.privileges['view:tags']) {+ return false;+ }++ if (item.route.match('/groups') && data.user && !data.user.privileges['view:groups']) {+ return false;+ }++ return true;}function stripTags(str) {@@ -104,19 +148,26 @@ module.exports = function (utils, Benchpress, translator, relative_path) {if (!category) {return '';}-- return `<span class="icon d-inline-flex justify-content-center align-items-center align-middle ${rounded}" style="${generateCategoryBackground(category)} width:${size}; height: ${size}; font-size: ${parseInt(size, 10) / 2}px;">${category.icon ? `<i class="fa fa-fw ${category.icon}"></i>` : ''}</span>`;+ const sizeEscaped = escape(size);+ const fontSize = (parseInt(size, 10) / 2) || 16;+ return `<span class="icon d-inline-flex justify-content-center align-items-center align-middle ${rounded}" style="${generateCategoryBackground(category)} width:${sizeEscaped}; height: ${sizeEscaped}; font-size: ${fontSize}px;">${category.icon ? `<i class="fa fa-fw ${escape(category.icon)}"></i>` : ''}</span>`;}function buildCategoryLabel(category, tag = 'a', className = '') {if (!category) {return '';}-- const href = tag === 'a' ? `href="${relative_path}/category/${category.slug}"` : '';- return `<${tag} component="topic/category" ${href} class="badge px-1 text-truncate text-decoration-none ${className}" style="color: ${category.color};background-color: ${category.bgColor};border-color: ${category.bgColor}!important; max-width: 70vw;">- ${category.icon && category.icon !== 'fa-nbb-none' ? `<i class="fa fa-fw ${category.icon}"></i>` : ''}- ${category.name}+ className = className ? escape(className) : '';+ const icon = category.icon ? escape(category.icon) : '';+ const bgColor = escape(category.bgColor);+ const color = escape(category.color);+ if (!['a', 'span'].includes(tag)) {+ tag = 'span';+ }+ const href = tag === 'a' ? `href="${relative_path}/category/${escape(category.slug)}"` : '';+ return `<${tag} component="topic/category" ${href} class="badge px-1 text-truncate text-decoration-none ${className}" style="color: ${color};background-color: ${bgColor};border-color: ${bgColor}!important; max-width: 70vw;">+ ${icon && icon !== 'fa-nbb-none' ? `<i class="fa fa-fw ${icon}"></i>` : ''}+ ${escape(_tx.call(this, String(category.name)))}</${tag}>`;}@@ -127,22 +178,22 @@ module.exports = function (utils, Benchpress, translator, relative_path) {const style = [];if (category.bgColor) {- style.push('background-color: ' + category.bgColor);- style.push(`border-color: ${category.bgColor}!important`);+ style.push(`background-color: ${category.bgColor}`);+ style.push(`border-color: ${category.bgColor} !important`);}if (category.color) {- style.push('color: ' + category.color);+ style.push(`color: ${category.color}`);}if (category.backgroundImage) {- style.push('background-image: url(' + category.backgroundImage + ')');+ style.push(`background-image: url(${category.backgroundImage})`);if (category.imageClass) {- style.push('background-size: ' + category.imageClass);+ style.push(`background-size: ${category.imageClass}`);}}- return style.join('; ') + ';';+ return escape(style.join('; ') + ';');}function generateChildrenCategories(category) {@@ -153,15 +204,14 @@ module.exports = function (utils, Benchpress, translator, relative_path) {category.children.forEach(function (child) {if (child && !child.isSection) {const link = child.link ? child.link : (relative_path + '/category/' + child.slug);- html += '<span class="category-children-item float-start">' +- '<div role="presentation" class="icon float-start" style="' + generateCategoryBackground(child) + '">' +- '<i class="fa fa-fw ' + child.icon + '"></i>' ++ html += '<span class="category-children-item">' ++ `<div role="presentation" class="icon" style="${generateCategoryBackground(child)}">` ++ `<i class="fa fa-fw ${escape(child.icon)}"></i>` +'</div>' +- '<a href="' + link + '"><small>' + child.name + '</small></a></span>';+ `<a href="${escape(link)}"><small>${escape(child.name)}</small></a></span>`;}});- html = html ? ('<span class="category-children">' + html + '</span>') : html;- return html;+ return html ? (`<span class="category-children">${html}</span>`) : html;}function generateTopicClass(topic) {@@ -170,21 +220,24 @@ module.exports = function (utils, Benchpress, translator, relative_path) {}function generateGroupDisplayName(group) {- return group.system ? group.displayName.replace(/-/g, ' ') : helpers.txEscape(group.displayName);+ return group.system ? group.displayName.replace(/-/g, ' ') : group.displayName;}// Groups helpersfunction membershipBtn(groupObj, btnClass = '') {+ btnClass = btnClass ? escape(btnClass) : '';+ const displayName = groupObj.displayName ? escape(groupObj.displayName) : '';+if (groupObj.isMember && groupObj.name !== 'administrators') {- return `<button class="btn btn-danger text-nowrap ${btnClass}" data-action="leave" data-group="${groupObj.displayName}" ${(groupObj.disableLeave ? ' disabled' : '')}><i class="fa fa-times"></i> [[groups:membership.leave-group]]</button>`;+ return `<button class="btn btn-danger text-nowrap ${btnClass}" data-action="leave" data-group="${displayName}" ${(groupObj.disableLeave ? ' disabled' : '')}><i class="fa fa-times"></i> [[groups:membership.leave-group]]</button>`;}if (groupObj.isPending && groupObj.name !== 'administrators') {return `<button class="btn btn-warning text-nowrap disabled ${btnClass}"><i class="fa fa-clock-o"></i> [[groups:membership.invitation-pending]]</button>`;} else if (groupObj.isInvited) {- return `<button class="btn btn-warning text-nowrap" data-action="rejectInvite" data-group="${groupObj.displayName}">[[groups:membership.reject]]</button><button class="btn btn-success" data-action="acceptInvite" data-group="${groupObj.name}"><i class="fa fa-plus"></i> [[groups:membership.accept-invitation]]</button>`;+ return `<button class="btn btn-warning text-nowrap" data-action="rejectInvite" data-group="${displayName}">[[groups:membership.reject]]</button><button class="btn btn-success" data-action="acceptInvite" data-group="${escape(groupObj.name)}"><i class="fa fa-plus"></i> [[groups:membership.accept-invitation]]</button>`;} else if (!groupObj.disableJoinRequests && groupObj.name !== 'administrators') {- return `<button class="btn btn-success text-nowrap ${btnClass}" data-action="join" data-group="${groupObj.displayName}"><i class="fa fa-plus"></i> [[groups:membership.join-group]]</button>`;+ return `<button class="btn btn-success text-nowrap ${btnClass}" data-action="join" data-group="${displayName}"><i class="fa fa-plus"></i> [[groups:membership.join-group]]</button>`;}return '';}@@ -213,7 +266,7 @@ module.exports = function (utils, Benchpress, translator, relative_path) {(member === 'Global Moderators' && globalModDisabled.includes(priv.name));return `- <td data-privilege="${priv.name}" data-value="${priv.state}" data-type="${priv.type}">+ <td data-privilege="${escape(priv.name)}" data-value="${escape(priv.state)}" data-type="${escape(priv.type)}"><div class="form-check text-center"><input class="form-check-input float-none${(disabled ? ' d-none"' : '')}" autocomplete="off" type="checkbox"${(priv.state ? ' checked' : '')}${(disabled ? ' disabled="disabled" aria-diabled="true"' : '')} /></div>@@ -228,16 +281,15 @@ module.exports = function (utils, Benchpress, translator, relative_path) {}function renderDigestAvatar(block) {- if (block.teaser) {- if (block.teaser.user.picture) {- return '<img style="vertical-align: middle; width: 32px; height: 32px; border-radius: 50%;" src="' + block.teaser.user.picture + '" title="' + block.teaser.user.username + '" />';- }- return '<div style="vertical-align: middle; width: 32px; height: 32px; line-height: 32px; font-size: 16px; background-color: ' + block.teaser.user['icon:bgColor'] + '; color: white; text-align: center; display: inline-block; border-radius: 50%;">' + block.teaser.user['icon:text'] + '</div>';- }- if (block.user.picture) {- return '<img style="vertical-align: middle; width: 32px; height: 32px; border-radius: 50%;" src="' + block.user.picture + '" title="' + block.user.username + '" />';+ const user = block.teaser && block.teaser.user ? block.teaser.user : block.user;+ if (!user) return '';+ const imgStyle = `vertical-align: middle; width: 32px; height: 32px; border-radius: 50%;`;+ const iconStyle = `vertical-align: middle; width: 32px; height: 32px; line-height: 32px; font-size: 16px; color: white; text-align: center; display: inline-block; border-radius: 50%; background-color: ${escape(user['icon:bgColor'])};`;++ if (user.picture) {+ return `<img style="${imgStyle}" src="${escape(user.picture)}" title="${escape(user.username)}" />`;}- return '<div style="vertical-align: middle; width: 32px; height: 32px; line-height: 32px; font-size: 16px; background-color: ' + block.user['icon:bgColor'] + '; color: white; text-align: center; display: inline-block; border-radius: 50%;">' + block.user['icon:text'] + '</div>';+ return `<div style="${iconStyle}">${escape(user['icon:text'])}</div>`;}function userAgentIcons(data) {@@ -309,7 +361,8 @@ module.exports = function (utils, Benchpress, translator, relative_path) {if (!userObj) {userObj = this;}- classNames = classNames || '';+ classNames = escape(classNames || '');+ component = escape(component || '');const displayname = escape(String(userObj.displayname || ''));const picture = escape(String(userObj.picture || ''));const iconBgColor = escape(String(userObj['icon:bgColor'] || ''));@@ -319,7 +372,7 @@ module.exports = function (utils, Benchpress, translator, relative_path) {['data-uid', userObj.uid],['class', `avatar ${classNames}${rounded ? ' avatar-rounded' : ''}`],]);- const styles = [`--avatar-size: ${size};`];+ const style = escape(`--avatar-size: ${size};`);const attr2String = attributes => Array.from(attributes).reduce((output, [prop, value]) => {output += ` ${prop}="${value}"`;return output;@@ -328,9 +381,9 @@ module.exports = function (utils, Benchpress, translator, relative_path) {let output = '';if (userObj.picture) {- output += `<img${attr2String(attributes)} alt="${displayname}" loading="lazy" component="${component || 'avatar/picture'}" src="${picture}" style="${styles.join(' ')}" onError="this.remove()" itemprop="image" />`;+ output += `<img${attr2String(attributes)} alt="${displayname}" loading="lazy" component="${component || 'avatar/picture'}" src="${picture}" style="${style}" onError="this.remove()" itemprop="image" />`;}- output += `<span${attr2String(attributes)} component="${component || 'avatar/icon'}" style="${styles.join(' ')} background-color: ${iconBgColor}">${iconText}</span>`;+ output += `<span${attr2String(attributes)} component="${component || 'avatar/icon'}" style="${style} background-color: ${iconBgColor}">${iconText}</span>`;return output;}@@ -346,11 +399,37 @@ module.exports = function (utils, Benchpress, translator, relative_path) {return parseInt(a, 10) > parseInt(b, 10);}+ function max(a, b) {+ return Math.max(parseInt(a, 10), parseInt(b, 10));+ }++ function min(a, b) {+ return Math.min(parseInt(a, 10), parseInt(b, 10));+ }++ function clamp(value, minValue, maxValue) {+ return Math.min(Math.max(parseInt(value, 10), parseInt(minValue, 10)), parseInt(maxValue, 10));+ }++ function quote(str) {+ return `"${str}"`;+ }++ const deletedMsgs = new Set([+ '[[topic:topic-is-deleted]]',+ '[[topic:post-is-deleted]]',+ '[[modules:chat.message-deleted]]',+ ]);+ function renderContent(content, deleted = 0) {+ const translateDeletedMsg = parseInt(deleted, 10) === 1 && deletedMsgs.has(content);+ return translateDeletedMsg ? _tx.call(this, content) : tx.escape(content);+ }+function generateWroteReplied(post, timeagoCutoff) {if (post.toPid) {- return generateRepliedTo(post, timeagoCutoff);+ return generateRepliedTo.call(this, post, timeagoCutoff);}- return generateWrote(post, timeagoCutoff);+ return generateWrote.call(this, post, timeagoCutoff);}function generateRepliedTo(post, timeagoCutoff) {@@ -358,13 +437,24 @@ module.exports = function (utils, Benchpress, translator, relative_path) {post.parent.displayname : '[[global:guest]]';const isBeforeCutoff = post.timestamp < (Date.now() - (timeagoCutoff * oneDayInMs));const langSuffix = isBeforeCutoff ? 'on' : 'ago';- return `[[topic:replied-to-user-${langSuffix}, ${post.toPid}, ${relative_path}/post/${encodeURIComponent(post.toPid)}, ${displayname}, ${relative_path}/post/${encodeURIComponent(post.pid)}, ${post.timestampISO}]]`;+ return _tx.call(this,+ `topic:replied-to-user-${langSuffix}`,+ escape(post.toPid),+ `${relative_path}/post/${encodeURIComponent(post.toPid)}`,+ escape(displayname),+ `${relative_path}/post/${encodeURIComponent(post.pid)}`,+ post.timestampISO,+ );}function generateWrote(post, timeagoCutoff) {const isBeforeCutoff = post.timestamp < (Date.now() - (timeagoCutoff * oneDayInMs));const langSuffix = isBeforeCutoff ? 'on' : 'ago';- return `[[topic:wrote-${langSuffix}, ${relative_path}/post/${encodeURIComponent(post.pid)}, ${post.timestampISO}]]`;+ return _tx.call(this,+ `topic:wrote-${langSuffix}`,+ `${relative_path}/post/${encodeURIComponent(post.pid)}`,+ post.timestampISO+ );}function _encodeURIComponent(value) {@@ -394,37 +484,6 @@ module.exports = function (utils, Benchpress, translator, relative_path) {return utils.isNumber(value);}- function tx(token, ...args) {- if (!token) {- return '';- }- const [txToken, argsFromToken] = translator.normalizeToken(token);- if (Array.isArray(argsFromToken) && argsFromToken.length > 0) {- args = argsFromToken;- }- const [namespace, key] = txToken.split(':', 2);- if (!namespace || !key || !this._i18n || !this._i18n[namespace] || !this._i18n[namespace][key]) {- return token;- }- // translate the arguments if they are tokens themselves- args = args.map((arg) => {- arg = translator.escapeHTML(arg);- if (typeof arg === 'string' && arg.startsWith('[[') && arg.endsWith(']]')) {- return helpers.tx.call(this, arg, []); // no arguments on nested tokens for now- }- return arg;- });-- const translation = this._i18n[namespace][key];- return translator.replaceArguments(translation, args);- }-- function txEscape(text) {- return String(text)- .replace(/\[\[/g, '[[').replace(/\]\]/g, ']]')- .replace(/,/g, ',').replace(/%/g, '%');- }-function uploadBasename(str, sep = '/') {const hasTimestampPrefix = /^\d+-/;const name = str.substr(str.lastIndexOf(sep) + 1);@@ -436,10 +495,11 @@ module.exports = function (utils, Benchpress, translator, relative_path) {if (i === 'divider') {return '<li class="dropdown-divider"></li>';}+ const size = parseInt(i, 10) || 1;return `<li class="dropdown-item placeholder-wave"><div class="placeholder" style="width: 20px;"></div>- <div class="placeholder col-${i}"></div>+ <div class="placeholder col-${size}"></div></li>`;});diff --git a/public/src/modules/iconSelect.js b/public/src/modules/iconSelect.jsindex 712d3e8e12..f16f5c85d9 100644--- a/public/src/modules/iconSelect.js+++ b/public/src/modules/iconSelect.js@@ -1,7 +1,7 @@'use strict';-define('iconSelect', ['benchpress', 'bootbox'], function (Benchpress, bootbox) {+define('iconSelect', ['benchpress', 'modals'], function (Benchpress, modals) {const fontawesome_license = config.fontawesome.pro ? 'pro' : 'free';const iconSelect = {};const initialIcons = [@@ -239,10 +239,8 @@ define('iconSelect', ['benchpress', 'bootbox'], function (Benchpress, bootbox) {}}- Benchpress.render('partials/fontawesome', { icons: initialIcons }).then(function (html) {- html = $(html);-- const picker = bootbox.dialog({+ Benchpress.render('partials/fontawesome', { icons: initialIcons }).then(async function (html) {+ const picker = await modals.dialog({onEscape: true,backdrop: true,show: false,diff --git a/public/src/modules/messages.js b/public/src/modules/messages.jsindex afb8b65939..99c8a92de2 100644--- a/public/src/modules/messages.js+++ b/public/src/modules/messages.js@@ -1,6 +1,8 @@'use strict';-define('messages', ['bootbox', 'translator', 'storage', 'alerts', 'hooks'], function (bootbox, translator, storage, alerts, hooks) {+define('messages', [+ 'modals', 'translator', 'storage', 'alerts', 'hooks',+], function (modals, translator, storage, alerts, hooks) {const messages = {};let registerMessage;@@ -48,11 +50,6 @@ define('messages', ['bootbox', 'translator', 'storage', 'alerts', 'hooks'], funcreturn;}- config.cookies.message = translator.unescape(config.cookies.message);- config.cookies.dismiss = translator.unescape(config.cookies.dismiss);- config.cookies.link = translator.unescape(config.cookies.link);- config.cookies.link_url = translator.unescape(config.cookies.link_url);-app.parseAndTranslate('partials/cookie-consent', config.cookies, function (html) {$(document.body).append(html);$(document.body).addClass('cookie-consent-open');@@ -75,7 +72,7 @@ define('messages', ['bootbox', 'translator', 'storage', 'alerts', 'hooks'], funcregisterMessage = params.get('register');if (registerMessage) {- bootbox.alert({+ modals.alert({message: utils.escapeHTML(decodeURIComponent(registerMessage)),});@@ -94,7 +91,7 @@ define('messages', ['bootbox', 'translator', 'storage', 'alerts', 'hooks'], func}messages.showInvalidSession = function () {- bootbox.alert({+ modals.alert({title: '[[error:invalid-session]]',message: '[[error:invalid-session-text]]',closeButton: false,@@ -105,7 +102,7 @@ define('messages', ['bootbox', 'translator', 'storage', 'alerts', 'hooks'], func};messages.showSessionMismatch = function () {- bootbox.alert({+ modals.alert({title: '[[error:session-mismatch]]',message: '[[error:session-mismatch-text]]',closeButton: false,diff --git a/public/src/modules/modals.js b/public/src/modules/modals.jsnew file mode 100644index 0000000000..a988e4d6e2--- /dev/null+++ b/public/src/modules/modals.js@@ -0,0 +1,73 @@+import * as bootbox from 'bootbox';+import * as tx from 'translator';++bootbox.setDefaults({+ locale: config.userLang,+});++tx.translateKeys([+ 'modules:bootbox.ok',+ 'modules:bootbox.cancel',+ 'modules:bootbox.confirm',+]).then((translations) => {+ bootbox.addLocale(config.userLang, {+ OK: translations[0],+ CANCEL: translations[1],+ CONFIRM: translations[2],+ });+ bootbox.setLocale(config.userLang);+});++export async function dialog(opts) {+ const [title, message, buttons] = await Promise.all([+ tx.translate(opts.title || ''),+ tx.translate(opts.message || ''),+ translateButtons(opts.buttons),+ ]);++ const modal = bootbox.dialog({+ ...opts,+ title,+ message,+ buttons,+ });+ return modal;+}++export async function alert(opts, callback) {+ const [title, message] = await Promise.all([+ opts && opts.title ? tx.translate(opts.title) : null,+ tx.translate(typeof opts === 'string' ? opts : opts.message),+ ]);+ callback = typeof callback === 'function' ? callback : opts.callback;++ return bootbox.alert({ ...opts, title, message, callback });+}++export async function confirm(opts, callback) {+ const [title, message] = await Promise.all([+ opts && opts.title ? tx.translate(opts.title) : null,+ tx.translate(typeof opts === 'string' ? opts : opts.message),+ ]);+ callback = typeof callback === 'function' ? callback : opts.callback;++ return bootbox.confirm({ ...opts, title, message, callback });+}++export async function prompt(opts, callback) {+ const [title, message] = await Promise.all([+ tx.translate(typeof opts === 'string' ? opts : opts.title),+ opts && opts.message ? tx.translate(opts.message) : null,+ ]);+ callback = typeof callback === 'function' ? callback : opts.callback;++ return bootbox.prompt({ ...opts, title, message, callback });+}++async function translateButtons(buttons) {+ if (!Object.keys(buttons || {}).length) return;+ const btnData = Object.values(buttons);+ return await Promise.all(btnData.map(async (btnData) => {+ return { ...btnData, label: await tx.translateKey(btnData.label) };+ }));+}diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.jsindex a10c26055b..389589a45d 100644--- a/public/src/modules/navigator.js+++ b/public/src/modules/navigator.js@@ -1,8 +1,8 @@'use strict';define('navigator', [- 'forum/pagination', 'components', 'hooks', 'alerts', 'translator', 'storage',-], function (pagination, components, hooks, alerts, translator, storage) {+ 'forum/pagination', 'components', 'hooks', 'alerts', 'storage',+], function (pagination, components, hooks, alerts, storage) {const navigator = {};let index = 0;let count = 0;@@ -379,7 +379,7 @@ define('navigator', [anchorEl.innerText = text;anchorEl.style.display = text ? 'inline' : 'none';if (text) {- translator.translate(text).then(translated => anchorEl.innerText = translated);+ $(anchorEl).translateText(text);}anchorEl.setAttribute('aria-disabled', text ? 'false' : 'true');if (text) {@@ -567,7 +567,7 @@ define('navigator', [if (config.usePagination) {paginationTextEl.html(`<i class="fa fa-file"></i> ${ajaxify.data.pagination.currentPage} / ${ajaxify.data.pagination.pageCount}`);} else {- paginationTextEl.translateHtml('[[global:pagination.out-of, ' + index + ', ' + count + ']]');+ paginationTextEl.translateText(`[[global:pagination.out-of, ${index}, ${count}]]`);}const fraction = (index - 1) / (count - 1 || 1);diff --git a/public/src/modules/quickreply.js b/public/src/modules/quickreply.jsindex 3a9573fb7b..e20dee4f5d 100644--- a/public/src/modules/quickreply.js+++ b/public/src/modules/quickreply.js@@ -142,7 +142,7 @@ define('quickreply', [storage.removeItem(qrDraftId);const textEl = components.get('topic/quickreply/text');hooks.fire('action:composer.post.new', {- title: ajaxify.data.tid ? ajaxify.data.titleRaw : '',+ title: ajaxify.data.tid ? ajaxify.data.title : '',body: textEl.val(),...opts.body,});diff --git a/public/src/modules/search.js b/public/src/modules/search.jsindex 0c8a6d4f72..754b1210a8 100644--- a/public/src/modules/search.js+++ b/public/src/modules/search.js@@ -101,12 +101,11 @@ define('search', [let oldValue = inputEl.val();const filterCategoryEl = quickSearchResults.find('.filter-category');- function updateCategoryFilterName() {+ async function updateCategoryFilterName() {if (ajaxify.data.template.category && ajaxify.data.cid) {- translator.translate('[[search:search-in-category, ' + ajaxify.data.name + ']]', function (translated) {- const name = $('<div></div>').html(translated).text();- filterCategoryEl.find('.name').text(name);- });+ const translated = await translator.translateKey('search:search-in-category', [ajaxify.data.name]);+ const name = $('<div></div>').html(translated).text();+ filterCategoryEl.find('.name').text(name);}filterCategoryEl.toggleClass('hidden', !(ajaxify.data.template.category && ajaxify.data.cid));}diff --git a/public/src/modules/settings/sorted-list.js b/public/src/modules/settings/sorted-list.jsindex 707a679c02..a84d94e43e 100644--- a/public/src/modules/settings/sorted-list.js+++ b/public/src/modules/settings/sorted-list.js@@ -2,10 +2,10 @@define('settings/sorted-list', ['benchpress',- 'bootbox',+ 'modals','hooks','jquery-ui/widgets/sortable',-], function (benchpress, bootbox, hooks) {+], function (benchpress, modals, hooks) {let Settings;@@ -38,8 +38,8 @@ define('settings/sorted-list', [const addBtn = $('[data-sorted-list="' + key + '"] [data-type="add"]');- addBtn.on('click', function () {- const modal = bootbox.confirm(formHtml, function (save) {+ addBtn.on('click', async function () {+ const modal = await modals.confirm(formHtml, function (save) {if (save) {SortedList.addItem(modal.find('form').children(), $container);}@@ -106,7 +106,7 @@ define('settings/sorted-list', [const key = $container.attr('data-sorted-list');const editBtn = $('[data-sorted-list-uuid="' + itemUUID + '"] [data-type="edit"]');- editBtn.on('click', function () {+ editBtn.on('click', async function () {const form = $('[data-sorted-list-uuid="' + itemUUID + '"][data-sorted-list-object="' + key + '"]');const clone = form.clone(true).show();@@ -115,7 +115,7 @@ define('settings/sorted-list', [el.value = form.find(`select#${el.id}`).val();});- const modal = bootbox.confirm(clone, async (save) => {+ const modal = await modals.confirm(clone, async (save) => {if (save) {const form = $('<form class="" data-sorted-list-uuid="' + itemUUID + '" data-sorted-list-object="' + key + '"></form>');form.append(modal.find('form').children());diff --git a/public/src/modules/topicThumbs.js b/public/src/modules/topicThumbs.jsindex 424fac316e..eac0237736 100644--- a/public/src/modules/topicThumbs.js+++ b/public/src/modules/topicThumbs.js@@ -1,8 +1,8 @@'use strict';define('topicThumbs', [- 'api', 'bootbox', 'alerts', 'uploader', 'benchpress', 'translator', 'jquery-ui/widgets/sortable',-], function (api, bootbox, alerts, uploader, Benchpress, translator) {+ 'api', 'modals', 'alerts', 'uploader', 'benchpress', 'translator', 'jquery-ui/widgets/sortable',+], function (api, modals, alerts, uploader, Benchpress, translator) {const Thumbs = {};Thumbs.get = id => api.get(`/topics/${id}/thumbs`, { thumbsOnly: 1 });@@ -41,21 +41,21 @@ define('topicThumbs', [const thumbs = postData.thumbs || [];return new Promise((resolve) => {- Benchpress.render('modals/topic-thumbs', { thumbs }).then((html) => {+ Benchpress.render('modals/topic-thumbs', { thumbs }).then(async (html) => {if (modal) {translator.translate(html, function (translated) {modal.find('.bootbox-body').html(translated);Thumbs.modal.handleSort({ modal, thumbs });});} else {- modal = bootbox.dialog({+ modal = await modals.dialog({title: '[[modules:thumbs.modal.title]]',message: html,onEscape: true,backdrop: true,buttons: {add: {- label: '<i class="fa fa-plus"></i> [[modules:thumbs.modal.add]]',+ label: '[[modules:thumbs.modal.add]]',className: 'btn-success',callback: () => {Thumbs.upload().then((thumbUrl) => {@@ -93,7 +93,7 @@ define('topicThumbs', [const { id: uuid } = payload;modalEl.addEventListener('click', (ev) => {if (ev.target.closest('button[data-action="remove"]')) {- bootbox.confirm('[[modules:thumbs.modal.confirm-remove]]', (ok) => {+ modals.confirm('[[modules:thumbs.modal.confirm-remove]]', (ok) => {if (!ok) {return;}diff --git a/public/src/modules/translator.common.js b/public/src/modules/translator.common.jsindex eb42b98d4d..1a37580935 100644--- a/public/src/modules/translator.common.js+++ b/public/src/modules/translator.common.js@@ -11,6 +11,45 @@ module.exports = function (utils, load, warn) {));}+ function fixDoubleEscaped(str) {+ // fix double escaped translation keys, see https://github.com/NodeBB/NodeBB/issues/9206+ return str.replace(/&lsqb;/g, '[')+ .replace(/&rsqb;/g, ']');+ }++ // takes token '[[topic:moved-from, arg1, arg2]]' and+ // normalizes it to ['topic:moved-from', ['arg1', 'arg2']]+ function normalizeToken(token, ignoreArgs = false) {+ if (typeof token !== 'string' || token === '') {+ return [String(token), []];+ }+ if (token.startsWith('[[') && token.endsWith(']]')) {+ token = token.slice(2, -2);+ }+ if (ignoreArgs) {+ return [token.trim(), []];+ }+ const parts = split(token); // use same split as translator.translate+ if (parts.length === 0) {+ return [token.trim(), []];+ }+ const txToken = parts[0].trim();+ const args = parts.slice(1).map(part => part.trim());+ return [txToken, args];+ }++ // replaces %1, %2 in translation with args[0], args[1] respectively+ function replaceArguments(translation, args) {+ if (!Array.isArray(args) || args.length === 0) {+ return translation;+ }+ args.forEach((arg, index) => {+ const argEscaped = arg.replace(/%(?=\d)/g, '%').replace(/\\,/g, ',');+ translation = translation.replaceAll(`%${index + 1}`, argEscaped);+ });+ return validateHrefAttributes(translation);+ }+function validateHrefAttributes(translated) {return translated.replace(/href\s*=\s*(["'])(.*?)\1/gi, (match, quote, href) => {return isSafeHref(href) ? match : 'href=""';@@ -24,6 +63,125 @@ module.exports = function (utils, load, warn) {return isHttpUrl || isRelativeUrl;}+ // split a translator string into an array of tokens+ // but don't split by commas inside other translator strings+ // "namespace:key, arg1, [[namespace:key, arg2]]" becomes+ // ["namespace:key", "arg1", "[[namespace:key, arg2]]"]+ function split(text) {+ // skip strings that don't have commas, this makes [[namespace:key]] tokens faster+ if (text.indexOf(',') === - 1) {+ return [];+ }+ const lenLessOne = text.length - 1;+ const arr = [];+ let i = 0;+ let brk = 0;+ let level = 0;+ while (i < lenLessOne) {+ const cur = text[i];+ const next = text[i + 1];+ if (cur === '[' && next === '[') {+ level += 1;+ i += 1;+ } else if (cur === ']' && next === ']') {+ level -= 1;+ i += 1;+ } else if (level === 0 && cur === ',' && text[i - 1] !== '\\') {+ arr.push(text.slice(brk, i).trim());+ i += 1;+ brk = i;+ }+ i += 1;+ }+ arr.push(text.slice(brk, i + 1).trim());+ return arr;+ }++ /*+ turns+ `]] some text here [[namespace1:key1, arg1, arg2]] other text [[invalid]] test [[namespace2:key2]] [[invalid`;+ into+ [+ { text: ']] some text here ', tx: false },+ { text: '[[namespace1:key1, arg1, arg2]]', tx: true },+ { text: ' other text [[invalid]] test ', tx: false },+ { text: '[[namespace2:key2]]', tx: true },+ { text: ' [[invalid', tx: false }+ ]+ */+ const TOKEN_VALIDATOR = /^\[\[[^[\]\s,]+:[^[\]\s,]+/;+ function parseTranslationString(str) {+ const results = [];+ let cursor = 0;+ let lastCut = 0;+ const len = str.length;++ while (cursor < len) {+ // jump directly to the next opening bracket+ const nextOpen = str.indexOf('[[', cursor);+ if (nextOpen === -1) break; // No more tokens, exit loop++ let depth = 1;+ let i = nextOpen + 2;+ let foundClose = false;++ while (i < len) {+ // jump from bracket to bracket instead of char to char+ const closeIdx = str.indexOf(']]', i);+ if (closeIdx === -1) {+ break; // Missing a closing bracket entirely+ }+ const openIdx = str.indexOf('[[', i);++ // If we found another '[[', and it's BEFORE the next ']]', we are nesting+ if (openIdx !== -1 && openIdx < closeIdx) {+ depth++;+ i = openIdx + 2;+ } else {+ // Otherwise, we are closing a bracket+ depth--;+ i = closeIdx + 2;++ // If depth hits 0, we found the end of the outer token!+ if (depth === 0) {+ foundClose = true;+ break;+ }+ }+ }++ if (foundClose) {+ const token = str.slice(nextOpen, i);+ // Validate the token format+ if (TOKEN_VALIDATOR.test(token)) {+ // Push leading normal text if it exists+ if (nextOpen > lastCut) {+ results.push({ text: str.slice(lastCut, nextOpen), tx: false });+ }+ // Push the valid token+ results.push({ text: token, tx: true });+ // Advance our cuts and cursors past this token+ lastCut = i;+ cursor = i;+ continue;+ }+ }++ // --- BACKTRACKING ---+ // If we get here, the token was unclosed OR invalid.+ // We simply move the cursor past the broken '[[' and let the outer loop try again.+ // The broken brackets will eventually just get sliced as normal text.+ cursor = nextOpen + 2;+ }++ // Catch any remaining text at the end of the string+ if (lastCut < len) {+ results.push({ text: str.slice(lastCut), tx: false });+ }++ return results;+ }+const Translator = (function () {/*** Construct a new Translator object@@ -60,174 +218,15 @@ module.exports = function (utils, load, warn) {* @returns {Promise<string>}*/Translator.prototype.translate = function translate(str) {- // regex for valid text in namespace / key- const validText = 'a-zA-Z0-9\\-_.\\/';- const validTextRegex = new RegExp('[' + validText + ']');- const invalidTextRegex = new RegExp('[^' + validText + '\\]]');-- // current cursor position- let cursor = 0;- // last break of the input string- let lastBreak = 0;- // length of the input string- const len = str.length;- // array to hold the promises for the translations- // and the strings of untranslated text in between- const toTranslate = [];-- // to store the state of if we're currently in a top-level token for later- let inToken = false;-- // split a translator string into an array of tokens- // but don't split by commas inside other translator strings- function split(text) {- const len = text.length;- const arr = [];- let i = 0;- let brk = 0;- let level = 0;-- while (i + 2 <= len) {- if (text[i] === '[' && text[i + 1] === '[') {- level += 1;- i += 1;- } else if (text[i] === ']' && text[i + 1] === ']') {- level -= 1;- i += 1;- } else if (level === 0 && text[i] === ',' && text[i - 1] !== '\\') {- arr.push(text.slice(brk, i).trim());- i += 1;- brk = i;- }- i += 1;+ const tokens = parseTranslationString(str);+ return Promise.all(tokens.map(async (token) => {+ if (token.tx) {+ const [txToken, args] = normalizeToken(token.text);+ return await this.translateKey(txToken, args, token.text);}- arr.push(text.slice(brk, i + 1).trim());- return arr;- }-- // move to the first [[- cursor = str.indexOf('[[', cursor);-- // the loooop, we'll go to where the cursor- // is equal to the length of the string since- // slice doesn't include the ending index- while (cursor + 2 <= len && cursor !== -1) {- // split the string from the last break- // to the character before the cursor- // add that to the result array- toTranslate.push(str.slice(lastBreak, cursor));- // set the cursor position past the beginning- // brackets of the translation string- cursor += 2;- // set the last break to our current- // spot since we just broke the string- lastBreak = cursor;- // we're in a token now- inToken = true;-- // the current level of nesting of the translation strings- let level = 0;- let char0;- let char1;- // validating the current string is actually a translation- let textBeforeColonFound = false;- let colonFound = false;- let textAfterColonFound = false;- let commaAfterNameFound = false;-- while (cursor + 2 <= len) {- char0 = str[cursor];- char1 = str[cursor + 1];- // found some text after the double bracket,- // so this is probably a translation string- if (!textBeforeColonFound && validTextRegex.test(char0)) {- textBeforeColonFound = true;- cursor += 1;- // found a colon, so this is probably a translation string- } else if (textBeforeColonFound && !colonFound && char0 === ':') {- colonFound = true;- cursor += 1;- // found some text after the colon,- // so this is probably a translation string- } else if (colonFound && !textAfterColonFound && validTextRegex.test(char0)) {- textAfterColonFound = true;- cursor += 1;- } else if (textAfterColonFound && !commaAfterNameFound && char0 === ',') {- commaAfterNameFound = true;- cursor += 1;- // a space or comma was found before the name- // this isn't a translation string, so back out- } else if (!(textBeforeColonFound && colonFound && textAfterColonFound && commaAfterNameFound) &&- invalidTextRegex.test(char0)) {- cursor += 1;- lastBreak -= 2;- // no longer in a token- inToken = false;- if (level > 0) {- level -= 1;- } else {- break;- }- // if we're at the beginning of another translation string,- // we're nested, so add to our level- } else if (char0 === '[' && char1 === '[') {- level += 1;- cursor += 2;- // if we're at the end of a translation string- } else if (char0 === ']' && char1 === ']') {- // if we're at the base level, then this is the end- if (level === 0) {- // so grab the name and args- const currentSlice = str.slice(lastBreak, cursor);- const result = split(currentSlice);- const name = result[0];- const args = result.slice(1);-- // make a backup based on the raw string of the token- // if there are arguments to the token- let backup = '';- if (args && args.length) {- backup = this.translate(currentSlice);- }- // add the translation promise to the array- toTranslate.push(this.translateKey(name, args, backup));- // skip past the ending brackets- cursor += 2;- // set this as our last break- lastBreak = cursor;- // and we're no longer in a translation string,- // so continue with the main loop- inToken = false;- break;- }- // otherwise we lower the level- level -= 1;- // and skip past the ending brackets- cursor += 2;- } else {- // otherwise just move to the next character- cursor += 1;- }- }-- // skip to the next [[- cursor = str.indexOf('[[', cursor);- }-- // ending string of source- let last = str.slice(lastBreak);-- // if we were mid-token, treat it as invalid- if (inToken) {- last = this.translate(last);- }-- // add the remaining text after the last translation string- toTranslate.push(last);-- // and return a promise for the concatenated translated string- return Promise.all(toTranslate).then(function (translated) {- return translated.join('');+ return token.text;+ })).then(translations => translations.join('')).catch(err => {+ warn('Translation failed: ' + err.stack);});};@@ -249,13 +248,8 @@ module.exports = function (utils, load, warn) {return Promise.resolve(self.modules[namespace](key, args));}- if (namespace && result.length === 1) {- return Promise.resolve('[[' + namespace + ']]');- }-- if (namespace && !key) {- warn('Missing key in translation token "' + name + '" for language "' + self.lang + '"');- return Promise.resolve('[[' + namespace + ']]');+ if (!namespace || (result.length === 1 || !key)) {+ return Promise.resolve(escapeHTML(backup || name));}const translation = this.getTranslation(namespace, key);@@ -263,29 +257,31 @@ module.exports = function (utils, load, warn) {// check if the translation is missing firstif (!translated) {warn('Missing translation "' + name + '" for language "' + self.lang + '"');- return backup || key;+ return escapeHTML(backup || name);}- const argsToTranslate = args.map(function (arg) {- return self.translate(escapeHTML(arg));- });-- return Promise.all(argsToTranslate).then(function (translatedArgs) {- let out = translated;- translatedArgs.forEach(function (arg, i) {- let escaped = arg.replace(/%(?=\d)/g, '%').replace(/\\,/g, ',');- // fix double escaped translation keys, see https://github.com/NodeBB/NodeBB/issues/9206- escaped = escaped.replace(/&lsqb;/g, '[')- .replace(/&rsqb;/g, ']')- .replace(/&#44;/g, ',');- out = out.replace(new RegExp('%' + (i + 1), 'g'), escaped);- });- out = validateHrefAttributes(out);- return out;+ return self.txArgs(args).then(function (translatedArgs) {+ return replaceArguments(translated, translatedArgs);});});};+ // translate arguments+ Translator.prototype.txArgs = async function (args) {+ if (!Array.isArray(args) || args.length === 0) {+ return args;+ }++ return await Promise.all(args.map(async (arg) => {+ const escapedArg = fixDoubleEscaped(escapeHTML(arg));+ if (escapedArg.startsWith('[[') && escapedArg.endsWith(']]')) {+ const [txToken, args] = normalizeToken(escapedArg);+ return await this.translateKey(txToken, args);+ }+ return escapedArg;+ }));+ },+/*** Load translation file (or use a cached version), and optionally return the translation of a certain key* @param {string} namespace - The file name of the translation namespace@@ -332,70 +328,6 @@ module.exports = function (utils, load, warn) {return translation;};- /**- * @param {Node} node- * @returns {Node[]}- */- function descendantTextNodes(node) {- const textNodes = [];-- function helper(node) {- if (node.nodeType === 3) {- textNodes.push(node);- } else {- for (let i = 0, c = node.childNodes, l = c.length; i < l; i += 1) {- helper(c[i]);- }- }- }-- helper(node);- return textNodes;- }-- /**- * Recursively translate a DOM element in place- * @param {Element} element - Root element to translate- * @param {string[]} [attributes] - Array of node attributes to translate- * @returns {Promise<void>}- */- Translator.prototype.translateInPlace = function translateInPlace(element, attributes) {- attributes = attributes || ['placeholder', 'title'];-- const nodes = descendantTextNodes(element);- const text = nodes.map(function (node) {- return utils.escapeHTML(node.nodeValue);- }).join(' || ');-- const attrNodes = attributes.reduce(function (prev, attr) {- const tuples = Array.prototype.map.call(element.querySelectorAll('[' + attr + '*="[["]'), function (el) {- return [attr, el];- });- return prev.concat(tuples);- }, []);- const attrText = attrNodes.map(function (node) {- return node[1].getAttribute(node[0]);- }).join(' || ');-- return Promise.all([- this.translate(text),- this.translate(attrText),- ]).then(function (ref) {- const translated = ref[0];- const translatedAttrs = ref[1];- if (translated) {- translated.split(' || ').forEach(function (html, i) {- $(nodes[i]).replaceWith(html);- });- }- if (translatedAttrs) {- translatedAttrs.split(' || ').forEach(function (text, i) {- attrNodes[i][1].setAttribute(attrNodes[i][0], text);- });- }- });- };-/*** Get the language of the current environment, falling back to defaults* @returns {string}@@ -484,13 +416,13 @@ module.exports = function (utils, load, warn) {/*if (typeof text !== 'string') return text;- let previous;- // Keep matching the innermost unescaped brackets and converting them- while (text !== previous) {- previous = text;- text = text.replace(/\[\[([a-zA-Z0-9_.-]+:[^\[\]]+)\]\]/g, '[[$1]]');- }- return text;+ let previous;+ // Keep matching the innermost unescaped brackets and converting them+ while (text !== previous) {+ previous = text;+ text = text.replace(/\[\[([a-zA-Z0-9_.-]+:[^\[\]]+)\]\]/g, '[[$1]]');+ }+ return text;*/};@@ -522,12 +454,11 @@ module.exports = function (utils, load, warn) {* @param {...string} arg - Optional argument for the pattern*/Translator.compile = function compile(...args) {- const compiled = args.map(function (text) {- // escape commas and percent signs in arguments- return String(text).replace(/%/g, '%').replace(/,/g, ',');- });+ return `[[${args.map(Translator.escapeArg).join(', ')}]]`;+ };- return `[[${compiled.join(', ')}]]`;+ Translator.escapeArg = function (arg) {+ return String(arg).replace(/%/g, '%').replace(/,/g, ',');};return Translator;@@ -545,7 +476,16 @@ module.exports = function (utils, load, warn) {compile: Translator.compile,escape: Translator.escape,unescape: Translator.unescape,+ escapeArg: Translator.escapeArg,+ escapeHTML: escapeHTML,+ fixDoubleEscaped: fixDoubleEscaped,+ normalizeToken: normalizeToken,+ replaceArguments: replaceArguments,getLanguage: Translator.getLanguage,+ rtlLanguages: ['ar', 'fa-IR', 'he', 'ur'],+ languageDirection: function (lang) {+ return this.rtlLanguages.includes(lang) ? 'rtl' : 'ltr';+ },flush: function () {Object.keys(Translator.cache).forEach(function (code) {@@ -564,13 +504,10 @@ module.exports = function (utils, load, warn) {});},-/**- * Legacy translator function for backwards compatibility+ * translator function for backwards compatibility*/translate: function translate(text, language, callback) {- // TODO: deprecate?-let cb = callback;let lang = language;if (typeof language === 'function') {@@ -595,21 +532,6 @@ module.exports = function (utils, load, warn) {});},- // takes a old style token '[[topic:moved-from, arg1, arg2]]' and- // normalizes it to ['topic:moved-from', ['arg1', 'arg2']]- normalizeToken: function (token) {- if (typeof token !== 'string' || token === '') {- return [String(token), []];- }- if (token.startsWith('[[') && token.endsWith(']]')) {- token = token.slice(2, -2);- }- const parts = token.trim().split(',');- const txToken = parts[0].trim();- const args = parts.slice(1).map(part => part.trim());- return [txToken, args];- },-translateKeys: async function (data, language, callback) {if (!Array.isArray(data)) {throw new Error('[[error:invalid-data]]');@@ -627,26 +549,14 @@ module.exports = function (utils, load, warn) {const translations = await Promise.all(data.map(async (item) => {const [token, itemArgs, language] = item;- const [txToken, argsFromToken] = adaptor.normalizeToken(token);+ const hasPassedArgs = Array.isArray(itemArgs) && itemArgs.length > 0;+ const [txToken, argsFromToken] = adaptor.normalizeToken(token, hasPassedArgs);let args = itemArgs;- if (Array.isArray(argsFromToken) && argsFromToken.length > 0) {+ if (!hasPassedArgs && Array.isArray(argsFromToken) && argsFromToken.length > 0) {args = argsFromToken;}- const [namespace, key] = txToken.split(':', 2);- if (!key) {- return token;- }const tokenLanguage = language || lang;- let txArgs = Array.isArray(args) ? args.map(arg => escapeHTML(arg)) : [];- txArgs = await adaptor.txArgs(args, tokenLanguage);-- return Translator.create(tokenLanguage).getTranslation(namespace, key).then(function (translation) {- if (!translation) {- // if translation is missing/or not a translation, return the token as is- return token;- }- return adaptor.replaceArguments(translation, txArgs);- });+ return Translator.create(tokenLanguage).translateKey(txToken, args, token);}));if (typeof cb === 'function') {return setTimeout(cb, 0, translations);@@ -659,33 +569,6 @@ module.exports = function (utils, load, warn) {return translation;},- escapeHTML: escapeHTML,-- txArgs: async function (args, language) {- if (!Array.isArray(args) || args.length === 0) {- return args;- }-- return await Promise.all(args.map(async (arg) => {- if (typeof arg === 'string' && arg.startsWith('[[') && arg.endsWith(']]')) {- return await adaptor.translateKey(arg, [], language);- }- return arg;- }));- },-- replaceArguments: (translation, args) => {- if (!Array.isArray(args) || args.length === 0) {- return translation;- }- args.forEach((arg, index) => {- const argEscaped = arg.replace(/%(?=\d)/g, '%').replace(/\\,/g, ',');- const placeholder = `%${index + 1}`;- translation = translation.split(placeholder).join(argEscaped);- });- return validateHrefAttributes(translation);- },-/*** Add translations to the cache*/diff --git a/public/src/modules/userFilter.js b/public/src/modules/userFilter.jsindex 9153474d73..1b15fd8cfd 100644--- a/public/src/modules/userFilter.js+++ b/public/src/modules/userFilter.js@@ -57,7 +57,7 @@ define('userFilter', ['api', 'hooks', 'slugify', 'benchpress'], function (api, h}}if (!result.users.length) {- el.find('[component="user/filter/results"]').translateHtml(+ el.find('[component="user/filter/results"]').translateText('[[users:no-users-found]]');return;diff --git a/public/src/sockets.js b/public/src/sockets.jsindex e34be4f263..88f403ff47 100644--- a/public/src/sockets.js+++ b/public/src/sockets.js@@ -5,8 +5,7 @@ const $ = require('jquery');const { alert } = require('alerts');const hooks = require('hooks');--app = window.app || {};+const helpers = require('helpers');(function () {let reconnecting = false;@@ -48,7 +47,7 @@ app = window.app || {};socket.connect();}- window.app.reconnect = (showAlert = false) => {+ app.reconnect = (showAlert = false) => {if (socket.connected || parseInt(app.user.uid, 10) < 0) {return;}@@ -58,7 +57,7 @@ app = window.app || {};.removeClass('alert-danger alert-success pointer hide').addClass('alert-warning show').find('p')- .translateText(`[[global:reconnecting-message, ${config.siteTitle}]]`);+ .translateHtml(`[[global:reconnecting-message, ${config.siteTitle}]]`);}$('#reconnect').html('<i class="fa fa-spinner fa-spin"></i>');@@ -151,7 +150,7 @@ app = window.app || {};.removeClass('alert-warning alert-danger').addClass('alert-success').find('p')- .translateText(`[[global:reconnected-message, ${config.siteTitle}]]`);+ .translateHtml(`[[global:reconnected-message, ${config.siteTitle}]]`);setTimeout(() => {reconnectEl.removeClass('active').addClass('hide');@@ -221,26 +220,25 @@ app = window.app || {};}function onEventBanned(data) {- require(['bootbox', 'translator'], function (bootbox, translator) {+ require(['modals', 'translator'], function (modals, translator) {const message = data.until ?- translator.compile('error:user-banned-reason-until', (new Date(data.until).toLocaleString()), data.reason) :- '[[error:user-banned-reason, ' + data.reason + ']]';- translator.translate(message, function (message) {- bootbox.alert({- title: '[[error:user-banned]]',- message: message,- closeButton: false,- callback: function () {- window.location.href = config.relative_path + '/';- },- });+ translator.compile('error:user-banned-reason-until', new Date(data.until).toLocaleString(), helpers.escape(data.reason)) :+ translator.compile('error:user-banned-reason', helpers.escape(data.reason));++ modals.alert({+ title: '[[error:user-banned]]',+ message: message,+ closeButton: false,+ callback: function () {+ window.location.href = config.relative_path + '/';+ },});});}function onEventUnbanned() {- require(['bootbox'], function (bootbox) {- bootbox.alert({+ require(['modals'], function (modals) {+ modals.alert({title: '[[global:alert.unbanned]]',message: '[[global:alert.unbanned.message]]',closeButton: false,diff --git a/public/src/utils.common.js b/public/src/utils.common.jsindex 0b462d3174..c62625dc09 100644--- a/public/src/utils.common.js+++ b/public/src/utils.common.js@@ -526,7 +526,7 @@ const utils = {},escapeHTML: function (str) {- if (str == null) {+ if (str == null || str === '') {return '';}if (!str) {diff --git a/public/src/utils.js b/public/src/utils.jsindex 9135b30353..cd5b7689d0 100644--- a/public/src/utils.js+++ b/public/src/utils.js@@ -18,7 +18,7 @@ utils.makeNumbersHumanReadable = function (elements) {elements.each(function () {const $this = $(this);const toFixed = $this.attr('data-toFixed') || 1;- $this.html(utils.makeNumberHumanReadable($this.attr('title'), toFixed))+ $this.text(utils.makeNumberHumanReadable($this.attr('title'), toFixed)).removeClass('hidden');});};@@ -27,7 +27,7 @@ utils.addCommasToNumbers = function (elements) {elements.each(function (index, element) {const $element = $(element);$element- .html(utils.addCommas($element.html()))+ .text(utils.addCommas($element.text())).removeClass('hidden');});};diff --git a/public/vendor/bootbox/wrapper.js b/public/vendor/bootbox/wrapper.jsdeleted file mode 100644index 54e703fa31..0000000000--- a/public/vendor/bootbox/wrapper.js+++ /dev/null@@ -1,62 +0,0 @@-/* global bootbox */--require(['translator', 'bootbox'], function (shim, bootbox) {- 'use strict';-- // expose as global with a warning- if (Object.defineProperty) {- Object.defineProperty(window, 'bootbox', {- configurable: true,- enumerable: true,- get: function () {- console.warn('[deprecated] Accessing bootbox globally is deprecated. Use `require(["bootbox"], function (bootbox) { ... })` instead');- return bootbox;- },- });- } else {- window.bootbox = bootbox;- }-- bootbox.setDefaults({- locale: config.userLang,- });-- var translator = shim.Translator.create();- var dialog = bootbox.dialog;- var attrsToTranslate = ['placeholder', 'title', 'value', 'label'];- bootbox.dialog = function (options) {- var show = options.show !== false;- options.show = false;-- var $elem = dialog.call(bootbox, options);- var element = $elem[0];-- if (/\[\[.+\]\]/.test(element.outerHTML)) {- translator.translateInPlace(element, attrsToTranslate).then(function () {- if (show) {- $elem.modal('show');- }- });- } else if (show) {- $elem.modal('show');- }-- return $elem;- };-- Promise.all([- translator.translateKey('modules:bootbox.ok', []),- translator.translateKey('modules:bootbox.cancel', []),- translator.translateKey('modules:bootbox.confirm', []),- ]).then(function (translations) {- var lang = shim.getLanguage();- bootbox.addLocale(lang, {- OK: translations[0],- CANCEL: translations[1],- CONFIRM: translations[2],- });-- bootbox.setLocale(lang);- });-});-diff --git a/src/activitypub/mocks.js b/src/activitypub/mocks.jsindex 68c4bbd0d2..e6ec585a6f 100644--- a/src/activitypub/mocks.js+++ b/src/activitypub/mocks.js@@ -3,7 +3,6 @@const nconf = require('nconf');const mime = require('mime').default;const path = require('path');-const validator = require('validator');const sanitize = require('sanitize-html');const tokenizer = require('sbd');@@ -407,9 +406,7 @@ Mocks.actors.user = async (uid) => {let aboutmeParsed = '';if (aboutme) {- aboutme = validator.escape(String(aboutme || ''));aboutmeParsed = await plugins.hooks.fire('filter:parse.aboutme', aboutme);- aboutmeParsed = translator.escape(aboutmeParsed);}if (picture) {@@ -448,7 +445,7 @@ Mocks.actors.user = async (uid) => {attachment.push({type: 'Link',name,- href: validator.unescape(value),+ href: value,});} else {attachment.push({@@ -462,7 +459,7 @@ Mocks.actors.user = async (uid) => {attachment.push({type: 'PropertyValue',name,- value: validator.unescape(value),+ value,});}});@@ -595,7 +592,7 @@ Mocks.notes.public = async (post) => {let tag = null;let followersUrl;- let { titleRaw: name, generatedTitle } = await topics.getTopicFields(post.tid, ['title', 'generatedTitle']);+ let { title: name, generatedTitle } = await topics.getTopicFields(post.tid, ['title', 'generatedTitle']);if (generatedTitle) {name = null;}@@ -648,7 +645,7 @@ Mocks.notes.public = async (post) => {};}if (mentionsEnabled) {- const mentions = require.main.require('nodebb-plugin-mentions');+ const mentions = nodebb.require('nodebb-plugin-mentions');const matches = await mentions.getMatches(content);if (matches.size) {diff --git a/src/activitypub/notes.js b/src/activitypub/notes.jsindex 4c69d4c809..9d6ec5897b 100644--- a/src/activitypub/notes.js+++ b/src/activitypub/notes.js@@ -17,6 +17,7 @@ const posts = require('../posts');const ttlCache = require('../cache/ttl');const websockets = require('../socket.io');const utils = require('../utils');+const translator = require('../translator');const activitypub = module.parent.exports;const Notes = module.exports;@@ -496,9 +497,12 @@ Notes.assertPrivate = async (object) => {try {await messaging.checkContent(payload.content, false);} catch (e) {- const { displayname, userslug } = await user.getUserFields(payload.uid, ['displayname', 'userslug']);+ const [displayname, userslug] = await Promise.all([+ user.getNotificationDisplayname(payload.uid),+ user.getUserField(payload.uid, 'userslug'),+ ]);const notification = await notifications.create({- bodyShort: `[[error:remote-chat-received-too-long, ${displayname}]]`,+ bodyShort: translator.compile('error:remote-chat-received-too-long', displayname),path: `/user/${userslug}`,nid: `error:chat:uid:${payload.uid}`,from: payload.uid,diff --git a/src/activitypub/rules.js b/src/activitypub/rules.jsindex 1f9b335fa5..1cdaf8b1da 100644--- a/src/activitypub/rules.js+++ b/src/activitypub/rules.js@@ -1,6 +1,5 @@'use strict';-const validator = require('validator');const db = require('../database');const utils = require('../utils');@@ -15,7 +14,6 @@ Rules.list = async () => {rules = rules.map((rule, idx) => {rule.rid = rids[idx];rule.cid = parseInt(rule.cid, 10);- rule.value = validator.escape(rule.value);rule.filter = typeof rule.filter === 'string' ? rule.filter === 'true' : rule.filter;return rule;});diff --git a/src/api/categories.js b/src/api/categories.jsindex d0dd8d47df..1c4074d38e 100644--- a/src/api/categories.js+++ b/src/api/categories.js@@ -149,7 +149,7 @@ categoriesAPI.getTopics = async (caller, data) => {tag: data.query.tag,targetUid,});- categories.modifyTopicsByPrivilege(result.topics, userPrivileges);+ await categories.modifyTopicsByPrivilege(result.topics, userPrivileges);return { ...result, privileges: userPrivileges };};diff --git a/src/api/chats.js b/src/api/chats.jsindex 2bbabf91b3..bd2c1c6bd6 100644--- a/src/api/chats.js+++ b/src/api/chats.js@@ -1,6 +1,5 @@'use strict';-const validator = require('validator');const winston = require('winston');const db = require('../database');@@ -186,7 +185,7 @@ chatsAPI.update = async (caller, data) => {if (ioRoom) {ioRoom.emit('event:chats.roomRename', {roomId: data.roomId,- newName: validator.escape(String(data.name)),+ newName: data.name,chatWithMessage: loadedRoom.chatWithMessage,});}diff --git a/src/api/groups.js b/src/api/groups.jsindex a75d4b45db..fc3e37630e 100644--- a/src/api/groups.js+++ b/src/api/groups.js@@ -1,7 +1,5 @@'use strict';-const validator = require('validator');-const privileges = require('../privileges');const events = require('../events');const groups = require('../groups');@@ -9,6 +7,7 @@ const user = require('../user');const meta = require('../meta');const notifications = require('../notifications');const slugify = require('../slugify');+const tx = require('../translator');const groupsAPI = module.exports;@@ -227,12 +226,12 @@ groupsAPI.leave = async function (caller, data) {throw new Error('[[error:no-privileges]]');}- const { displayname } = await user.getUserFields(data.uid, ['username']);+ const displayname = await user.getNotificationDisplayname(data.uid);const notification = await notifications.create({type: 'group-leave',- bodyShort: `[[groups:membership.leave.notification-title, ${displayname}, ${groupName}]]`,- nid: `group:${validator.escape(groupName)}:uid:${data.uid}:group-leave`,+ bodyShort: tx.compile('groups:membership.leave.notification-title', displayname, tx.escape(groupName)),+ nid: `group:${groupName}:uid:${data.uid}:group-leave`,path: `/groups/${slugify(groupName)}`,from: data.uid,});diff --git a/src/api/posts.js b/src/api/posts.jsindex 5890c9243b..76df895b90 100644--- a/src/api/posts.js+++ b/src/api/posts.js@@ -1,6 +1,5 @@'use strict';-const validator = require('validator');const _ = require('lodash');const db = require('../database');@@ -17,7 +16,7 @@ const activitypub = require('../activitypub');const apiHelpers = require('./helpers');const websockets = require('../socket.io');const socketHelpers = require('../socket.io/helpers');-const translator = require('../translator');+const tx = require('../translator');const notifications = require('../notifications');const postsAPI = module.exports;@@ -139,8 +138,8 @@ postsAPI.edit = async function (caller, data) {uid: caller.uid,ip: caller.ip,tid: editResult.topic.tid,- oldTitle: validator.escape(String(editResult.topic.oldTitle)),- newTitle: validator.escape(String(editResult.topic.title)),+ oldTitle: editResult.topic.oldTitle,+ newTitle: editResult.topic.title,});}const postObj = await posts.getPostSummaryByPids([editResult.post.pid], caller.uid, { parse: false, extraFields: ['edited'] });@@ -599,7 +598,7 @@ postsAPI.removeQueuedPost = async (caller, data) => {await canEditQueue(caller.uid, data, 'reject');const result = await posts.removeFromQueue(data.id);if (result && caller.uid !== parseInt(result.uid, 10)) {- const msg = validator.escape(String(data.message ? data.message : ''));+ const msg = String(data.message ? data.message : '');await sendQueueNotification(msg ? 'post-queue-rejected-for-reason' : 'post-queue-rejected', result.uid, '/', msg);@@ -625,7 +624,7 @@ postsAPI.notifyQueuedPostOwner = async (caller, data) => {await canEditQueue(caller.uid, data, 'notify');const result = await posts.getFromQueue(data.id);if (result) {- await sendQueueNotification('post-queue-notify', result.uid, `/post-queue/${data.id}`, validator.escape(String(data.message || '')));+ await sendQueueNotification('post-queue-notify', result.uid, `/post-queue/${data.id}`, String(data.message || ''));}};@@ -667,8 +666,8 @@ async function logQueueEvent(caller, result, type) {async function sendQueueNotification(type, targetUid, path, notificationText) {const bodyShort = notificationText ?- translator.compile(`notifications:${type}`, notificationText) :- translator.compile(`notifications:${type}`);+ tx.compile(`notifications:${type}`, tx.escape(notificationText)) :+ tx.compile(`notifications:${type}`);const notifData = {type: type,nid: `${type}-${targetUid}-${path}`,diff --git a/src/api/search.js b/src/api/search.jsindex f8c538d35a..f3c39a544c 100644--- a/src/api/search.js+++ b/src/api/search.js@@ -47,8 +47,6 @@ searchApi.categories = async (caller, data) => {let categoriesData = categories.buildForSelectCategories(visibleCategories, ['disabledClass'], data.parentCid);categoriesData = categoriesData.slice(0, 1000);- const userSettings = await user.getSettings(caller.uid);- await controllersHelpers.translateCategoryData(categoriesData, userSettings.userLang);categoriesData.forEach((category) => {category.selected = data.selectedCids ? data.selectedCids.includes(String(category.cid)) : false;diff --git a/src/api/users.js b/src/api/users.jsindex 51511c2c62..b92ff65970 100644--- a/src/api/users.js+++ b/src/api/users.js@@ -16,7 +16,7 @@ const privileges = require('../privileges');const notifications = require('../notifications');const plugins = require('../plugins');const events = require('../events');-const translator = require('../translator');+const tx = require('../translator');const sockets = require('../socket.io');const utils = require('../utils');@@ -86,14 +86,14 @@ usersAPI.update = async function (caller, data) {await user.updateProfile(caller.uid, data);const userData = await user.getUserData(data.uid);- const oldUsernameEscaped = validator.escape(String(oldUserData.username));- if (userData.username !== oldUsernameEscaped) {++ if (userData.username !== oldUserData.username) {await events.log({type: 'username-change',uid: caller.uid,targetUid: data.uid,ip: caller.ip,- oldUsername: oldUsernameEscaped,+ oldUsername: oldUserData.username,newUsername: userData.username,});}@@ -207,12 +207,12 @@ usersAPI.ban = async function (caller, data) {await db.setObjectField(`uid:${data.uid}:ban:${banData.timestamp}`, 'fromUid', caller.uid);if (!data.reason) {- data.reason = await translator.translate('[[user:info.banned-no-reason]]');+ data.reason = await tx.translateKey('[[user:info.banned-no-reason]]');}sockets.in(`uid_${data.uid}`).emit('event:banned', {until: data.until,- reason: validator.escape(String(data.reason || '')),+ reason: data.reason || '',});await flags.resolveFlag('user', data.uid, caller.uid);@@ -744,9 +744,9 @@ usersAPI.generateExport = async (caller, { uid, type }) => {});child.on('exit', async () => {await db.deleteObjectField('locks', `export:${uid}${type}`);- const { displayname } = await user.getUserFields(uid, ['username']);+ const displayname = await user.getNotificationDisplayname(uid);const n = await notifications.create({- bodyShort: `[[notifications:${type}-exported, ${displayname}]]`,+ bodyShort: tx.compile(`notifications:${type}-exported`, displayname),path: `/api/v3/users/${uid}/exports/${type}`,nid: `${type}:export:${uid}`,from: uid,diff --git a/src/categories/create.js b/src/categories/create.jsindex 165cb08852..fa49468834 100644--- a/src/categories/create.js+++ b/src/categories/create.js@@ -31,6 +31,7 @@ module.exports = function (Categories) {name: data.name,handle,description: data.description ? data.description : '',+ descriptionParsed: data.descriptionParsed ? data.descriptionParsed : '',icon: data.icon ? data.icon : '',bgColor: data.bgColor || colours[0],color: data.color || colours[1],@@ -84,6 +85,9 @@ module.exports = function (Categories) {category = result.category;await db.setObject(`category:${category.cid}`, category);+ if (!category.descriptionParsed) {+ await Categories.parseDescription(category.cid, category.description);+ }await db.sortedSetAddBulk([['categories:cid', category.order, category.cid],diff --git a/src/categories/data.js b/src/categories/data.jsindex 2e9d95f179..2b011fecb9 100644--- a/src/categories/data.js+++ b/src/categories/data.js@@ -1,12 +1,9 @@'use strict';-const validator = require('validator');-const db = require('../database');const meta = require('../meta');const plugins = require('../plugins');const utils = require('../utils');-const translator = require('../translator');const intFields = ['cid', 'parentCid', 'disabled', 'isSection', 'order',@@ -27,7 +24,7 @@ const worldCategory = {disabled: 0,handle: 'world',link: '',- class: '', // todo+ class: '',};worldCategory.descriptionParsed = worldCategory.description;@@ -130,16 +127,6 @@ function modifyCategory(category, fields) {db.parseIntFields(category, intFields, fields);- const escapeFields = [- 'name', 'nickname', 'description', 'color', 'bgColor',- 'backgroundImage', 'imageClass', 'class', 'link',- ];- escapeFields.forEach((field) => {- if (hasField(field)) {- category[field] = validator.escape(String(category[field] || ''));- }- });-if (hasField('icon')) {category.icon = category.icon || 'hidden';if (category.icon === 'fa-none') {@@ -155,16 +142,11 @@ function modifyCategory(category, fields) {category.totalTopicCount = category.topic_count;}- if (hasField('name')) {- category.name = translator.escape(category.name);+ if (hasField('nickname')) {+ category.nickname = category.nickname || '';}- if (hasField('description')) {- category.descriptionParsed = translator.escape(category.descriptionParsed || category.description);- category.description = translator.escape(category.description);- }-- if (category.nickname) {- category.name = translator.escape(category.nickname);+ if (hasField('name')) {+ category.name = category.nickname || category.name;}}diff --git a/src/categories/index.js b/src/categories/index.jsindex df66600794..87e37d0b11 100644--- a/src/categories/index.js+++ b/src/categories/index.js@@ -428,7 +428,7 @@ Categories.buildForSelectCategories = function (categories, fields, parentCid) {rootCategories.forEach(category => recursive(category, categoriesData, '', 0));const pickFields = [- 'cid', 'name', 'level', 'icon', 'parentCid',+ 'cid', 'name', 'level', 'depth', 'icon', 'parentCid','color', 'bgColor', 'backgroundImage', 'imageClass',];fields = fields || [];diff --git a/src/categories/search.js b/src/categories/search.jsindex e77518eed5..9f8c407e76 100644--- a/src/categories/search.js+++ b/src/categories/search.js@@ -7,8 +7,6 @@ const activitypub = require('../activitypub');const plugins = require('../plugins');const db = require('../database');const utils = require('../utils');-const user = require('../user');-const controllersHelpers = require('../controllers/helpers');module.exports = function (Categories) {Categories.search = async function (data) {@@ -53,9 +51,6 @@ module.exports = function (Categories) {let categoryData = await Categories.getCategories(uniqCids);categoryData = categoryData.filter(Boolean);- const userSettings = await user.getSettings(uid);- await controllersHelpers.translateCategoryData(categoryData, userSettings.userLang);-Categories.getTree(categoryData, 0);await Categories.getRecentTopicReplies(categoryData, uid, data.qs);categoryData.forEach((category) => {diff --git a/src/categories/topics.js b/src/categories/topics.jsindex 3abbfe7566..dd84887c9b 100644--- a/src/categories/topics.js+++ b/src/categories/topics.js@@ -7,7 +7,7 @@ const meta = require('../meta');const privileges = require('../privileges');const user = require('../user');const notifications = require('../notifications');-const translator = require('../translator');+const tx = require('../translator');const batch = require('../batch');const utils = require('../utils');@@ -161,17 +161,14 @@ module.exports = function (Categories) {return await topics.tools.checkPinExpiry(pinnedTids);};- Categories.modifyTopicsByPrivilege = function (topics, privileges) {+ Categories.modifyTopicsByPrivilege = async function (topics, privileges) {if (!Array.isArray(topics) || !topics.length || privileges.view_deleted) {return;}topics.forEach((topic) => {- if (!topic.scheduled && topic.deleted && !topic.isOwner) {+ if (topic && !topic.scheduled && topic.deleted && !topic.isOwner) {topic.title = '[[topic:topic-is-deleted]]';- if (topic.hasOwnProperty('titleRaw')) {- topic.titleRaw = '[[topic:topic-is-deleted]]';- }topic.slug = topic.tid;topic.teaser = null;topic.noAnchor = true;@@ -238,15 +235,18 @@ module.exports = function (Categories) {return;}- const { displayname } = postData.user;- const [categoryName, title] = await Promise.all([+ const [displayname, categoryName, title] = await Promise.all([+ user.getNotificationDisplayname(postData.user.uid),Categories.getCategoryField(cid, 'name'),- topics.getTopicField(postData.topic.tid, 'title'),+ topics.getNotificationTitle(postData.topic.tid),]);- const notifBase = 'notifications:user-posted-topic-in-category';-- const bodyShort = translator.compile(notifBase, displayname, title, categoryName);+ const bodyShort = tx.compile(+ 'notifications:user-posted-topic-in-category',+ displayname,+ title,+ categoryName+ );const notification = await notifications.create({type: 'new-topic-in-category',diff --git a/src/categories/update.js b/src/categories/update.jsindex 77381191af..2c2053f9fa 100644--- a/src/categories/update.js+++ b/src/categories/update.js@@ -61,6 +61,9 @@ module.exports = function (Categories) {}await db.setObjectField(`${utils.isNumber(cid) ? 'category' : 'categoryRemote'}:${cid}`, key, value);+ if (key === 'description') {+ await Categories.parseDescription(cid, value);+ }}async function updateParent(cid, newParent) {@@ -134,6 +137,11 @@ module.exports = function (Categories) {]);}+ Categories.parseDescription = async function (cid, description) {+ const parsedDescription = await plugins.hooks.fire('filter:parse.raw', description);+ await Categories.setCategoryField(cid, 'descriptionParsed', parsedDescription);+ };+async function updateName(cid, newName) {const oldName = await Categories.getCategoryField(cid, 'name');await db.sortedSetRemove('categories:name', `${oldName.slice(0, 200).toLowerCase()}:${cid}`);diff --git a/src/controllers/404.js b/src/controllers/404.jsindex 1688b80a7a..7a3c31d219 100644--- a/src/controllers/404.js+++ b/src/controllers/404.js@@ -2,7 +2,6 @@const nconf = require('nconf');const winston = require('winston');-const validator = require('validator');const meta = require('../meta');const plugins = require('../plugins');@@ -62,7 +61,7 @@ exports.send404 = helpers.try(async (req, res) => {const path = String(req.path || '');if (res.locals.isAPI) {return res.json({- path: validator.escape(path.replace(/^\/api/, '')),+ path: path.replace(/^\/api/, ''),title: '[[global:404.title]]',bodyClass: helpers.buildBodyClass(req, res),});@@ -70,7 +69,7 @@ exports.send404 = helpers.try(async (req, res) => {await middleware.buildHeaderAsync(req, res);res.render('404', {- path: validator.escape(path),+ path: path,title: '[[global:404.title]]',icon: error404Icons[Math.floor(Math.random() * error404Icons.length)],});diff --git a/src/controllers/accounts/categories.js b/src/controllers/accounts/categories.jsindex f62a1de0d9..1f24dcf020 100644--- a/src/controllers/accounts/categories.js+++ b/src/controllers/accounts/categories.js@@ -11,8 +11,7 @@ const categoriesController = module.exports;categoriesController.get = async function (req, res) {const payload = res.locals.userData;const { username, userslug } = payload;- const [userSettings, states, allCategoriesData] = await Promise.all([- user.getSettings(req.uid),+ const [states, allCategoriesData] = await Promise.all([user.getCategoryWatchState(res.locals.uid),categories.buildForSelect(res.locals.uid, 'find', ['descriptionParsed', 'depth', 'slug']),]);@@ -23,8 +22,6 @@ categoriesController.get = async function (req, res) {const stop = start + meta.config.categoriesPerPage - 1;const categoriesData = watchCategories.slice(start, stop + 1);- await helpers.translateCategoryData(categoriesData, userSettings.userLang);-categoriesData.forEach((category) => {if (category) {category.isWatched = states[category.cid] === categories.watchStates.watching;diff --git a/src/controllers/accounts/helpers.js b/src/controllers/accounts/helpers.jsindex 6b9145b187..cf2fd32873 100644--- a/src/controllers/accounts/helpers.js+++ b/src/controllers/accounts/helpers.js@@ -10,7 +10,6 @@ const plugins = require('../../plugins');const meta = require('../../meta');const utils = require('../../utils');const privileges = require('../../privileges');-const translator = require('../../translator');const messaging = require('../../messaging');const categories = require('../../categories');const posts = require('../../posts');@@ -155,7 +154,7 @@ helpers.getCustomUserFields = async function (callerUID, userData) {key: slugify(name),name,value,- linkValue: validator.escape(String(value.replace('http://', '').replace('https://', ''))),+ linkValue: value.replace('http://', '').replace('https://', ''),type: isUrl ? 'input-link' : 'input-text','min-rep': '',icon: 'fa-solid fa-circle-info',@@ -195,7 +194,7 @@ helpers.getCustomUserFields = async function (callerUID, userData) {userValue = JSON.parse(userValue || '[]');}if (f.type === 'input-link' && userValue) {- f.linkValue = validator.escape(String(userValue.replace('http://', '').replace('https://', '')));+ f.linkValue = String(userValue.replace('http://', '').replace('https://', ''));}f['select-options'] = (f['select-options'] || '').split('\n').filter(Boolean);if (f.type === 'select') {@@ -213,7 +212,7 @@ helpers.getCustomUserFields = async function (callerUID, userData) {if (Array.isArray(userValue)) {userValue = userValue.join(', ');}- f.value = translator.escape(validator.escape(String(userValue)));+ f.value = String(userValue);}});return fields;@@ -352,13 +351,11 @@ async function parseAboutMe(userData) {userData.aboutmeParsed = '';return;} else if (activitypub.helpers.isUri(userData.uid)) {- userData.aboutme = posts.sanitize(validator.unescape(String(userData.aboutme)));+ userData.aboutme = posts.sanitize(String(userData.aboutme));userData.aboutmeParsed = userData.aboutme;return;}- const parsed = await plugins.hooks.fire('filter:parse.aboutme', validator.unescape(String(userData.aboutme || '')));- userData.aboutme = translator.escape(userData.aboutme);- userData.aboutmeParsed = translator.escape(parsed);+ userData.aboutmeParsed = await plugins.hooks.fire('filter:parse.aboutme', String(userData.aboutme || ''));}function filterLinks(links, states) {diff --git a/src/controllers/accounts/profile.js b/src/controllers/accounts/profile.jsindex 156605917f..a556ab6b0e 100644--- a/src/controllers/accounts/profile.js+++ b/src/controllers/accounts/profile.js@@ -138,7 +138,6 @@ function addTags(res, userData) {{name: 'title',content: userData.fullname || userData.username,- noEscape: true,},{name: 'description',@@ -147,7 +146,6 @@ function addTags(res, userData) {{property: 'og:title',content: userData.fullname || userData.username,- noEscape: true,},{property: 'og:description',@@ -160,12 +158,10 @@ function addTags(res, userData) {{property: 'og:image',content: `${url}${userData.picture}`,- noEscape: true,},{property: 'og:image:url',content: `${url}${userData.picture}`,- noEscape: true,});}diff --git a/src/controllers/activitypub/actors.js b/src/controllers/activitypub/actors.jsindex 213a1c704b..4d8d0f491f 100644--- a/src/controllers/activitypub/actors.js+++ b/src/controllers/activitypub/actors.js@@ -136,7 +136,7 @@ Actors.topic = async function (req, res, next) {const page = parseInt(req.query.page, 10) || undefined;const perPage = meta.config.postsPerPage;- const { cid, titleRaw: name, mainPid, slug, timestamp } = await topics.getTopicFields(req.params.tid, ['cid', 'title', 'mainPid', 'slug', 'timestamp']);+ const { cid, title: name, mainPid, slug, timestamp } = await topics.getTopicFields(req.params.tid, ['cid', 'title', 'mainPid', 'slug', 'timestamp']);try {if (timestamp > Date.now()) { // Scheduled topic, no responsereturn next();diff --git a/src/controllers/activitypub/topics.js b/src/controllers/activitypub/topics.jsindex b9bb39b9b9..76473cee32 100644--- a/src/controllers/activitypub/topics.js+++ b/src/controllers/activitypub/topics.js@@ -18,22 +18,18 @@ controller.list = async function (req, res) {return helpers.redirect(res, '/world?local=1', false);}- const { topicsPerPage, userLang } = await user.getSettings(req.uid);+ const userSettings = await user.getSettings(req.uid);let { page, after } = req.query;page = parseInt(page, 10) || 1;- let start = Math.max(0, (page - 1) * topicsPerPage);- let stop = start + topicsPerPage - 1;+ let start = Math.max(0, (page - 1) * userSettings.topicsPerPage);+ let stop = start + userSettings.topicsPerPage - 1;- const [userSettings, userPrivileges, isAdminOrGlobalMod, selectedCategory] = await Promise.all([- user.getSettings(req.uid),+ const [userPrivileges, isAdminOrGlobalMod, selectedCategory] = await Promise.all([privileges.categories.get('-1', req.uid),user.isAdminOrGlobalMod(req.uid),categories.getCategoryData(meta.config.activitypubWorldDefaultCid),]);- // temporary?- selectedCategory.name = translator.unescape(selectedCategory.name);-const targetUid = await user.getUidByUserslug(req.query.author);let cidQuery = {uid: req.uid,@@ -50,7 +46,7 @@ controller.list = async function (req, res) {thumbsOnly: 1,};const data = await categories.getCategoryById(cidQuery);- await helpers.translateCategoryData([data], userLang);+delete data.children;data.sort = req.query.sort;data.privileges = userPrivileges;@@ -169,7 +165,7 @@ controller.list = async function (req, res) {data.title = translator.escape(data.name);data.breadcrumbs = helpers.buildBreadcrumbs([]);- const pageCount = Math.max(1, Math.ceil(data.topicCount / topicsPerPage));+ const pageCount = Math.max(1, Math.ceil(data.topicCount / userSettings.topicsPerPage));data.pagination = pagination.create(page, pageCount, req.query);helpers.addLinkTags({url: 'world',diff --git a/src/controllers/admin/categories.js b/src/controllers/admin/categories.jsindex ec7e559a1b..332951e386 100644--- a/src/controllers/admin/categories.js+++ b/src/controllers/admin/categories.js@@ -7,7 +7,6 @@ const user = require('../../user');const categories = require('../../categories');const analytics = require('../../analytics');const plugins = require('../../plugins');-const translator = require('../../translator');const meta = require('../../meta');const activitypub = require('../../activitypub');const helpers = require('../helpers');@@ -21,7 +20,7 @@ categoriesController.get = async function (req, res, next) {const [categoryData, parent, selectedData] = await Promise.all([categories.getCategories([req.params.category_id]),categories.getParents([req.params.category_id]),- helpers.getSelectedCategory(req.params.category_id, req.uid),+ helpers.getSelectedCategory(req.params.category_id),]);const category = categoryData[0];@@ -37,8 +36,6 @@ categoriesController.get = async function (req, res, next) {category: category,customClasses: [],});- data.category.name = translator.escape(String(data.category.name));- data.category.description = translator.escape(String(data.category.description));res.render('admin/manage/category', {category: data.category,@@ -147,7 +144,7 @@ categoriesController.buildBreadCrumbs = buildBreadcrumbs;categoriesController.getAnalytics = async function (req, res) {const [analyticsData, { selectedCategory }] = await Promise.all([analytics.getCategoryAnalytics(req.params.category_id),- helpers.getSelectedCategory(req.params.category_id, req.uid),+ helpers.getSelectedCategory(req.params.category_id),]);res.render('admin/manage/category-analytics', {@@ -163,7 +160,7 @@ categoriesController.getFederation = async function (req, res) {db.getSortedSetMembers(`cid:${cid}:following`),db.getSortedSetMembers(`followRequests:cid.${cid}`),activitypub.notes.getCategoryFollowers(cid),- helpers.getSelectedCategory(cid, req.uid),+ helpers.getSelectedCategory(cid),]);const following = [..._following, ...pending].map(entry => ({diff --git a/src/controllers/admin/dashboard.js b/src/controllers/admin/dashboard.jsindex 0cfd5350c1..c58d82e661 100644--- a/src/controllers/admin/dashboard.js+++ b/src/controllers/admin/dashboard.js@@ -4,7 +4,6 @@ const nconf = require('nconf');const semver = require('semver');const winston = require('winston');const _ = require('lodash');-const validator = require('validator');const versions = require('../../admin/versions');const db = require('../../database');@@ -262,8 +261,7 @@ async function getLastRestart() {}async function getPopularSearches() {- const searches = await db.getSortedSetRevRangeWithScores('searches:all', 0, 9);- return searches.map(s => ({ value: validator.escape(String(s.value)), score: s.score }));+ return await db.getSortedSetRevRangeWithScores('searches:all', 0, 9);}dashboardController.getLogins = async (req, res) => {@@ -280,7 +278,7 @@ dashboardController.getLogins = async (req, res) => {// List recent sessionsconst start = Date.now() - (1000 * 60 * 60 * 24 * meta.config.loginDays);- const uids = await db.getSortedSetRangeByScore('users:online', 0, 500, start, Date.now());+ const uids = await db.getSortedSetRevRangeByScore('users:online', 0, 500, '+inf', start);const usersData = await user.getUsersData(uids);let sessions = await Promise.all(uids.map(async (uid) => {const sessions = await user.auth.getSessions(uid);@@ -318,7 +316,7 @@ dashboardController.getUsers = async (req, res) => {// List of users registered within time frameconst end = parseInt(req.query.until, 10) || Date.now();const start = end - (1000 * 60 * 60 * (req.query.units === 'days' ? 24 : 1) * (req.query.count || (req.query.units === 'days' ? 30 : 24)));- const uids = await db.getSortedSetRangeByScore('users:joindate', 0, 500, start, end);+ const uids = await db.getSortedSetRevRangeByScore('users:joindate', 0, 500, '+inf', start);const users = await user.getUsersData(uids);res.render('admin/dashboard/users', {@@ -346,7 +344,7 @@ dashboardController.getTopics = async (req, res) => {// List of topics created within time frameconst end = parseInt(req.query.until, 10) || Date.now();const start = end - (1000 * 60 * 60 * (req.query.units === 'days' ? 24 : 1) * (req.query.count || (req.query.units === 'days' ? 30 : 24)));- const tids = await db.getSortedSetRangeByScore('topics:tid', 0, 500, start, end);+ const tids = await db.getSortedSetRevRangeByScore('topics:tid', 0, 500, '+inf', start);const topicData = await topics.getTopicsByTids(tids);res.render('admin/dashboard/topics', {@@ -419,9 +417,9 @@ dashboardController.getSearches = async (req, res) => {const pageCount = Math.ceil(itemCount / perPage);res.render('admin/dashboard/searches', {- searches: searches.map(s => ({ value: validator.escape(String(s.value)), score: s.score })),- startDate: req.query.start ? validator.escape(String(req.query.start)) : null,- endDate: req.query.end ? validator.escape(String(req.query.end)) : null,+ searches: searches,+ startDate: req.query.start ? req.query.start : null,+ endDate: req.query.end ? req.query.end : null,pagination: pagination.create(page, pageCount, req.query),});};diff --git a/src/controllers/admin/errors.js b/src/controllers/admin/errors.jsindex fb5c7199af..5e49016883 100644--- a/src/controllers/admin/errors.js+++ b/src/controllers/admin/errors.js@@ -10,14 +10,14 @@ const errorsController = module.exports;errorsController.get = async function (req, res) {const data = await utils.promiseParallel({- 'not-found': meta.errors.get(true),+ 'not-found': meta.errors.get(),analytics: analytics.getErrorAnalytics(),});res.render('admin/advanced/errors', data);};errorsController.export = async function (req, res) {- const data = await meta.errors.get(false);+ const data = await meta.errors.get();const fields = data.length ? Object.keys(data[0]) : [];const opts = { fields };const json2csvAsync = new AsyncParser(opts);diff --git a/src/controllers/admin/events.js b/src/controllers/admin/events.jsindex 9b4d493071..d4cacbf02c 100644--- a/src/controllers/admin/events.js+++ b/src/controllers/admin/events.js@@ -1,6 +1,5 @@'use strict';-const validator = require('validator');const db = require('../../database');const events = require('../../events');const pagination = require('../../pagination');@@ -60,11 +59,11 @@ eventsController.get = async function (req, res) {pagination: pagination.create(page, pageCount, req.query),types: types,query: {- start: validator.escape(String(req.query.start || '')),- end: validator.escape(String(req.query.end || '')),- username: validator.escape(String(req.query.username || '')),- group: validator.escape(String(req.query.group || '')),- perPage: validator.escape(String(req.query.perPage || '')),+ start: req.query.start || '',+ end: req.query.end || '',+ username: req.query.username || '',+ group: req.query.group || '',+ perPage: req.query.perPage || '',},});};diff --git a/src/controllers/admin/federation.js b/src/controllers/admin/federation.jsindex a8758e25c6..cf11ed7ff5 100644--- a/src/controllers/admin/federation.js+++ b/src/controllers/admin/federation.js@@ -1,7 +1,5 @@'use strict';-const validator = require('validator');-const db = require('../../database');const meta = require('../../meta');const activitypub = require('../../activitypub');@@ -132,7 +130,7 @@ federationController.errors = async function (req, res) {const parsed = JSON.parse(body);({ type: activityType } = parsed);body = JSON.stringify(parsed, null, 4);- stack = validator.escape(stack.replace(/\s+$/gm, ''));+ stack = stack.replace(/\s+$/gm, '');({ hostname } = new URL(id));} catch (e) {// noop@@ -146,10 +144,10 @@ federationController.errors = async function (req, res) {}return {- id: validator.escape(String(id || '')),- type: validator.escape(String(type || '')),- activityType: validator.escape(String(activityType || '')),- body: validator.escape(String(body || '')),+ id: id || '',+ type: type || '',+ activityType: activityType || '',+ body: body || '',stack,hostname,timestamp,diff --git a/src/controllers/admin/groups.js b/src/controllers/admin/groups.jsindex 7152ad939f..f03c1a8389 100644--- a/src/controllers/admin/groups.js+++ b/src/controllers/admin/groups.js@@ -55,7 +55,7 @@ groupsController.get = async function (req, res, next) {const groupNameData = groupNames.map(g => ({encodedName: encodeURIComponent(g.name),- displayName: validator.escape(String(g.name)),+ displayName: g.name,slug: g.slug,selected: g.name === groupName,}));diff --git a/src/controllers/admin/hooks.js b/src/controllers/admin/hooks.jsindex c3511ebaf3..9cb0aa11f7 100644--- a/src/controllers/admin/hooks.js+++ b/src/controllers/admin/hooks.js@@ -1,6 +1,5 @@'use strict';-const validator = require('validator');const plugins = require('../../plugins');const hooksController = module.exports;@@ -19,7 +18,7 @@ hooksController.get = function (req, res) {current.methods.push({id: hookData.id,priority: hookData.priority,- method: hookData.method ? validator.escape(hookData.method.toString()) : 'No plugin function!',+ method: hookData.method ? hookData.method.toString() : 'No plugin function!',index: `hook-${hookIndex}-code-${methodIndex}`,});});diff --git a/src/controllers/admin/logs.js b/src/controllers/admin/logs.jsindex 1fe0bb86c9..f3bb6febcb 100644--- a/src/controllers/admin/logs.js+++ b/src/controllers/admin/logs.js@@ -1,10 +1,7 @@'use strict';-const validator = require('validator');const winston = require('winston');-const meta = require('../../meta');-const translator = require('../../translator');const logsController = module.exports;@@ -16,6 +13,6 @@ logsController.get = async function (req, res) {winston.error(err.stack);}res.render('admin/advanced/logs', {- data: translator.escape(validator.escape(logs)),+ data: logs,});};diff --git a/src/controllers/admin/settings.js b/src/controllers/admin/settings.jsindex d5469fa97f..6f3745f3fe 100644--- a/src/controllers/admin/settings.js+++ b/src/controllers/admin/settings.js@@ -1,7 +1,5 @@'use strict';-const validator = require('validator');-const meta = require('../../meta');const emailer = require('../../emailer');const notifications = require('../../notifications');@@ -10,7 +8,6 @@ const languages = require('../../languages');const navigationAdmin = require('../../navigation/admin');const social = require('../../social');const helpers = require('../helpers');-const translator = require('../../translator');const plugins = require('../../plugins');const settingsController = module.exports;@@ -44,9 +41,6 @@ settingsController.navigation = async function (req, res) {admin.enabled.forEach((enabled, index) => {enabled.index = index;enabled.selected = index === 0;- enabled.title = translator.escape(enabled.title);- enabled.text = translator.escape(enabled.text);- enabled.dropdownContent = translator.escape(validator.escape(String(enabled.dropdownContent || '')));enabled.groups = admin.groups.map(group => ({displayName: group.displayName,selected: enabled.groups.includes(group.name),diff --git a/src/controllers/admin/users.js b/src/controllers/admin/users.jsindex 316473459a..58769071c0 100644--- a/src/controllers/admin/users.js+++ b/src/controllers/admin/users.js@@ -1,7 +1,5 @@'use strict';-const validator = require('validator');-const user = require('../../user');const meta = require('../../meta');const db = require('../../database');@@ -35,7 +33,7 @@ async function getUsers(req, res) {if (![50, 100, 250, 500].includes(resultsPerPage)) {resultsPerPage = 50;}- let sortBy = validator.escape(req.query.sortBy || '');+ let sortBy = req.query.sortBy || '';const filterBy = Array.isArray(req.query.filters || []) ? (req.query.filters || []) : [req.query.filters];const start = Math.max(0, page - 1) * resultsPerPage;const stop = start + resultsPerPage - 1;@@ -50,7 +48,7 @@ async function getUsers(req, res) {};const set = [];- if (sortBy) {+ if (sortBy && Object.hasOwn(sortToSet, sortBy)) {set.push(sortToSet[sortBy]);}if (filterBy.includes('unverified')) {@@ -162,7 +160,7 @@ usersController.search = async function (req, res) {user.ip = user.ips.find(ip => ip.includes(String(req.query.query)));});}- searchData.query = validator.escape(String(req.query.query || ''));+ searchData.query = String(req.query.query || '');searchData.page = page;searchData.resultsPerPage = resultsPerPage;searchData.sortBy = req.query.sortBy;@@ -202,7 +200,7 @@ async function loadUserInfo(callerUid, uids) {const confirmObj = confirmObjs[index];user['email:expired'] = !confirmObj.expires || Date.now() >= confirmObj.expires;user['email:pending'] = confirmObj.expires && Date.now() < confirmObj.expires;- user.emailToConfirm = validator.escape(String(confirmObj.email));+ user.emailToConfirm = confirmObj.email;}}});@@ -264,11 +262,11 @@ async function render(req, res, data) {data.adminInviteOnly = registrationType === 'admin-invite-only';data[`sort_${data.sortBy}`] = true;if (req.query.searchBy) {- data[`searchBy_${validator.escape(String(req.query.searchBy))}`] = true;+ data[`searchBy_${req.query.searchBy}`] = true;}const filterBy = Array.isArray(req.query.filters || []) ? (req.query.filters || []) : [req.query.filters];filterBy.forEach((filter) => {- data[`filterBy_${validator.escape(String(filter))}`] = true;+ data[`filterBy_${filter}`] = true;});data.userCount = parseInt(await db.getObjectField('global', 'userCount'), 10);if (data.adminInviteOnly) {diff --git a/src/controllers/api.js b/src/controllers/api.jsindex b7c10238dd..48f204ceda 100644--- a/src/controllers/api.js+++ b/src/controllers/api.js@@ -1,13 +1,11 @@'use strict';-const validator = require('validator');const nconf = require('nconf');const meta = require('../meta');const user = require('../user');const categories = require('../categories');const plugins = require('../plugins');-const translator = require('../translator');const languages = require('../languages');const { generateToken } = require('../middleware/csrf');const utils = require('../utils');@@ -31,12 +29,11 @@ apiController.loadConfig = async function (req) {relative_path,upload_url,asset_base_url,- assetBaseUrl: asset_base_url, // deprecate in 1.20.x- siteTitle: validator.escape(String(meta.config.title || meta.config.browserTitle || 'NodeBB')),- browserTitle: validator.escape(String(meta.config.browserTitle || meta.config.title || 'NodeBB')),- description: validator.escape(String(meta.config.description || '')),- keywords: validator.escape(String(meta.config.keywords || '')),- 'brand:logo': validator.escape(String(meta.config['brand:logo'])),+ siteTitle: meta.config.title || meta.config.browserTitle || 'NodeBB',+ browserTitle: meta.config.browserTitle || meta.config.title || 'NodeB',+ description: meta.config.description || '',+ keywords: meta.config.keywords || '',+ 'brand:logo': meta.config['brand:logo'],titleLayout: (meta.config.titleLayout || '{pageTitle} | {browserTitle}').replace(/{/g, '{').replace(/}/g, '}'),showSiteTitle: meta.config.showSiteTitle === 1,maintenanceMode: meta.config.maintenanceMode === 1,@@ -70,7 +67,7 @@ apiController.loadConfig = async function (req) {'theme:id': meta.config['theme:id'],'theme:src': meta.config['theme:src'],defaultLang: meta.config.defaultLang || 'en-GB',- userLang: req.query.lang ? validator.escape(String(req.query.lang)) : (meta.config.defaultLang || 'en-GB'),+ userLang: req.query.lang || meta.config.defaultLang || 'en-GB',loggedIn: !!req.user,uid: req.uid,'cache-buster': meta.config['cache-buster'] || '',@@ -86,10 +83,10 @@ apiController.loadConfig = async function (req) {timeagoCodes: languages.timeagoCodes,cookies: {enabled: meta.config.cookieConsentEnabled === 1,- message: translator.escape(validator.escape(meta.config.cookieConsentMessage || '[[global:cookies.message]]')).replace(/\\/g, '\\\\'),- dismiss: translator.escape(validator.escape(meta.config.cookieConsentDismiss || '[[global:cookies.accept]]')).replace(/\\/g, '\\\\'),- link: translator.escape(validator.escape(meta.config.cookieConsentLink || '[[global:cookies.learn-more]]')).replace(/\\/g, '\\\\'),- link_url: translator.escape(validator.escape(meta.config.cookieConsentLinkUrl || 'https://www.cookiesandyou.com')).replace(/\\/g, '\\\\'),+ message: meta.config.cookieConsentMessage || '[[global:cookies.message]]',+ dismiss: meta.config.cookieConsentDismiss || '[[global:cookies.accept]]',+ link: meta.config.cookieConsentLink || '[[global:cookies.learn-more]]',+ link_url: meta.config.cookieConsentLinkUrl || 'https://www.cookiesandyou.com',},thumbs: {size: meta.config.topicThumbSize,@@ -129,10 +126,8 @@ apiController.loadConfig = async function (req) {config.usePagination = settings.usePagination;config.topicsPerPage = settings.topicsPerPage;config.postsPerPage = settings.postsPerPage;- config.userLang = validator.escape(- String((req.query.lang ? req.query.lang : null) || settings.userLang || config.defaultLang)- );- config.acpLang = validator.escape(String((req.query.lang ? req.query.lang : null) || settings.acpLang));+ config.userLang = req.query.lang || settings.userLang || config.defaultLang;+ config.acpLang = req.query.lang || settings.acpLang;config.openOutgoingLinksInNewTab = settings.openOutgoingLinksInNewTab;config.topicPostSort = settings.topicPostSort || config.topicPostSort;config.categoryTopicSort = settings.categoryTopicSort || config.categoryTopicSort;diff --git a/src/controllers/categories.js b/src/controllers/categories.jsindex e6046c8fe9..696c3e16d9 100644--- a/src/controllers/categories.js+++ b/src/controllers/categories.js@@ -4,7 +4,6 @@ const nconf = require('nconf');const _ = require('lodash');const categories = require('../categories');-const user = require('../user');const meta = require('../meta');const pagination = require('../pagination');const helpers = require('./helpers');@@ -21,10 +20,7 @@ categoriesController.list = async function (req, res) {content: 'website',}];- const [allRootCids, userSettings] = await Promise.all([- categories.getAllCidsFromSet('cid:0:children'),- user.getSettings(req.uid),- ]);+ const allRootCids = await categories.getAllCidsFromSet('cid:0:children');const rootCids = await privileges.categories.filterCids('find', allRootCids, req.uid);const pageCount = Math.max(1, Math.ceil(rootCids.length / meta.config.categoriesPerPage));const page = Math.min(parseInt(req.query.page, 10) || 1, pageCount);@@ -39,7 +35,6 @@ categoriesController.list = async function (req, res) {await Promise.all([categories.getRecentTopicReplies(categoryData, req.uid, req.query),categories.setUnread(tree, pageCids.concat(childCids), req.uid),- helpers.translateCategoryData(categoryData, userSettings.userLang),]);const data = {diff --git a/src/controllers/category.js b/src/controllers/category.jsindex e0f1512909..ada57f658b 100644--- a/src/controllers/category.js+++ b/src/controllers/category.js@@ -2,7 +2,6 @@const nconf = require('nconf');-const validator = require('validator');const qs = require('querystring');const db = require('../database');@@ -74,7 +73,7 @@ categoryController.get = async function (req, res, next) {if (categoryFields.link) {await db.incrObjectField(`category:${cid}`, 'timesClicked');- return helpers.redirect(res, validator.unescape(categoryFields.link));+ return helpers.redirect(res, categoryFields.link);}if (!userSettings.usePagination) {@@ -115,15 +114,14 @@ categoryController.get = async function (req, res, next) {return next();}- categories.modifyTopicsByPrivilege(categoryData.topics, userPrivileges);+ await categories.modifyTopicsByPrivilege(categoryData.topics, userPrivileges);categoryData.tagWhitelist = categories.filterTagWhitelist(categoryData.tagWhitelist, userPrivileges.isAdminOrMod);const allCategories = [];categories.flattenCategories(allCategories, categoryData.children);- await helpers.translateCategoryData([categoryData].concat(categoryData.children), userSettings.userLang),+await Promise.all([- // needs to be after translateCategoryData to ensure category names are translated for breadcrumbs- buildBreadcrumbs(req, categoryData, userSettings.userLang),+ buildBreadcrumbs(req, categoryData),categories.setUnread([categoryData], allCategories.map(c => c.cid).concat(cid), req.uid),]);@@ -190,7 +188,7 @@ categoryController.get = async function (req, res, next) {res.render('category', categoryData);};-async function buildBreadcrumbs(req, categoryData, userLang) {+async function buildBreadcrumbs(req, categoryData) {const breadcrumbs = [{text: categoryData.name,@@ -198,7 +196,7 @@ async function buildBreadcrumbs(req, categoryData, userLang) {cid: categoryData.cid,},];- const crumbs = await helpers.buildCategoryBreadcrumbs(categoryData.parentCid, userLang);+ const crumbs = await helpers.buildCategoryBreadcrumbs(categoryData.parentCid);if (req.originalUrl.startsWith(`${relative_path}/api/category`) || req.originalUrl.startsWith(`${relative_path}/category`)) {categoryData.breadcrumbs = crumbs.concat(breadcrumbs);}@@ -209,17 +207,17 @@ function addTags(categoryData, res, currentPage) {{name: 'title',content: categoryData.name,- noEscape: true,+ translate: true,},{property: 'og:title',content: categoryData.name,- noEscape: true,+ translate: true,},{name: 'description',content: categoryData.description,- noEscape: true,+ translate: true,},{property: 'og:type',@@ -229,14 +227,12 @@ function addTags(categoryData, res, currentPage) {if (categoryData.backgroundImage) {let { backgroundImage } = categoryData;- backgroundImage = utils.decodeHTMLEntities(backgroundImage);if (!backgroundImage.startsWith('http')) {backgroundImage = url + backgroundImage.replace(new RegExp(`^${nconf.get('relative_path')}`), '');}res.locals.metaTags.push({property: 'og:image',content: backgroundImage,- noEscape: true,});}@@ -249,7 +245,6 @@ function addTags(categoryData, res, currentPage) {{rel: 'canonical',href: `${url}/category/${categoryData.slug}${page}`,- noEscape: true,},];diff --git a/src/controllers/errors.js b/src/controllers/errors.jsindex 4f10402f9a..e33719b09f 100644--- a/src/controllers/errors.js+++ b/src/controllers/errors.js@@ -3,7 +3,6 @@const fs = require('fs');const nconf = require('nconf');const winston = require('winston');-const validator = require('validator');const path = require('path');const translator = require('../translator');const plugins = require('../plugins');@@ -30,7 +29,7 @@ exports.handleURIErrors = async function handleURIErrors(err, req, res, next) {});} else {await middleware.buildHeaderAsync(req, res);- res.status(400).render('400', { error: validator.escape(String(err.message)) });+ res.status(400).render('400', { error: err.message });}}} else {@@ -88,8 +87,8 @@ exports.handleErrors = async function handleErrors(err, req, res, next) { // eslwinston.error(`${req.method} ${req.originalUrl}\n${err.stack}`);res.status(status || 500);const data = {- path: validator.escape(path),- error: validator.escape(String(err.message)),+ path: path,+ error: err.message,bodyClass: middlewareHelpers.buildBodyClass(req, res),};if (res.locals.isAPI) {diff --git a/src/controllers/globalmods.js b/src/controllers/globalmods.jsindex 5b6b1ee607..2ad0d54b4f 100644--- a/src/controllers/globalmods.js+++ b/src/controllers/globalmods.js@@ -1,7 +1,5 @@'use strict';-const validator = require('validator');-const user = require('../user');const meta = require('../meta');const analytics = require('../analytics');@@ -22,7 +20,7 @@ globalModsController.ipBlacklist = async function (req, res, next) {]);res.render('ip-blacklist', {title: '[[pages:ip-blacklist]]',- rules: validator.escape(String(rules)),+ rules: rules,analytics: analyticsData,breadcrumbs: helpers.buildBreadcrumbs([{ text: '[[pages:ip-blacklist]]' }]),});diff --git a/src/controllers/groups.js b/src/controllers/groups.jsindex 4638384b6e..dcec91a319 100644--- a/src/controllers/groups.js+++ b/src/controllers/groups.js@@ -1,6 +1,5 @@'use strict';-const validator = require('validator');const nconf = require('nconf');const meta = require('../meta');@@ -13,9 +12,10 @@ const privileges = require('../privileges');const groupsController = module.exports;const url = nconf.get('url');+const validSorts = ['alpha', 'count', 'date'];groupsController.list = async function (req, res) {- const sort = req.query.sort || 'alpha';+ const sort = validSorts.includes(req.query.sort) ? req.query.sort : 'alpha';const page = parseInt(req.query.page, 10) || 1;const [allowGroupCreation, [groupData, pageCount]] = await Promise.all([privileges.global.can('group:create', req.uid),@@ -32,7 +32,7 @@ groupsController.list = async function (req, res) {res.render('groups/list', {groups: groupData,allowGroupCreation: allowGroupCreation,- sort: validator.escape(String(sort)),+ sort: sort,pagination: pagination.create(page, pageCount, req.query),title: '[[pages:groups]]',breadcrumbs: helpers.buildBreadcrumbs([{ text: '[[pages:groups]]' }]),@@ -151,7 +151,7 @@ groupsController.members = async function (req, res, next) {const breadcrumbs = helpers.buildBreadcrumbs([{ text: '[[pages:groups]]', url: '/groups' },- { text: validator.escape(String(groupName)), url: `/groups/${req.params.slug}` },+ { text: groupName, url: `/groups/${req.params.slug}` },{ text: '[[groups:details.members]]' },]);diff --git a/src/controllers/helpers.js b/src/controllers/helpers.jsindex 4c50d1bed5..3949cdc09f 100644--- a/src/controllers/helpers.js+++ b/src/controllers/helpers.js@@ -2,7 +2,6 @@const nconf = require('nconf');const winston = require('winston');-const validator = require('validator');const querystring = require('querystring');const _ = require('lodash');const chalk = require('chalk');@@ -191,17 +190,16 @@ function prependRelativePath(url) {url : relative_path + url;}-helpers.buildCategoryBreadcrumbs = async function (cid, userLang) {+helpers.buildCategoryBreadcrumbs = async function (cid) {const breadcrumbs = [];while (parseInt(cid, 10)) {/* eslint-disable no-await-in-loop */const data = await categories.getCategoryFields(cid, ['name', 'slug', 'parentCid', 'disabled', 'isSection']);- const translatedName = await helpers.translateEscapedValue(data.name, userLang);if (!data.disabled && !data.isSection) {breadcrumbs.unshift({- text: translatedName,+ text: data.name,url: `${url}/category/${data.slug}`,cid: cid,});@@ -243,35 +241,22 @@ helpers.buildBreadcrumbs = function (crumbs) {return breadcrumbs;};-helpers.buildTitle = function (pageTitle) {- pageTitle = pageTitle || '';- const titleLayout = meta.config.titleLayout || `${pageTitle ? '{pageTitle} | ' : ''}{browserTitle}`;+helpers.buildTitle = async function (pageTitle, userLang, template) {+ pageTitle = String(pageTitle || '');+ const translateTitle = template !== 'topic';- const browserTitle = validator.escape(String(meta.config.browserTitle || meta.config.title || 'NodeBB'));+ const browserTitle = String(meta.config.browserTitle || meta.config.title || 'NodeBB');+ const [titleTranslated, browserTitleTranslated] = await Promise.all([+ translateTitle ? translator.translateKey(pageTitle, [], userLang) : pageTitle,+ translator.translateKey(browserTitle, [], userLang),+ ], userLang);+ const titleLayout = meta.config.titleLayout || `${pageTitle ? '{pageTitle} | ' : ''}{browserTitle}`;const title = titleLayout- .replace('{pageTitle}', () => pageTitle)- .replace('{browserTitle}', () => browserTitle);- return title;-};--helpers.translateEscapedValue = async function translateEscapedValue(value, lang) {- const rawValue = validator.unescape(translator.unescape(String(value || '')));- return validator.escape(await translator.translate(rawValue, lang));-};+ .replace('{pageTitle}', () => titleTranslated)+ .replace('{browserTitle}', () => browserTitleTranslated);-// categoy names and descriptions can be tx keys, translate them safely here-// used on category list, category page and users watched categories-helpers.translateCategoryData = async function (categoryData, userLang) {- await Promise.all(categoryData.map(async (category) => {- if (category) {- category.name = await helpers.translateEscapedValue(category.name, userLang);- category.descriptionParsed = await plugins.hooks.fire(- 'filter:parse.raw', await helpers.translateEscapedValue(category.description, userLang)- );- category.description = await helpers.translateEscapedValue(category.description, userLang);- }- }));+ return utils.decodeHTMLEntities(title);};helpers.getCategories = async function (set, uid, privilege, selectedCid) {@@ -289,7 +274,7 @@ async function getCategoryData(cids, uid, selectedCid, states, privilege) {helpers.getVisibleCategories({cids, uid, states, privilege, showLinks: false,}),- helpers.getSelectedCategory(selectedCid, uid),+ helpers.getSelectedCategory(selectedCid),]);const categoriesData = categories.buildForSelectCategories(visibleCategories, ['disabledClass']);@@ -360,15 +345,12 @@ helpers.getVisibleCategories = async function (params) {});};-helpers.getSelectedCategory = async function (cids, uid) {+helpers.getSelectedCategory = async function (cids) {if (cids && !Array.isArray(cids)) {cids = [cids];}cids = cids && cids.map(cid => parseInt(cid, 10));- const [selectedCategories, { userLang }] = await Promise.all([- categories.getCategoriesData(cids),- user.getSettings(uid),- ]);+ const selectedCategories = await categories.getCategoriesData(cids);let selectedCategory = null;const selectedCids = selectedCategories.map(c => c && c.cid).filter(Boolean);if (selectedCategories.length > 1) {@@ -380,9 +362,7 @@ helpers.getSelectedCategory = async function (cids, uid) {} else if (selectedCategories.length === 1 && selectedCategories[0]) {selectedCategory = selectedCategories[0];}- if (selectedCategory) {- selectedCategory.name = await helpers.translateEscapedValue(selectedCategory.name, userLang);- }+return { selectedCids, selectedCategory };};@@ -395,7 +375,7 @@ helpers.getSelectedTag = function (tags) {let selectedTag = null;if (tagData.length) {selectedTag = {- label: validator.escape(tagData.join(', ')),+ label: tagData.join(', '),};}return {diff --git a/src/controllers/index.js b/src/controllers/index.jsindex 4ee12ca75e..5ae210cb84 100644--- a/src/controllers/index.js+++ b/src/controllers/index.js@@ -2,7 +2,6 @@const path = require('path');const nconf = require('nconf');-const validator = require('validator');const mime = require('mime').default;const meta = require('../meta');@@ -11,7 +10,6 @@ const plugins = require('../plugins');const image = require('../image');const privilegesHelpers = require('../privileges/helpers');const helpers = require('./helpers');-const translator = require('../translator');const Controllers = module.exports;@@ -110,7 +108,7 @@ Controllers.login = async function (req, res) {if (req.query.error === 'csrf-invalid') {errorText = '[[error:csrf-invalid]]';} else if (req.query.error) {- errorText = validator.escape(String(req.query.error));+ errorText = req.query.error;}if (req.headers['x-return-to']) {@@ -432,11 +430,9 @@ Controllers.outgoing = function (req, res, next) {if (!url || !parsed.protocol || !allowedProtocols.includes(parsed.protocol.slice(0, -1))) {return next();}- const escapedSearch = validator.escape(translator.escape(parsed.search || ''));- const escapedUrl = parsed.search ? parsed.href.replace(parsed.search, escapedSearch) : parsed.href;res.render('outgoing', {- outgoing: escapedUrl,+ outgoing: url,title: meta.config.title,breadcrumbs: helpers.buildBreadcrumbs([{text: '[[notifications:outgoing-link]]',diff --git a/src/controllers/mods.js b/src/controllers/mods.jsindex 828909d890..e6cf621057 100644--- a/src/controllers/mods.js+++ b/src/controllers/mods.js@@ -51,7 +51,7 @@ modsController.flags.list = async function (req, res) {res.locals.cids = moderatedCids.map(cid => String(cid));}- const validFilters = helpers.validateParameters(req.query, Object.keys(allFilters), validation);+ const validFilters = helpers.validateParameters(req.query, allFilters, validation);let hasFilter = !!Object.keys(validFilters).length;@@ -90,7 +90,7 @@ modsController.flags.list = async function (req, res) {query: req.query,}),analytics.getDailyStatsForSet('analytics:flags', Date.now(), 30),- helpers.getSelectedCategory(validFilters.cid, req.uid),+ helpers.getSelectedCategory(validFilters.cid),]);// Send back information for userFilter module@@ -221,7 +221,7 @@ modsController.postQueue = async function (req, res, next) {user.isAdministrator(req.uid),user.isGlobalModerator(req.uid),user.getModeratedCids(req.uid),- helpers.getSelectedCategory(cid, req.uid),+ helpers.getSelectedCategory(cid),Promise.all(['global', 'admin'].map(async type => privileges[type].get(req.uid))),]);_privileges = { ..._privileges[0], ..._privileges[1] };diff --git a/src/controllers/popular.js b/src/controllers/popular.jsindex fcc34e5496..340095e35a 100644--- a/src/controllers/popular.js+++ b/src/controllers/popular.js@@ -2,7 +2,6 @@'use strict';const nconf = require('nconf');-const validator = require('validator');const helpers = require('./helpers');const recentController = require('./recent');@@ -23,7 +22,7 @@ popularController.get = async function (req, res, next) {if (!data['feeds:disableRSS'] && data.rssFeedUrl) {const feedQs = data.rssFeedUrl.split('?')[1];- data.rssFeedUrl = `${nconf.get('relative_path')}/popular/${validator.escape(String(req.query.term || 'alltime'))}.rss`;+ data.rssFeedUrl = `${nconf.get('relative_path')}/popular/${String(req.query.term || 'alltime')}.rss`;if (req.loggedIn) {data.rssFeedUrl += `?${feedQs}`;}diff --git a/src/controllers/recent.js b/src/controllers/recent.jsindex 2289ebc4dc..73d5348c0d 100644--- a/src/controllers/recent.js+++ b/src/controllers/recent.js@@ -35,7 +35,7 @@ recentController.getData = async function (req, url, sort, selectedTerm = 'allticonst [settings, categoryData, tagData, rssToken, canPost, isPrivileged] = await Promise.all([user.getSettings(req.uid),- helpers.getSelectedCategory(cid, req.uid),+ helpers.getSelectedCategory(cid),helpers.getSelectedTag(tag),user.auth.getFeedToken(req.uid),privileges.categories.canPostTopic(req.uid),diff --git a/src/controllers/search.js b/src/controllers/search.jsindex 04fa2c0177..c0d4ed907a 100644--- a/src/controllers/search.js+++ b/src/controllers/search.js@@ -1,7 +1,6 @@'use strict';-const validator = require('validator');const _ = require('lodash');const db = require('../database');@@ -89,7 +88,7 @@ searchController.search = async function (req, res, next) {searchData.pagination = pagination.create(page, searchData.pageCount, req.query);searchData.multiplePages = searchData.pageCount > 1;- searchData.search_query = validator.escape(String(req.query.term || ''));+ searchData.search_query = String(req.query.term || '');searchData.term = req.query.term;if (searchOnly) {@@ -101,11 +100,13 @@ searchController.search = async function (req, res, next) {searchData.showAsTopics = req.query.showAs === 'topics';searchData.title = '[[global:header.search]]';if (Array.isArray(data.categories)) {- searchData.selectedCids = data.categories.map(cid => validator.escape(String(cid)));+ searchData.selectedCids = data.categories.map(cid => String(cid));if (!searchData.selectedCids.includes('all') && searchData.selectedCids.length) {searchData.selectedCategory = { cid: 0 };}}+ const userFilter = await getSelectedUsers(data.postedBy);+ searchData.userFilterSelected = userFilter;searchData.filters = {replies: {@@ -114,18 +115,18 @@ searchController.search = async function (req, res, next) {},time: {active: !!(data.timeFilter && data.timeRange),- label: `search:time-${data.timeFilter}-than-${data.timeRange}`,+ label: `[[search:time-${data.timeFilter}-than-${data.timeRange}]]`,},sort: {active: !!(data.sortBy && data.sortBy !== 'relevance'),- label: `search:sort-by-${data.sortBy}-${data.sortDirection}`,+ label: `[[search:sort-by-${data.sortBy}-${data.sortDirection}]]`,},users: {- active: !!data.postedBy,+ active: !!userFilter.length,label: tx.compile('search:posted-by-usernames',- (Array.isArray(data.postedBy) ? data.postedBy : [])- .map(u => validator.escape(String(u))).join(', ')+ (Array.isArray(userFilter) ? userFilter : [])+ .map(u => tx.escape(String(u.username))).join(', ')),},tags: {@@ -133,7 +134,7 @@ searchController.search = async function (req, res, next) {label: tx.compile('search:tags-x',(Array.isArray(data.hasTags) ? data.hasTags : [])- .map(u => validator.escape(String(u))).join(', ')+ .map(u => tx.escape(String(u))).join(', ')),},categories: {@@ -143,7 +144,7 @@ searchController.search = async function (req, res, next) {},};- searchData.userFilterSelected = await getSelectedUsers(data.postedBy);+searchData.tagFilterSelected = getSelectedTags(data.hasTags);searchData.searchDefaultSortBy = meta.config.searchDefaultSortBy || '';searchData.searchDefaultIn = meta.config.searchDefaultIn || 'titlesposts';@@ -193,7 +194,8 @@ async function getSelectedUsers(postedBy) {return [];}const uids = await user.getUidsByUsernames(postedBy);- return await user.getUsersFields(uids, ['username', 'userslug', 'picture']);+ const userData = await user.getUsersFields(uids, ['username', 'userslug', 'picture']);+ return userData.filter(u => u && u.userslug);}function getSelectedTags(hasTags) {diff --git a/src/controllers/tags.js b/src/controllers/tags.jsindex 03014dfa3d..01d5477154 100644--- a/src/controllers/tags.js+++ b/src/controllers/tags.js@@ -1,6 +1,5 @@'use strict';-const validator = require('validator');const nconf = require('nconf');const meta = require('../meta');@@ -11,30 +10,29 @@ const privileges = require('../privileges');const pagination = require('../pagination');const utils = require('../utils');const helpers = require('./helpers');-const translator = require('../translator');+const tx = require('../translator');const tagsController = module.exports;const url = nconf.get('url');tagsController.getTag = async function (req, res) {- const escapedTag = translator.escape(- validator.escape(utils.cleanUpTag(req.params.tag, meta.config.maximumTagLength))- );-+ const escapedTag = utils.cleanUpTag(req.params.tag, meta.config.maximumTagLength);const page = parseInt(req.query.page, 10) || 1;const cid = Array.isArray(req.query.cid) || !req.query.cid ? req.query.cid : [req.query.cid];const templateData = {topics: [],tag: escapedTag,- breadcrumbs: helpers.buildBreadcrumbs([{ text: '[[tags:tags]]', url: '/tags' }, { text: escapedTag }]),- title: `[[pages:tag, ${escapedTag}]]`,+ breadcrumbs: helpers.buildBreadcrumbs([+ { text: '[[tags:tags]]', url: '/tags' }, { text: tx.escape(escapedTag) },+ ]),+ title: tx.compile('pages:tag', escapedTag),};const [settings, cids, categoryData, canPost, isPrivileged, rssToken, isFollowing] = await Promise.all([user.getSettings(req.uid),cid || categories.getCidsByPrivilege('categories:cid', req.uid, 'topics:read'),- helpers.getSelectedCategory(cid, req.uid),+ helpers.getSelectedCategory(cid),privileges.categories.canPostTopic(req.uid),user.isPrivileged(req.uid),user.auth.getFeedToken(req.uid),@@ -62,12 +60,10 @@ tagsController.getTag = async function (req, res) {{name: 'title',content: escapedTag,- noEscape: true,},{property: 'og:title',content: escapedTag,- noEscape: true,},];diff --git a/src/controllers/top.js b/src/controllers/top.jsindex c19fb972f3..8e1b5dd4b3 100644--- a/src/controllers/top.js+++ b/src/controllers/top.js@@ -2,7 +2,6 @@'use strict';const nconf = require('nconf');-const validator = require('validator');const helpers = require('./helpers');const recentController = require('./recent');@@ -21,7 +20,7 @@ topController.get = async function (req, res, next) {if (!data['feeds:disableRSS'] && data.rssFeedUrl) {const feedQs = data.rssFeedUrl.split('?')[1];- data.rssFeedUrl = `${nconf.get('relative_path')}/top/${validator.escape(String(req.query.term || 'alltime'))}.rss`;+ data.rssFeedUrl = `${nconf.get('relative_path')}/top/${(req.query.term || 'alltime')}.rss`;if (req.loggedIn) {data.rssFeedUrl += `?${feedQs}`;}diff --git a/src/controllers/topics.js b/src/controllers/topics.jsindex 4d5582d2f7..f92e83dc79 100644--- a/src/controllers/topics.js+++ b/src/controllers/topics.js@@ -137,7 +137,7 @@ topicsController.get = async function getTopic(req, res, next) {const [author, crossposts] = await Promise.all([user.getUserFields(topicData.uid, ['username', 'userslug']),topics.crossposts.get(topicData.tid),- buildBreadcrumbs(topicData, settings.userLang),+ buildBreadcrumbs(topicData),addOldCategory(topicData, userPrivileges, settings.userLang),addTags(topicData, req, res, currentPage, postAtIndex),topics.increaseViewCount(req, tid),@@ -211,8 +211,7 @@ async function markAsRead(req, tid) {}}-async function buildBreadcrumbs(topicData, userLang) {- await helpers.translateCategoryData([topicData.category], userLang);+async function buildBreadcrumbs(topicData) {const breadcrumbs = [{text: topicData.category.name,@@ -220,10 +219,10 @@ async function buildBreadcrumbs(topicData, userLang) {cid: topicData.category.cid,},{- text: topicData.title,+ text: translator.escape(topicData.title),},];- const parentCrumbs = await helpers.buildCategoryBreadcrumbs(topicData.category.parentCid, userLang);+ const parentCrumbs = await helpers.buildCategoryBreadcrumbs(topicData.category.parentCid);topicData.breadcrumbs = parentCrumbs.concat(breadcrumbs);}@@ -232,7 +231,7 @@ async function addOldCategory(topicData, userPrivileges, userLang) {topicData.oldCategory = await categories.getCategoryFields(topicData.oldCid, ['cid', 'name', 'icon', 'bgColor', 'color', 'slug']);- topicData.oldCategory.name = await helpers.translateEscapedValue(topicData.oldCategory.name, userLang);+ topicData.oldCategory.name = await translator.translate(topicData.oldCategory.name, userLang);}}@@ -242,17 +241,14 @@ async function addTags(topicData, req, res, currentPage, postAtIndex) {mainPost = await posts.getPostData(topicData.mainPid);}- const title = getTitleFromTopic(topicData);res.locals.metaTags = [{name: 'title',- content: title,- noEscape: true,+ content: topicData.title,},{property: 'og:title',- content: title,- noEscape: true,+ content: topicData.title,},{property: 'og:type',@@ -278,12 +274,10 @@ async function addTags(topicData, req, res, currentPage, postAtIndex) {{name: 'description',content: description,- noEscape: true,},{property: 'og:description',content: description,- noEscape: true,},);}@@ -295,7 +289,6 @@ async function addTags(topicData, req, res, currentPage, postAtIndex) {{rel: 'canonical',href: `${url}/topic/${topicData.slug}${page}`,- noEscape: true,},];@@ -331,22 +324,13 @@ async function addTags(topicData, req, res, currentPage, postAtIndex) {}}-function getTitleFromTopic(topic) {- // titleRaw is trasnslator.escape'd- const title = translator.unescape(String(topic.titleRaw));- return translator.escape(utils.escapeHTML(title));-}-function getDescriptionFromPost(post) {let description = '';if (post && post.content) {- // posts/parse.js calls translator.escape on post.content, unescape first then re-escape after stripping html tags- const content = translator.unescape(String(post.content));- description = utils.stripHTMLTags(utils.decodeHTMLEntities(content)).trim();+ description = utils.stripHTMLTags(utils.decodeHTMLEntities(post.content)).trim();if (description.length > 160) {description = `${description.slice(0, 157)}...`;}- description = translator.escape(utils.escapeHTML(description));description = description.replace(/\n/g, ' ').trim();}return description;diff --git a/src/controllers/unread.js b/src/controllers/unread.jsindex b993d8c569..871f3252c0 100644--- a/src/controllers/unread.js+++ b/src/controllers/unread.js@@ -19,7 +19,7 @@ unreadController.get = async function (req, res) {const filter = req.query.filter || '';const [categoryData, tagData, userSettings, canPost, isPrivileged] = await Promise.all([- helpers.getSelectedCategory(cid, req.uid),+ helpers.getSelectedCategory(cid),helpers.getSelectedTag(tag),user.getSettings(req.uid),privileges.categories.canPostTopic(req.uid),diff --git a/src/controllers/uploads.js b/src/controllers/uploads.jsindex c0023f3265..8aea5aa7fa 100644--- a/src/controllers/uploads.js+++ b/src/controllers/uploads.js@@ -4,7 +4,6 @@ const path = require('path');const { fileTypeFromFile } = require('file-type');const mime = require('mime').default;const nconf = require('nconf');-const validator = require('validator');const user = require('../user');const meta = require('../meta');@@ -18,14 +17,8 @@ const helpers = require('./helpers');const uploadsController = module.exports;uploadsController.upload = async function (req, res, filesIterator) {- let files;- try {- files = req.files;- } catch (e) {- return helpers.formatApiResponse(400, res);- }+ const { files } = req;- // These checks added because of odd behaviour by request: https://github.com/request/request/issues/2445if (!Array.isArray(files)) {return helpers.formatApiResponse(500, res, new Error('[[error:invalid-file]]'));}@@ -201,7 +194,7 @@ async function saveFileToLocal(uid, folder, uploadedFile) {const name = uploadedFile.name || 'upload';const extension = path.extname(name) || '';- const filename = `${Date.now()}-${validator.escape(name.slice(0, -extension.length)).slice(0, 255)}${extension}`;+ const filename = `${Date.now()}-${name.slice(0, -extension.length).slice(0, 255)}${extension}`;const upload = await file.saveFileToLocal(filename, folder, uploadedFile.path);const storedFile = {diff --git a/src/emailer.js b/src/emailer.jsindex 876d077a1a..c8509bf57f 100644--- a/src/emailer.js+++ b/src/emailer.js@@ -16,6 +16,7 @@ const User = require('./user');const Plugins = require('./plugins');const meta = require('./meta');const translator = require('./translator');+const languages = require('./languages');const pubsub = require('./pubsub');const file = require('./file');@@ -268,7 +269,7 @@ Emailer.send = async (template, uid, params) => {params.uid = uid;params.username = userData.username;params.displayname = userData.displayname;- params.rtl = await translator.translate('[[language:dir]]', userSettings.userLang) === 'rtl';+ params.rtl = translator.languageDirection(userSettings.userLang) === 'rtl';const result = await Plugins.hooks.fire('filter:email.cancel', {cancel: false, // set to true in plugin to cancel sending email@@ -376,7 +377,8 @@ Emailer.sendViaFallback = async (data) => {};Emailer.renderAndTranslate = async (template, params, lang) => {- const html = await app.renderAsync(`emails/${template}`, params);+ const _i18n = languages.getFull(lang);+ const html = await app.renderAsync(`emails/${template}`, { ...params, _i18n: _i18n });return await translator.translate(html, lang);};diff --git a/src/events.js b/src/events.jsindex f189a4e377..df67223e46 100644--- a/src/events.js+++ b/src/events.js@@ -1,7 +1,6 @@'use strict';-const validator = require('validator');const _ = require('lodash');const db = require('./database');@@ -201,11 +200,6 @@ events.getEventsByEventIds = async (eids) => {await addUserData(eventsData, 'uid', 'user');await addUserData(eventsData, 'targetUid', 'targetUser');eventsData.forEach((event) => {- Object.keys(event).forEach((key) => {- if (typeof event[key] === 'string') {- event[key] = validator.escape(String(event[key] || ''));- }- });const e = utils.merge(event);e.eid = undefined;e.uid = undefined;diff --git a/src/flags.js b/src/flags.jsindex f6bcfa0cd1..28c6852962 100644--- a/src/flags.js+++ b/src/flags.js@@ -2,7 +2,6 @@const _ = require('lodash');const winston = require('winston');-const validator = require('validator');const activitypub = require('./activitypub');const db = require('./database');@@ -382,7 +381,6 @@ async function modifyNotes(notes) {const userData = await user.getUsersFields(uids, ['username', 'userslug', 'picture']);return notes.map((note, idx) => {note.user = userData[idx];- note.content = validator.escape(note.content);return note;});}@@ -552,7 +550,7 @@ Flags.getReports = async function (flagId) {const [reports, uids] = payload.reduce((memo, cur) => {const value = cur.value.split(';');memo[1].push(value.shift());- cur.value = validator.escape(String(value.join(';')));+ cur.value = value.join(';');memo[0].push(cur);return memo;@@ -695,7 +693,6 @@ Flags.canFlag = async function (type, id, uid, skipLimitCheck = false) {Flags.getTarget = async function (type, id, uid) {if (type === 'user') {const userData = await user.getUserData(id);- userData.aboutme = validator.escape(String(userData.aboutme));return userData && userData.uid ? userData : {};}if (type === 'post') {@@ -757,7 +754,7 @@ Flags.update = async function (flagId, uid, changeset) {}const notifObj = await notifications.create({type: 'my-flags',- bodyShort: `[[notifications:flag-assigned-to-you, ${flagId}]]`,+ bodyShort: translator.compile(`[[notifications:flag-assigned-to-you, ${flagId}]]`),path: `/flags/${flagId}`,nid: `flags:assign:${flagId}:uid:${assigneeId}`,from: uid,@@ -928,21 +925,21 @@ Flags.notify = async function (flagObj, uid, notifySelf = false) {]);let uids = admins.concat(globalMods);let notifObj;-- const { displayname } = flagObj.reports[flagObj.reports.length - 1].reporter;-+ const { reports } = flagObj;+ const repoterUid = reports.length ? reports[reports.length - 1]?.reporter : 0;+ const displayname = await user.getNotificationDisplayname(repoterUid);if (flagObj.type === 'post') {+ const tid = await posts.getPostField(flagObj.targetId, 'tid');const [title, cid] = await Promise.all([- topics.getTitleByPid(flagObj.targetId),+ topics.getNotificationTitle(tid),posts.getCidByPid(flagObj.targetId),]);const modUids = await categories.getModeratorUids([cid]);- const titleEscaped = utils.decodeHTMLEntities(title);notifObj = await notifications.create({type: 'new-post-flag',- bodyShort: translator.compile('notifications:user-flagged-post-in', displayname, titleEscaped),+ bodyShort: translator.compile('notifications:user-flagged-post-in', displayname, title),bodyLong: String(flagObj.target?.content || ''),pid: flagObj.targetId,path: `/flags/${flagObj.flagId}`,@@ -953,10 +950,10 @@ Flags.notify = async function (flagObj, uid, notifySelf = false) {});uids = uids.concat(modUids[0]);} else if (flagObj.type === 'user') {- const targetDisplayname = flagObj.target && flagObj.target.displayname ? flagObj.target.displayname : '[[global:guest]]';+ const targetDisplayname = await user.getNotificationDisplayname(flagObj.targetId);notifObj = await notifications.create({type: 'new-user-flag',- bodyShort: `[[notifications:user-flagged-user, ${displayname}, ${targetDisplayname}]]`,+ bodyShort: translator.compile('notifications:user-flagged-user', displayname, targetDisplayname),bodyLong: await plugins.hooks.fire('filter:parse.raw', String(flagObj.description || '')),path: `/flags/${flagObj.flagId}`,nid: `flag:user:${flagObj.targetId}:${uid}`,@@ -1008,7 +1005,7 @@ async function mergeBanMuteHistory(history, uids, params) {meta: [{key: params.label,- value: validator.escape(String(cur.reason || params.reasonDefault)),+ value: cur.reason || params.reasonDefault,labelClass: 'danger',},{diff --git a/src/groups/data.js b/src/groups/data.jsindex e585b653b5..a1d34c0682 100644--- a/src/groups/data.js+++ b/src/groups/data.js@@ -1,12 +1,10 @@'use strict';-const validator = require('validator');const nconf = require('nconf');const db = require('../database');const plugins = require('../plugins');const utils = require('../utils');-const translator = require('../translator');const coverPhoto = require('../coverPhoto');const slugify = require('../slugify');@@ -40,7 +38,7 @@ module.exports = function (Groups) {});}- groupData.forEach(group => modifyGroup(group, fields));+ await modifyGroups(groupData, fields);const results = await plugins.hooks.fire('filter:groups.get', { groups: groupData });return results.groups;@@ -70,77 +68,77 @@ module.exports = function (Groups) {plugins.hooks.fire('action:group.set', { field: field, value: value, type: 'set' });};- function modifyGroup(group, fields) {- if (group) {- const hasField = utils.createFieldChecker(fields);-- if (hasField('private')) {- // Default to private if not set, as groups are private by default- group.private = ([null, undefined].includes(group.private)) ? 1 : group.private;- }-- db.parseIntFields(group, intFields, fields);-- escapeGroupData(group, hasField);-- if (hasField('slug') && group.name && !group.slug) {- group.slug = slugify(group.name);- }-- if (hasField('labelColor')) {- group.labelColor = validator.escape(String(group.labelColor || '#000000'));- }-- if (hasField('textColor')) {- group.textColor = validator.escape(String(group.textColor || '#ffffff'));- }-- if (hasField('icon')) {- group.icon = validator.escape(String(group.icon || ''));- }-- if (hasField('createtime')) {- group.createtimeISO = utils.toISOString(group.createtime);- }-- if (hasField('memberPostCids')) {- group.memberPostCids = group.memberPostCids || '';- group.memberPostCidsArray = group.memberPostCids.split(',').map(cid => parseInt(cid, 10)).filter(Boolean);+ async function modifyGroups(groups, fields) {+ await Promise.all(groups.map(async (group) => {+ if (group) {+ const hasField = utils.createFieldChecker(fields);++ if (hasField('private')) {+ // Default to private if not set, as groups are private by default+ group.private = ([null, undefined].includes(group.private)) ? 1 : group.private;+ }++ db.parseIntFields(group, intFields, fields);++ if (hasField('name')) {+ group.nameEncoded = encodeURIComponent(group.name);+ group.displayName = String(group.name);+ }++ if (hasField('description')) {+ group.description = String(group.description || '');+ if (hasField('descriptionParsed')) {+ group.descriptionParsed = await plugins.hooks.fire('filter:parse.raw', group.description);+ }+ }++ if (hasField('userTitle')) {+ group.userTitle = String(group.userTitle || '');+ }++ if (hasField('slug') && group.name && !group.slug) {+ group.slug = slugify(group.name);+ }++ if (hasField('labelColor')) {+ group.labelColor = String(group.labelColor || '#000000');+ }++ if (hasField('textColor')) {+ group.textColor = String(group.textColor || '#ffffff');+ }++ if (hasField('icon')) {+ group.icon = String(group.icon || '');+ }++ if (hasField('createtime')) {+ group.createtimeISO = utils.toISOString(group.createtime);+ }++ if (hasField('memberPostCids')) {+ group.memberPostCids = group.memberPostCids || '';+ group.memberPostCidsArray = group.memberPostCids.split(',').map(cid => parseInt(cid, 10)).filter(Boolean);+ }++ if (hasField('cover:thumb:url')) {+ group['cover:thumb:url'] = group['cover:thumb:url'] || group['cover:url'];++ group['cover:thumb:url'] = group['cover:thumb:url'] ?+ prependRelativePath(group['cover:thumb:url']) :+ coverPhoto.getDefaultGroupCover(group.name);+ }++ if (hasField('cover:url')) {+ group['cover:url'] = group['cover:url'] ?+ prependRelativePath(group['cover:url']) :+ coverPhoto.getDefaultGroupCover(group.name);+ }++ if (hasField('cover:position')) {+ group['cover:position'] = String(group['cover:position'] || '50% 50%');+ }}-- if (hasField('cover:thumb:url')) {- group['cover:thumb:url'] = group['cover:thumb:url'] || group['cover:url'];-- group['cover:thumb:url'] = group['cover:thumb:url'] ?- prependRelativePath(group['cover:thumb:url']) :- coverPhoto.getDefaultGroupCover(group.name);- }-- if (hasField('cover:url')) {- group['cover:url'] = group['cover:url'] ?- prependRelativePath(group['cover:url']) :- coverPhoto.getDefaultGroupCover(group.name);- }-- if (hasField('cover:position')) {- group['cover:position'] = validator.escape(String(group['cover:position'] || '50% 50%'));- }- }- }-- function escapeGroupData(group, hasField) {- if (group) {- if (hasField('name')) {- group.nameEncoded = encodeURIComponent(group.name);- group.displayName = validator.escape(String(group.name));- }- if (hasField('description')) {- group.description = validator.escape(String(group.description || ''));- }- if (hasField('userTitle')) {- group.userTitle = validator.escape(String(group.userTitle || ''));- group.userTitleEscaped = translator.escape(group.userTitle);- }- }+ }));}};diff --git a/src/groups/index.js b/src/groups/index.jsindex 9829a1cc6d..1f3d824839 100644--- a/src/groups/index.js+++ b/src/groups/index.js@@ -6,7 +6,6 @@ const plugins = require('../plugins');const privileges = require('../privileges');const slugify = require('../slugify');const cache = require('../cache');-const translator = require('../translator');const Groups = module.exports;@@ -177,9 +176,6 @@ Groups.get = async function (groupName, options) {]));}-- const descriptionParsed = await plugins.hooks.fire('filter:parse.raw', String(groupData.description || ''));- groupData.descriptionParsed = translator.escape(descriptionParsed);groupData.members = members;groupData.membersNextStart = stop + 1;groupData.isMember = isMember;diff --git a/src/groups/invite.js b/src/groups/invite.jsindex e5b7c7a1ca..2e49eb1baa 100644--- a/src/groups/invite.js+++ b/src/groups/invite.js@@ -7,6 +7,7 @@ const user = require('../user');const slugify = require('../slugify');const plugins = require('../plugins');const notifications = require('../notifications');+const tx = require('../translator');module.exports = function (Groups) {Groups.getPending = async function (groupName) {@@ -19,13 +20,13 @@ module.exports = function (Groups) {Groups.requestMembership = async function (groupName, uid) {await inviteOrRequestMembership(groupName, uid, 'request');- const { displayname } = await user.getUserFields(uid, ['username']);+ const displayname = await user.getNotificationDisplayname(uid);const [notification, owners] = await Promise.all([notifications.create({type: 'group-request-membership',- bodyShort: `[[groups:request.notification-title, ${displayname}]]`,- bodyLong: `[[groups:request.notification-text, ${displayname}, ${groupName}]]`,+ bodyShort: tx.compile('groups:request.notification-title', displayname),+ bodyLong: tx.compile('groups:request.notification-text', displayname, tx.escape(groupName)),nid: `group:${groupName}:uid:${uid}:request`,path: `/groups/${slugify(groupName)}`,from: uid,@@ -42,7 +43,7 @@ module.exports = function (Groups) {const notification = await notifications.create({type: 'group-invite',- bodyShort: `[[groups:membership.accept.notification-title, ${groupName}]]`,+ bodyShort: tx.compile('groups:membership.accept.notification-title', tx.escape(groupName)),nid: `group:${groupName}:uid:${uid}:invite-accepted`,path: `/groups/${slugify(groupName)}`,icon: 'fa-users',@@ -71,7 +72,7 @@ module.exports = function (Groups) {const notificationData = await Promise.all(uids.map(uid => notifications.create({type: 'group-invite',- bodyShort: `[[groups:invited.notification-title, ${groupName}]]`,+ bodyShort: tx.compile('groups:invited.notification-title', tx.escape(groupName)),nid: `group:${groupName}:uid:${uid}:invite`,path: `/groups/${slugify(groupName)}`,icon: 'fa-users',diff --git a/src/groups/update.js b/src/groups/update.jsindex caaedf38e4..30d3a746f9 100644--- a/src/groups/update.js+++ b/src/groups/update.js@@ -250,7 +250,7 @@ module.exports = function (Groups) {navItem.groups.splice(navItem.groups.indexOf(oldName), 1, newName);}});- navigation.unescapeFields(navItems);+await navigation.save(navItems);}diff --git a/src/languages.js b/src/languages.jsindex 655b83147e..6b45706748 100644--- a/src/languages.js+++ b/src/languages.js@@ -84,7 +84,7 @@ Languages.userTimeagoCode = async function (userLang) {return '';};-Languages.getFull = async function (language) {+Languages.getFull = function (language) {const pathToLanguageFile = path.join(languagesPath, language, 'full.json');if (!pathToLanguageFile.startsWith(languagesPath)) {throw new Error('[[error:invalid-path]]');diff --git a/src/messaging/create.js b/src/messaging/create.jsindex f6a3c840a8..23728fd9ee 100644--- a/src/messaging/create.js+++ b/src/messaging/create.js@@ -7,6 +7,7 @@ const plugins = require('../plugins');const db = require('../database');const user = require('../user');const utils = require('../utils');+const tx = require('../translator');module.exports = function (Messaging) {Messaging.sendMessage = async (data) => {@@ -62,8 +63,9 @@ module.exports = function (Messaging) {if (data.toMid) {message.toMid = data.toMid;}- if (data.system) {+ if (data.system && data.type) {message.system = data.system;+ message.type = data.type;}if (data.ip) {@@ -107,12 +109,19 @@ module.exports = function (Messaging) {return messages[0];};- Messaging.addSystemMessage = async (content, uid, roomId) => {+ Messaging.addSystemMessage = async (type, uid, roomId, txArgs = []) => {+ // content is actually the type of system message+ // 'user-join', 'user-leave', 'room-rename', etc.+ const displayname = await user.getNotificationDisplayname(uid);+ const now = Date.now();+ txArgs = [displayname, new Date(now).toISOString(), ...txArgs];const message = await Messaging.addMessage({- content: content,+ type: type,+ content: tx.compile(`modules:chat.system.${type}`, ...txArgs),uid: uid,roomId: roomId,system: 1,+ timestamp: now,});Messaging.notifyUsersInRoom(uid, roomId, message);};diff --git a/src/messaging/data.js b/src/messaging/data.jsindex 2cdfa689dd..e13043a944 100644--- a/src/messaging/data.js+++ b/src/messaging/data.js@@ -1,14 +1,12 @@'use strict';const _ = require('lodash');-const validator = require('validator');const db = require('../database');const user = require('../user');const posts = require('../posts');const utils = require('../utils');const plugins = require('../plugins');-const translator = require('../translator');const intFields = ['mid', 'timestamp', 'edited', 'fromuid', 'roomId', 'deleted', 'system'];@@ -148,7 +146,7 @@ module.exports = function (Messaging) {await Promise.all(parentMessages.map(async (parentMsg) => {if (parentMsg.deleted && parentMsg.fromuid !== parseInt(uid, 10)) {- parentMsg.content = `<p>[[modules:chat.message-deleted]]</p>`;+ parentMsg.content = `[[modules:chat.message-deleted]]`;return;}const foundMsg = messages.find(msg => parseInt(msg.mid, 10) === parseInt(parentMsg.mid, 10));@@ -178,7 +176,7 @@ module.exports = function (Messaging) {async function parseMessages(messages, uid, roomId, isNew) {await Promise.all(messages.map(async (msg) => {if (msg.deleted && !msg.isOwner) {- msg.content = `<p>[[modules:chat.message-deleted]]</p>`;+ msg.content = `[[modules:chat.message-deleted]]`;return;}msg.content = await parseMessage(msg, uid, roomId, isNew);@@ -186,7 +184,7 @@ module.exports = function (Messaging) {}async function parseMessage(message, uid, roomId, isNew) {if (message.system) {- return translator.escape(validator.escape(String(message.content)));+ return message.content;} else if (!utils.isNumber(message.mid)) {return posts.sanitize(message.content);}diff --git a/src/messaging/index.js b/src/messaging/index.jsindex 25020f483c..d9c07ec184 100644--- a/src/messaging/index.js+++ b/src/messaging/index.js@@ -1,7 +1,6 @@'use strict';const _ = require('lodash');-const validator = require('validator');const nconf = require('nconf');const db = require('../database');const user = require('../user');@@ -11,7 +10,7 @@ const plugins = require('../plugins');const meta = require('../meta');const activitypub = require('../activitypub');const utils = require('../utils');-const translator = require('../translator');+const tx = require('../translator');const cache = require('../cache');const relative_path = nconf.get('relative_path');@@ -90,8 +89,7 @@ async function canGet(hook, callerUid, uid) {}Messaging.parse = async (message, fromuid, uid, roomId, isNew) => {- let parsed = await plugins.hooks.fire('filter:parse.raw', String(message || ''));- parsed = translator.escape(parsed);+ const parsed = await plugins.hooks.fire('filter:parse.raw', String(message || ''));let messageData = {message: message,parsed: parsed,@@ -201,7 +199,6 @@ Messaging.getRecentChats = async (callerUid, uid, start, stop) => {unread: db.isSortedSetMembers(`uid:${uid}:chat:rooms:unread`, roomIds),users: getUsers(roomIds, uid),teasers: Messaging.getTeasers(uid, roomIds),- settings: user.getSettings(uid),});results.roomData = await modifyChatRooms(uid, results);@@ -227,7 +224,6 @@ Messaging.searchRecentChats = async (callerUid, uid, query) => {unread: db.isSortedSetMembers(`uid:${uid}:chat:rooms:unread`, roomIds),users: getUsers(roomIds, uid),teasers: Messaging.getTeasers(uid, roomIds),- settings: user.getSettings(uid),});results.roomData = await modifyChatRooms(uid, results);@@ -273,7 +269,7 @@ async function modifyChatRooms(uid, results) {room.users = room.users.filter(user => user && (parseInt(user.uid, 10) || activitypub.helpers.isUri(user.uid)));room.lastUser = room.users[0];room.usernames = Messaging.generateUsernames(room, uid);- room.chatWithMessage = await Messaging.generateChatWithMessage(room, uid, results.settings.userLang);+ room.chatWithMessage = await Messaging.generateChatWithMessage(room, uid);}}));@@ -282,39 +278,52 @@ async function modifyChatRooms(uid, results) {Messaging.generateUsernames = function (room, excludeUid) {const users = room.users.filter(u => u && parseInt(u.uid, 10) !== excludeUid);- const usernames = users.map(u => u.displayname);+ const usernames = users.map(u => tx.escape(u.displayname));if (users.length > 3) {- return translator.compile(+ return tx.compile('modules:chat.usernames-and-x-others',- usernames.slice(0, 2).join(', '),- room.userCount - 2+ ...[usernames.slice(0, 2), room.userCount - 2]);}return usernames.join(', ');};-Messaging.generateChatWithMessage = async function (room, callerUid, userLang) {- const users = room.users.filter(u => u && parseInt(u.uid, 10) !== callerUid);- const usernames = users.map(u => (utils.isNumber(u.uid) ?- `<a href="${relative_path}/uid/${u.uid}">${validator.escape(String(u.displayname))}</a>` :- `<a href="${relative_path}/user/${u.username}">${validator.escape(String(u.displayname))}</a>`));- let compiled;+Messaging.generateChatWithMessage = async function (room, callerUid) {+ let users = room.users.filter(u => u && String(u.uid) !== String(callerUid));if (!users.length) {return '[[modules:chat.no-users-in-room]]';}- if (users.length > 3) {- compiled = translator.compile(+ const moreThan3 = users.length > 3;+ users = moreThan3 ? users.slice(0, 2) : users;+ const userData = users.map((u) => {+ const href = utils.isNumber(u.uid) ?+ `${relative_path}/uid/${u.uid}` :+ `${relative_path}/user/${u.username}`;++ return {+ href,+ displayname: String(u.displayname),+ };+ });++ let compiled;+ const txArgs = [];+ userData.forEach((userData) =>{+ txArgs.push(userData.href, tx.escape(userData.displayname));+ });+ if (moreThan3) {+ txArgs.push(room.userCount - 2);+ compiled = tx.compile('modules:chat.chat-with-usernames-and-x-others',- usernames.slice(0, 2).join(', '),- room.userCount - 2+ ...txArgs);} else {- compiled = translator.compile(- 'modules:chat.chat-with-usernames',- usernames.join(', '),+ compiled = tx.compile(+ `modules:chat.chat-with-usernames-${userData.length}`,+ ...txArgs);}- return utils.decodeHTMLEntities(await translator.translate(compiled, userLang));+ return compiled;};Messaging.getTeaser = async (uid, roomId) => {@@ -349,9 +358,7 @@ Messaging.getTeasers = async (uid, roomIds) => {if (userMap[teaser.fromuid]) {teaser.user = userMap[teaser.fromuid];}- teaser.content = translator.escape(validator.escape(- String(utils.stripHTMLTags(utils.decodeHTMLEntities(teaser.content)))- ));+ teaser.content = utils.stripHTMLTags(utils.decodeHTMLEntities(teaser.content));teaser.roomId = parseInt(roomId, 10);const payload = await plugins.hooks.fire('filter:messaging.getTeaser', { teaser: teaser });return payload.teaser;diff --git a/src/messaging/notifications.js b/src/messaging/notifications.jsindex a4c1fe8243..6da92ef21c 100644--- a/src/messaging/notifications.js+++ b/src/messaging/notifications.js@@ -11,6 +11,7 @@ const io = require('../socket.io');const activitypub = require('../activitypub');const plugins = require('../plugins');const utils = require('../utils');+const tx = require('../translator');module.exports = function (Messaging) {Messaging.setUserNotificationSetting = async (uid, roomId, value) => {@@ -41,45 +42,45 @@ module.exports = function (Messaging) {};Messaging.notifyUsersInRoom = async (fromUid, roomId, messageObj) => {- const isPublic = parseInt(await db.getObjectField(`chat:room:${roomId}`, 'public'), 10) === 1;+ try {+ const isPublic = parseInt(await db.getObjectField(`chat:room:${roomId}`, 'public'), 10) === 1;- let data = {- roomId: roomId,- fromUid: fromUid,- message: messageObj,- public: isPublic,- };- data = await plugins.hooks.fire('filter:messaging.notify', data);- if (!data) {- return;- }+ let data = {+ roomId: roomId,+ fromUid: fromUid,+ message: messageObj,+ public: isPublic,+ };+ data = await plugins.hooks.fire('filter:messaging.notify', data);+ if (!data) {+ return;+ }- // delivers full message to all online users in roomId- io.in(`chat_room_${roomId}`).emit('event:chats.receive', data);+ // delivers full message to all online users in roomId+ io.in(`chat_room_${roomId}`).emit('event:chats.receive', data);- const unreadData = { roomId, fromUid, public: isPublic };- if (isPublic && !messageObj.system) {- // delivers unread public msg to all online users on the chats page- io.in(`chat_room_public_${roomId}`).emit('event:chats.public.unread', unreadData);- }- if (messageObj.system) {- return;- }+ const unreadData = { roomId, fromUid, public: isPublic };+ if (isPublic && !messageObj.system) {+ // delivers unread public msg to all online users on the chats page+ io.in(`chat_room_public_${roomId}`).emit('event:chats.public.unread', unreadData);+ }+ if (messageObj.system) {+ return;+ }- // push unread count only for private rooms- if (!isPublic) {- const uids = await Messaging.getAllUidsInRoomFromSet(`chat:room:${roomId}:uids:online`);- unreadData.teaser = {- content: validator.escape(- String(utils.stripHTMLTags(utils.decodeHTMLEntities(messageObj.content)))- ),- user: messageObj.fromUser,- timestampISO: messageObj.timestampISO,- };- Messaging.pushUnreadCount(uids, unreadData);- }+ // push unread count only for private rooms+ if (!isPublic) {+ const uids = await Messaging.getAllUidsInRoomFromSet(`chat:room:${roomId}:uids:online`);+ unreadData.teaser = {+ content: validator.escape(+ utils.stripHTMLTags(utils.decodeHTMLEntities(messageObj.content))+ ),+ user: messageObj.fromUser,+ timestampISO: messageObj.timestampISO,+ };+ Messaging.pushUnreadCount(uids, unreadData);+ }- try {await sendNotification(fromUid, roomId, messageObj);if (!isPublic && utils.isNumber(fromUid)) {setImmediate(() => {@@ -116,15 +117,19 @@ module.exports = function (Messaging) {});if (uidsToNotify.length) {- const { displayname } = messageObj.fromUser;- const isGroupChat = await Messaging.isGroupChat(roomId);- const roomName = roomData.roomName || `[[modules:chat.room-id, ${roomId}]]`;+ const [displayname, isGroupChat] = await Promise.all([+ user.getNotificationDisplayname(fromUid),+ Messaging.isGroupChat(roomId),+ ]);+ const roomName = tx.escape(roomData.roomName) || `[[modules:chat.room-id, ${roomId}]]`;const notifData = {type: isGroupChat ? 'new-group-chat' : 'new-chat',subject: roomData.roomName ?- `[[email:notif.chat.new-message-from-user-in-room, ${displayname}, ${roomName}]]` :- `[[email:notif.chat.new-message-from-user, ${displayname}]]`,- bodyShort: isGroupChat || roomData.roomName ? `[[notifications:new-message-in, ${roomName}]]` : `[[notifications:new-message-from, ${displayname}]]`,+ tx.compile('email:notif.chat.new-message-from-user-in-room', displayname, roomName) :+ tx.compile('email:notif.chat.new-message-from-user', displayname),+ bodyShort: isGroupChat || roomData.roomName ?+ tx.compile('notifications:new-message-in', roomName) :+ tx.compile('notifications:new-message-from', displayname),bodyLong: messageObj.content,nid: `chat_${roomId}_${fromUid}_${Date.now()}`,mergeId: `new-chat|${roomId}`, // as roomId is the differentiator, no distinction between direct vs. group req'd.@@ -137,8 +142,8 @@ module.exports = function (Messaging) {const icon = Messaging.getRoomIcon(roomData);notifData.type = 'new-public-chat';notifData.roomIcon = icon;- notifData.subject = `[[email:notif.chat.new-message-from-user-in-room, ${displayname}, ${roomName}]]`;- notifData.bodyShort = `[[notifications:user-posted-in-public-room, ${displayname}, ${icon}, ${roomName}]]`;+ notifData.subject = tx.compile('email:notif.chat.new-message-from-user-in-room', displayname, roomName);+ notifData.bodyShort = tx.compile('notifications:user-posted-in-public-room', displayname, icon, roomName);notifData.mergeId = `notifications:user-posted-in-public-room|${roomId}`;}const notification = await notifications.create(notifData);diff --git a/src/messaging/rooms.js b/src/messaging/rooms.jsindex 8ca4d6e1f1..e3ea12c508 100644--- a/src/messaging/rooms.js+++ b/src/messaging/rooms.js@@ -1,7 +1,6 @@'use strict';const _ = require('lodash');-const validator = require('validator');const winston = require('winston');const db = require('../database');@@ -14,7 +13,7 @@ const io = require('../socket.io');const cache = require('../cache');const cacheCreate = require('../cache/lru');const utils = require('../utils');-const translator = require('../translator');+const tx = require('../translator');const roomUidCache = cacheCreate({name: 'chat-room-uids',@@ -49,7 +48,7 @@ module.exports = function (Messaging) {rooms.forEach((data) => {if (data) {db.parseIntFields(data, intFields, fields);- data.roomName = translator.escape(validator.escape(String(data.roomName || '')));+ data.roomName = String(data.roomName || '');data.public = parseInt(data.public, 10) === 1;data.groupChat = data.userCount > 2;@@ -134,7 +133,6 @@ module.exports = function (Messaging) {]);if (!isPublic && parseInt(room.joinLeaveMessages, 10) === 1) {- // chat owner should also get the user-join system messageawait Messaging.addSystemMessage('user-join', uid, roomId);}@@ -463,9 +461,10 @@ module.exports = function (Messaging) {await db.setObjectField(`chat:room:${payload.roomId}`, 'roomName', payload.newName);await Messaging.addSystemMessage(- `room-rename, ${payload.newName.replace(/,/g, ',')}`,+ 'room-rename',payload.uid,- payload.roomId+ payload.roomId,+ [tx.escape(payload.newName)]);plugins.hooks.fire('action:chat.renameRoom', {@@ -548,7 +547,7 @@ module.exports = function (Messaging) {return { options, selectedIcon: labels[currentSetting].icon };}- const [canReply, users, messages, settings, isOwner, onlineUids, notifOptions] = await Promise.all([+ const [canReply, users, messages, isOwner, onlineUids, notifOptions] = await Promise.all([Messaging.canReply(roomId, uid),Messaging.getUsersInRoomFromSet(`chat:room:${roomId}:uids:online`, roomId, 0, 39, true),Messaging.getMessages({@@ -558,7 +557,6 @@ module.exports = function (Messaging) {roomId: roomId,isNew: false,}),- user.getSettings(uid),Messaging.isRoomOwner(uid, roomId),io.getUidsInRoom(`chat_room_${roomId}`),getNotificationOptions(),@@ -578,7 +576,7 @@ module.exports = function (Messaging) {room.groupChat = users.length > 2;room.icon = Messaging.getRoomIcon(room);room.usernames = Messaging.generateUsernames(room, uid);- room.chatWithMessage = await Messaging.generateChatWithMessage(room, uid, settings.userLang);+ room.chatWithMessage = await Messaging.generateChatWithMessage(room, uid);room.maximumUsersInChatRoom = meta.config.maximumUsersInChatRoom;room.maximumChatMessageLength = meta.config.maximumChatMessageLength;room.showUserInput = !room.maximumUsersInChatRoom || room.maximumUsersInChatRoom > 2;diff --git a/src/meta/blacklist.js b/src/meta/blacklist.jsindex 6fa3761bbb..7a2cae5a73 100644--- a/src/meta/blacklist.js+++ b/src/meta/blacklist.js@@ -144,7 +144,7 @@ Blacklist.validate = function (rules) {}if (!addr || whitelist.includes(rule)) {- invalid.push(validator.escape(rule));+ invalid.push(rule);return false;}diff --git a/src/meta/errors.js b/src/meta/errors.jsindex 7b623fe5f0..f008446b1e 100644--- a/src/meta/errors.js+++ b/src/meta/errors.js@@ -91,11 +91,8 @@ Errors.log404 = function (route) {counters[route] += 1;};-Errors.get = async function (escape) {+Errors.get = async function () {const data = await db.getSortedSetRevRangeWithScores('errors:404', 0, 199);- data.forEach((nfObject) => {- nfObject.value = escape ? validator.escape(String(nfObject.value || '')) : nfObject.value;- });return data;};diff --git a/src/meta/js.js b/src/meta/js.jsindex 065ad2c1f0..aa151f98c4 100644--- a/src/meta/js.js+++ b/src/meta/js.js@@ -15,7 +15,6 @@ JS.scripts = {'node_modules/@adactive/bootstrap-tagsinput/src/bootstrap-tagsinput.js','node_modules/jquery-serializeobject/jquery.serializeObject.js','node_modules/jquery-deserialize/src/jquery.deserialize.js',- 'public/vendor/bootbox/wrapper.js',],// plugins add entries into this object,diff --git a/src/meta/tags.js b/src/meta/tags.jsindex dd91621017..ceaee5c838 100644--- a/src/meta/tags.js+++ b/src/meta/tags.js@@ -3,17 +3,18 @@const nconf = require('nconf');const winston = require('winston');+const translator = require('../translator');+const user = require('../user');const plugins = require('../plugins');const Meta = require('./index');-const utils = require('../utils');-const translator = require('../translator');-const Tags = module.exports;const url = nconf.get('url');const relative_path = nconf.get('relative_path');const upload_url = nconf.get('upload_url');+const Tags = module.exports;+Tags.parse = async (req, data, meta, link) => {const isAPI = req.res && req.res.locals && req.res.locals.isAPI;@@ -22,11 +23,9 @@ Tags.parse = async (req, data, meta, link) => {name: 'viewport',// https://stackoverflow.com/a/77815388 for resizes-contentcontent: 'width=device-width, initial-scale=1.0, interactive-widget=resizes-content',- noEscape: true,}, {name: 'content-type',content: 'text/html; charset=UTF-8',- noEscape: true,}, {name: 'apple-mobile-web-app-capable',content: 'yes',@@ -52,7 +51,6 @@ Tags.parse = async (req, data, meta, link) => {defaultTags.push({name: 'msapplication-square150x150logo',content: Meta.config['brand:logo'],- noEscape: true,});}@@ -74,7 +72,7 @@ Tags.parse = async (req, data, meta, link) => {defaultLinks.push({rel: 'search',type: 'application/opensearchdescription+xml',- title: utils.escapeHTML(String(Meta.config.title || Meta.config.browserTitle || 'NodeBB')),+ title: String(Meta.config.title || Meta.config.browserTitle || 'NodeBB'),href: `${relative_path}/osd.xml`,});}@@ -83,26 +81,22 @@ Tags.parse = async (req, data, meta, link) => {addTouchIcons(defaultLinks);}- const [{ tags }, { links }] = await Promise.all([+ const [{ tags }, { links }, { userLang }] = await Promise.all([plugins.hooks.fire('filter:meta.getMetaTags', { req, data, tags: defaultTags }),plugins.hooks.fire('filter:meta.getLinkTags', { req, data, links: defaultLinks }),+ user.getSettings(req.uid),]);- meta = tags.concat(meta || []).map((tag) => {+ meta = await Promise.all(tags.concat(meta || []).map(async (tag) => {if (!tag || typeof tag.content !== 'string') {winston.warn('Invalid meta tag. ', tag);return tag;}-- if (!tag.noEscape) {- const attributes = Object.keys(tag);- attributes.forEach((attr) => {- tag[attr] = translator.escape(utils.escapeHTML(String(tag[attr])));- });+ if (tag.translate) {+ tag.content = await translator.translate(tag.content, userLang);}-return tag;- });+ }));await addSiteOGImage(meta);@@ -117,16 +111,6 @@ Tags.parse = async (req, data, meta, link) => {const whitelist = ['canonical', 'alternate', 'up'];link = link.filter(link => whitelist.some(val => val === link.rel));}- link = link.map((tag) => {- if (!tag.noEscape) {- const attributes = Object.keys(tag);- attributes.forEach((attr) => {- tag[attr] = utils.escapeHTML(String(tag[attr]));- });- }-- return tag;- });return { meta, link };};@@ -202,7 +186,7 @@ function addIfNotExists(meta, keyName, tagName, value) {if (!exists && value) {meta.push({- content: translator.escape(utils.escapeHTML(String(value))),+ content: String(value),[keyName]: tagName,});}@@ -240,11 +224,9 @@ async function addSiteOGImage(meta) {meta.push({property: 'og:image',content: image.url,- noEscape: true,}, {property: 'og:image:url',content: image.url,- noEscape: true,});break;}@@ -253,7 +235,6 @@ async function addSiteOGImage(meta) {meta.push({property: `og:${property}`,content: image[property],- noEscape: true,});break;}diff --git a/src/middleware/helpers.js b/src/middleware/helpers.jsindex de2669bd84..4843ea74fc 100644--- a/src/middleware/helpers.js+++ b/src/middleware/helpers.js@@ -1,7 +1,6 @@'use strict';const winston = require('winston');-const validator = require('validator');const slugify = require('../slugify');const meta = require('../meta');@@ -38,7 +37,6 @@ helpers.buildBodyClass = function (req, res, templateData = {}) {winston.error(err.stack);p = '';}- p = validator.escape(String(p));parts[index] = index ? `${parts[0]}-${p}` : `page-${p || 'home'}`;});const { template } = templateData;diff --git a/src/middleware/render.js b/src/middleware/render.jsindex fdb376d697..1c105df532 100644--- a/src/middleware/render.js+++ b/src/middleware/render.js@@ -2,7 +2,6 @@const _ = require('lodash');const nconf = require('nconf');-const validator = require('validator');const jsesc = require('jsesc');const winston = require('winston');const semver = require('semver');@@ -74,6 +73,7 @@ module.exports = function (middleware) {options._header = {tags: await meta.tags.parse(req, renderResult, res.locals.metaTags, res.locals.linkTags),};+ res.locals._i18n = languages.getFull(getLang(req, res));options.widgets = await widgets.render(req.uid, {template: `${template}.tpl`,url: options.url,@@ -92,7 +92,7 @@ module.exports = function (middleware) {return res.json(options);}- res.locals._i18n = await languages.getFull(getLang(req, res));+const optionsString = JSON.stringify(options).replace(/<\//g, '<\\/');const headerFooterData = await loadHeaderFooterData(req, res, options);const results = await utils.promiseParallel({@@ -174,8 +174,6 @@ module.exports = function (middleware) {templateValues.configJSON = jsesc(translator.escape(JSON.stringify(res.locals.config)), { isScriptContext: true });- const title = utils.stripHTMLTags(String(options.title || ''));-const results = await utils.promiseParallel({isAdmin: user.isAdministrator(req.uid),isGlobalMod: user.isGlobalModerator(req.uid),@@ -184,9 +182,8 @@ module.exports = function (middleware) {blocks: user.blocks.list(req.uid),user: user.getUserFields(req.uid, ['uid', 'username', 'fullname', 'userslug', 'email', 'email:confirmed', 'picture', 'status', 'reputation']),isEmailConfirmSent: req.uid <= 0 ? false : await user.email.isValidationPending(req.uid),- languageDirection: translator.translate('[[language:dir]]', userLang),timeagoCode: languages.userTimeagoCode(userLang),- browserTitle: translator.translate(controllersHelpers.buildTitle(title), userLang),+ browserTitle: controllersHelpers.buildTitle(options.title, userLang, options.template.name),navigation: navigation.get(req.uid),roomIds: req.uid > 0 ? db.getSortedSetRevRange(`uid:${req.uid}:chat:rooms`, 0, 0) : [],});@@ -236,9 +233,9 @@ module.exports = function (middleware) {templateValues.maintenanceHeader = meta.config.maintenanceMode && !results.isAdmin;templateValues.defaultLang = meta.config.defaultLang || 'en-GB';templateValues.userLang = res.locals.config.userLang;- templateValues.languageDirection = results.languageDirection;+ templateValues.languageDirection = translator.languageDirection(userLang);if (req.query.noScriptMessage) {- templateValues.noScriptMessage = validator.escape(String(req.query.noScriptMessage));+ templateValues.noScriptMessage = req.query.noScriptMessage;}templateValues.template = { name: res.locals.template };@@ -250,7 +247,7 @@ module.exports = function (middleware) {}if (req.route && req.route.path === '/') {- modifyTitle(templateValues);+ await modifyTitle(templateValues, userLang, options.template.name);}return templateValues;}@@ -270,7 +267,6 @@ module.exports = function (middleware) {latestVersion: getLatestVersion(),privileges: privileges.admin.get(req.uid),tags: meta.tags.parse(req, {}, [], []),- languageDirection: translator.translate('[[language:dir]]', res.locals.config.acpLang),});const { userData } = results;@@ -287,7 +283,8 @@ module.exports = function (middleware) {const version = nconf.get('version');res.locals.config.userLang = res.locals.config.acpLang || res.locals.config.userLang;- res.locals.config.isRTL = results.languageDirection === 'rtl';+ const langDirection = translator.languageDirection(res.locals.config.acpLang);+ res.locals.config.isRTL = langDirection === 'rtl';const templateValues = {config: res.locals.config,configJSON: jsesc(translator.escape(JSON.stringify(res.locals.config)), { isScriptContext: true }),@@ -310,7 +307,7 @@ module.exports = function (middleware) {showManageMenu: results.privileges.superadmin || ['categories', 'privileges', 'users', 'admins-mods', 'groups', 'tags', 'settings'].some(priv => results.privileges[`admin:${priv}`]),defaultLang: meta.config.defaultLang || 'en-GB',acpLang: res.locals.config.acpLang,- languageDirection: results.languageDirection,+ languageDirection: langDirection,};templateValues.template = { name: res.locals.template };@@ -406,22 +403,23 @@ module.exports = function (middleware) {if (res.locals.renderHeaderType === 'admin') {language = (res.locals.config && res.locals.config.acpLang) || 'en-GB';}- return req.query.lang ? validator.escape(String(req.query.lang)) : language;+ return req.query.lang ? req.query.lang : language;}async function translate(str, language) {+ // TODO: remove once all tx tokens are migrated to tx("") helperconst translated = await translator.translate(str, language);return translator.unescape(translated);}async function appendUnreadCounts({ uid, navigation, unreadData, query }) {- const originalRoutes = navigation.map(nav => nav.originalRoute);+ const routes = navigation.map(nav => nav.route);const calls = {unreadData: topics.getUnreadData({ uid: uid, query: query }),unreadChatCount: messaging.getUnreadCount(uid),unreadNotificationCount: user.notifications.getUnreadCount(uid),unreadFlagCount: (async function () {- if (originalRoutes.includes('/flags') && await user.isPrivileged(uid)) {+ if (routes.includes('/flags') && await user.isPrivileged(uid)) {return flags.getCount({uid,query,@@ -458,7 +456,7 @@ module.exports = function (middleware) {const { tidsByFilter } = results.unreadData;navigation = navigation.map((item) => {function modifyNavItem(item, route, filter, content) {- if (item && item.originalRoute === route) {+ if (item && item.route === route) {unreadData[filter] = _.zipObject(tidsByFilter[filter], tidsByFilter[filter].map(() => true));item.content = content;unreadCount.mobileUnread = content;@@ -474,7 +472,7 @@ module.exports = function (middleware) {modifyNavItem(item, '/unread?filter=unreplied', 'unreplied', unreadCount.unrepliedTopic);['flags'].forEach((prop) => {- if (item && item.originalRoute === `/${prop}` && unreadCount[prop] > 0) {+ if (item && item.route === `/${prop}` && unreadCount[prop] > 0) {item.iconClass += ' unread-count';item.content = unreadCount.flags;}@@ -487,8 +485,8 @@ module.exports = function (middleware) {}- function modifyTitle(obj) {- const title = controllersHelpers.buildTitle(meta.config.homePageTitle || '[[pages:home]]');+ async function modifyTitle(obj, userLang, template) {+ const title = await controllersHelpers.buildTitle(meta.config.homePageTitle || '[[pages:home]]', userLang, template);obj.browserTitle = title;if (obj.metaTags) {diff --git a/src/navigation/admin.js b/src/navigation/admin.jsindex 0db3bf469c..41c8e0db3c 100644--- a/src/navigation/admin.js+++ b/src/navigation/admin.js@@ -1,6 +1,5 @@'use strict';-const validator = require('validator');const winston = require('winston');const plugins = require('../plugins');@@ -42,23 +41,6 @@ admin.getAdmin = async function () {return { enabled: enabled, available: available };};-const fieldsToEscape = ['iconClass', 'class', 'route', 'id', 'text', 'textClass', 'title'];--admin.escapeFields = navItems => toggleEscape(navItems, true);-admin.unescapeFields = navItems => toggleEscape(navItems, false);--function toggleEscape(navItems, flag) {- navItems.forEach((item) => {- if (item) {- fieldsToEscape.forEach((field) => {- if (item.hasOwnProperty(field)) {- item[field] = validator[flag ? 'escape' : 'unescape'](String(item[field]));- }- });- }- });-}-admin.get = async function () {if (cache) {return cache.map(item => ({ ...item }));@@ -83,7 +65,6 @@ admin.get = async function () {item.order = parseInt(item.order, 10);return item;});- admin.escapeFields(cache);return cache.map(item => ({ ...item }));};diff --git a/src/navigation/index.js b/src/navigation/index.jsindex 1867c3396e..448adc6e4d 100644--- a/src/navigation/index.js+++ b/src/navigation/index.js@@ -1,7 +1,6 @@'use strict';const nconf = require('nconf');-const validator = require('validator');const admin = require('./admin');const groups = require('../groups');@@ -13,8 +12,6 @@ navigation.get = async function (uid) {let data = await admin.get();data = data.filter(item => item && item.enabled).map((item) => {- item.originalRoute = validator.unescape(item.route);-if (!item.route.startsWith('http')) {item.route = relative_path + item.route;}diff --git a/src/notifications.js b/src/notifications.jsindex 9eb5c570bf..f551bea8c4 100644--- a/src/notifications.js+++ b/src/notifications.js@@ -18,7 +18,7 @@ const utils = require('./utils');const emailer = require('./emailer');const ttlCache = require('./cache/ttl');const cron = require('./cron');-const translator = require('./translator');+const tx = require('./translator');const Notifications = module.exports;@@ -554,8 +554,8 @@ Notifications.merge = async function (notifications) {const { roomId, roomName, type, user } = set[0];const isGroupChat = type === 'new-group-chat';notifObj.bodyShort = isGroupChat || (roomName !== `[[modules:chat.room-id, ${roomId}]]`) ?- translator.compile('notifications:new-messages-in', set.length, roomName) :- translator.compile('notifications:new-messages-from', set.length, user.displayname);+ tx.compile('notifications:new-messages-in', set.length, roomName) :+ tx.compile('notifications:new-messages-from', set.length, user.displayname);break;}@@ -571,7 +571,7 @@ Notifications.merge = async function (notifications) {notifObj.roomName,];- notifObj.bodyShort = translator.compile(...txArgs);+ notifObj.bodyShort = tx.compile(...txArgs);notifObj.path = set[set.length - 1].path;break;}@@ -590,7 +590,7 @@ Notifications.merge = async function (notifications) {...(isMultiple ? [usernames.length - 2] : []),utils.decodeHTMLEntities(notifObj.topicTitle || ''),];- notifObj.bodyShort = translator.compile(...txArgs);+ notifObj.bodyShort = tx.compile(...txArgs);notifObj.path = set[set.length - 1].path;break;}diff --git a/src/posts/diffs.js b/src/posts/diffs.jsindex 33a17444ee..29e652a431 100644--- a/src/posts/diffs.js+++ b/src/posts/diffs.js@@ -1,12 +1,10 @@'use strict';-const validator = require('validator');const diff = require('diff');const db = require('../database');const meta = require('../meta');const plugins = require('../plugins');-const translator = require('../translator');const topics = require('../topics');module.exports = function (Posts) {@@ -65,7 +63,6 @@ module.exports = function (Posts) {post.content = String(post.content || '');const result = await plugins.hooks.fire('filter:parse.post', { postData: post });- result.postData.content = translator.escape(result.postData.content);return result.postData;};@@ -88,7 +85,7 @@ module.exports = function (Posts) {getValidatedTimestamp(timestamp);const [post, diffs, timestamps] = await Promise.all([- Posts.getPostSummaryByPids([pid], uid, { parse: false, escape: true }),+ Posts.getPostSummaryByPids([pid], uid, { parse: false }),Diffs.get(pid),Diffs.list(pid),]);@@ -107,7 +104,7 @@ module.exports = function (Posts) {throw new Error('[[error:invalid-data]]');}- const postContent = validator.unescape(post[0].content);+ const postContent = post[0].content;const versionContents = {};for (let i = 0, content = postContent; i < timestamps.length; ++i) {versionContents[timestamps[i]] = applyPatch(content, diffs[i]);@@ -133,16 +130,16 @@ module.exports = function (Posts) {async function postDiffLoad(pid, since, uid) {// Retrieves all diffs made since `since` and replays them to reconstruct what the post looked like at `since`const [post, diffs] = await Promise.all([- Posts.getPostSummaryByPids([pid], uid, { parse: false, escape: true }),+ Posts.getPostSummaryByPids([pid], uid, { parse: false }),Posts.diffs.get(pid, since),]);// Replace content with re-constructed content from that point in time- post[0].content = diffs.reduce(applyPatch, validator.unescape(post[0].content));+ post[0].content = diffs.reduce(applyPatch, post[0].content);const titleDiffs = diffs.filter(d => d.hasOwnProperty('title') && d.title);if (titleDiffs.length && post[0].topic) {- post[0].topic.title = validator.unescape(String(titleDiffs[titleDiffs.length - 1].title));+ post[0].topic.title = String(titleDiffs[titleDiffs.length - 1].title);}const tagDiffs = diffs.filter(d => d.hasOwnProperty('tags') && d.tags);if (tagDiffs.length && post[0].topic) {diff --git a/src/posts/edit.js b/src/posts/edit.jsindex 3d6d729351..963ff8b9e2 100644--- a/src/posts/edit.js+++ b/src/posts/edit.js@@ -1,6 +1,5 @@'use strict';-const validator = require('validator');const _ = require('lodash');const db = require('../database');@@ -12,7 +11,6 @@ const plugins = require('../plugins');const pubsub = require('../pubsub');const utils = require('../utils');const slugify = require('../slugify');-const translator = require('../translator');module.exports = function (Posts) {pubsub.on('post:edit', pid => Posts.clearCachedPost(pid));@@ -56,8 +54,8 @@ module.exports = function (Posts) {user.getUserFields(data.uid, ['username', 'userslug']),editMainPost(data, postData, topicData),]);-- const contentChanged = ((data.sourceContent || data.content) !== oldContent) ||+ const newContent = data.sourceContent || data.content;+ const contentChanged = (newContent !== oldContent) ||topic.renamed ||topic.tagsupdated;@@ -66,7 +64,7 @@ module.exports = function (Posts) {pid: data.pid,uid: data.uid,oldContent: oldContent,- newContent: data.content,+ newContent: newContent,edited: editPostData.edited,topic,});@@ -80,7 +78,7 @@ module.exports = function (Posts) {returnPostData.cid = topic.cid;returnPostData.topic = topic;returnPostData.editedISO = utils.toISOString(editPostData.edited);- returnPostData.changed = contentChanged;+ returnPostData.changed = newContent !== oldContent;returnPostData.oldContent = oldContent;returnPostData.newContent = data.content;@@ -99,7 +97,6 @@ module.exports = function (Posts) {await topics.notifyFollowers(returnPostData, data.uid, {type: 'post-edit',- bodyShort: translator.compile('notifications:user-edited-post', editor.username, topic.title),nid: `edit_post:${data.pid}:uid:${data.uid}`,});@@ -175,13 +172,13 @@ module.exports = function (Posts) {newTopicData.tags = data.tags;newTopicData.oldTitle = topicData.title;- const renamed = title && translator.escape(validator.escape(String(title))) !== topicData.title;+ const renamed = title && String(title) !== topicData.title;plugins.hooks.fire('action:topic.edit', { topic: newTopicData, uid: data.uid });return {tid: tid,cid: newTopicData.cid,uid: postData.uid,- title: validator.escape(String(title)),+ title: title,oldTitle: topicData.title,slug: newTopicData.slug || topicData.slug,isMainPost: true,diff --git a/src/posts/parse.js b/src/posts/parse.jsindex 5f5d21dbf0..d6a31b9b99 100644--- a/src/posts/parse.js+++ b/src/posts/parse.js@@ -7,7 +7,6 @@ const _ = require('lodash');const meta = require('../meta');const plugins = require('../plugins');-const translator = require('../translator');const utils = require('../utils');const postCache = require('./cache');const devMode = process.env.NODE_ENV === 'development';@@ -62,7 +61,6 @@ module.exports = function (Posts) {postData.content = postData.content.replace(meta.config.activitypubBreakString, '');}({ postData } = await plugins.hooks.fire('filter:parse.post', { postData, type }));- postData.content = translator.escape(postData.content);if (postData.pid) {cache.set(cacheKey, postData.content);}@@ -78,7 +76,6 @@ module.exports = function (Posts) {Posts.parseSignature = async function (userData, uid) {userData.signature = sanitizeSignature(userData.signature || '');const result = await plugins.hooks.fire('filter:parse.signature', { userData: userData, uid: uid });- userData.signature = translator.escape(result.userData.signature);return result;};@@ -167,7 +164,6 @@ module.exports = function (Posts) {};function sanitizeSignature(signature) {- signature = translator.escape(signature);const tagsToStrip = [];if (meta.config['signatures:disableLinks']) {diff --git a/src/posts/queue.js b/src/posts/queue.jsindex a68e160b04..879554520e 100644--- a/src/posts/queue.js+++ b/src/posts/queue.js@@ -1,7 +1,6 @@'use strict';const _ = require('lodash');-const validator = require('validator');const nconf = require('nconf');const db = require('../database');@@ -16,6 +15,8 @@ const plugins = require('../plugins');const utils = require('../utils');const cache = require('../cache');const socketHelpers = require('../socket.io/helpers');+const tx = require('../translator');+const helpers = require('../helpers');const upload_url = nconf.get('relative_path') + nconf.get('upload_url');@@ -42,13 +43,13 @@ module.exports = function (Posts) {if (postData) {postData.user = userData[index];if (postData.user.uid === 0 && postData.data.handle) {- postData.user.username = validator.escape(String(postData.data.handle));+ postData.user.username = String(postData.data.handle);postData.user.displayname = postData.user.username;postData.user.fullname = postData.user.username;}postData.data.content = postData.data.sourceContent || postData.data.content;- postData.data.rawContent = validator.escape(String(postData.data.content));- postData.data.title = validator.escape(String(postData.data.title || ''));+ postData.data.rawContent = String(postData.data.content);+ postData.data.title = String(postData.data.title || '');}});cache.set('post-queue', _.cloneDeep(postData));@@ -250,27 +251,26 @@ module.exports = function (Posts) {const uids = await getNotificationUids(cid);const bodyEmail = await parseBodyEmail(cid, type, data);- let bodyShort;- if (type === 'reply') {- bodyShort = '[[notifications:post-awaiting-review]]';- } else if (type === 'crosspost') {- bodyShort = '[[notifications:crosspost-awaiting-review]]';- } else {- bodyShort = '[[notifications:topic-awaiting-review]]';- }+ const typeToTx = {+ reply: '[[notifications:post-awaiting-review]]',+ crosspost: '[[notifications:crosspost-awaiting-review]]',+ topic: '[[notifications:topic-awaiting-review]]',+ };let bodyLong;if (type === 'reply') {- bodyLong = await plugins.hooks.fire('filter:parse.raw', data.sourceContent || data.content);+ bodyLong = tx.escape(+ await plugins.hooks.fire('filter:parse.raw', data.sourceContent || data.content)+ );} else {- bodyLong = validator.escape(String(data.title));+ bodyLong = helpers.escape(String(data.title));}const notifObj = await notifications.create({type: 'post-queue',nid: `post-queue-${id}`,mergeId: `post-queue-${type}-uid-${data.uid}`,- bodyShort,+ bodyShort: typeToTx[type],bodyLong: bodyLong,bodyEmail: bodyEmail,path: `/post-queue/${id}`,diff --git a/src/posts/summary.js b/src/posts/summary.jsindex 6e299e8d9b..f949cc251a 100644--- a/src/posts/summary.js+++ b/src/posts/summary.js@@ -10,7 +10,6 @@ const user = require('../user');const plugins = require('../plugins');const categories = require('../categories');const utils = require('../utils');-const helpers = require('../controllers/helpers');module.exports = function (Posts) {Posts.getPostSummaryByPids = async function (pids, uid, options) {@@ -87,9 +86,6 @@ module.exports = function (Posts) {if (options.escape) {post.content = post.content ? validator.escape(String(post.content)) : post.content;}- if (post.category) {- post.category.name = await helpers.translateEscapedValue(post.category.name);- }return post;}));}diff --git a/src/posts/user.js b/src/posts/user.jsindex a30b586524..ec4454055e 100644--- a/src/posts/user.js+++ b/src/posts/user.js@@ -1,7 +1,6 @@'use strict';const async = require('async');-const validator = require('validator');const _ = require('lodash');const db = require('../database');@@ -57,7 +56,7 @@ module.exports = function (Posts) {Posts.overrideGuestHandle = function (postData, handle) {if (meta.config.allowGuestHandles && postData && postData.user && parseInt(postData.uid, 10) === 0 && handle) {- postData.user.username = validator.escape(String(handle));+ postData.user.username = String(handle);if (postData.user.hasOwnProperty('fullname')) {postData.user.fullname = postData.user.username;}diff --git a/src/privileges/helpers.js b/src/privileges/helpers.jsindex 6c4e32a77e..0e50011027 100644--- a/src/privileges/helpers.js+++ b/src/privileges/helpers.js@@ -2,14 +2,12 @@'use strict';const _ = require('lodash');-const validator = require('validator');const db = require('../database');const groups = require('../groups');const user = require('../user');const categories = require('../categories');const plugins = require('../plugins');-const translator = require('../translator');const utils = require('../utils');const helpers = module.exports;@@ -188,8 +186,7 @@ helpers.getGroupPrivileges = async function (cid, groupPrivileges) {types[key] = getType(key);}return {- name: validator.escape(member),- nameEscaped: translator.escape(validator.escape(member)),+ name: member,privileges: memberPrivs,types: types,isPrivate: groupData[index] && !!groupData[index].private,diff --git a/src/routes/feeds.js b/src/routes/feeds.jsindex 140d3830d1..141c957768 100644--- a/src/routes/feeds.js+++ b/src/routes/feeds.js@@ -2,7 +2,6 @@const rss = require('rss');const nconf = require('nconf');-const validator = require('validator');const posts = require('../posts');const topics = require('../topics');@@ -16,12 +15,7 @@ const utils = require('../utils');const controllers404 = require('../controllers/404');const routeHelpers = require('./helpers');-const terms = {- daily: 'day',- weekly: 'week',- monthly: 'month',- alltime: 'alltime',-};+const { terms } = controllerHelpers;module.exports = function (app, middleware) {app.get('/topic/:topic_id.rss', middleware.maintenanceMode, routeHelpers.tryRoute(generateForTopic));@@ -209,7 +203,7 @@ async function generateForTop(req, res, next) {site_url: `/top/${req.params.term || 'daily'}`,sort: 'votes',timestampField: 'timestamp',- term: 'day',+ term: 'daily',}, req, res, next);}@@ -221,16 +215,17 @@ async function generateForPopular(req, res, next) {site_url: `/popular/${req.params.term || 'daily'}`,sort: 'posts',timestampField: 'timestamp',- term: 'day',+ term: 'daily',}, req, res, next);}async function generateSorted(options, req, res, next) {- if (meta.config['feeds:disableRSS']) {+ const termParam = req.params.term || options.term;+ if (meta.config['feeds:disableRSS'] || !Object.hasOwn(terms, termParam)) {return next();}- const term = terms[req.params.term] || options.term;+ const term = terms[termParam];const uid = await getUidFromToken(req);const params = {@@ -422,7 +417,7 @@ async function generateForTag(req, res) {}const uid = await getUidFromToken(req);const set = `tag:${String(req.params.tag)}:topics`;- const tag = validator.escape(stripUnicodeControlChars(String(req.params.tag)));+ const tag = stripUnicodeControlChars(String(req.params.tag));const page = parseInt(req.query.page, 10) || 1;const topicsPerPage = meta.config.topicsPerPage || 20;const start = Math.max(0, (page - 1) * topicsPerPage);diff --git a/src/socket.io/admin/user.js b/src/socket.io/admin/user.jsindex 0a981eacbb..608fa6e836 100644--- a/src/socket.io/admin/user.js+++ b/src/socket.io/admin/user.js@@ -9,7 +9,6 @@ const db = require('../../database');const groups = require('../../groups');const user = require('../../user');const events = require('../../events');-const translator = require('../../translator');const utils = require('../../utils');const sockets = require('..');@@ -149,9 +148,6 @@ User.loadGroups = async function (socket, uids) {]);userData.forEach((data, index) => {data.groups = groupData[index].filter(group => !groups.isPrivilegeGroup(group.name));- data.groups.forEach((group) => {- group.nameEscaped = translator.escape(group.displayName);- });});return { users: userData };};diff --git a/src/socket.io/helpers.js b/src/socket.io/helpers.jsindex 844e2bd535..854fab927e 100644--- a/src/socket.io/helpers.js+++ b/src/socket.io/helpers.js@@ -94,30 +94,23 @@ SocketHelpers.sendNotificationToPostOwner = async function (pid, fromuid, commanif (!pid || !fromuid || !notification) {return;}- fromuid = utils.isNumber(fromuid) ? parseInt(fromuid, 10) : fromuid;- const [postData, fromCategory] = await Promise.all([- posts.getPostFields(pid, ['tid', 'uid', 'content', 'sourceContent']),- !utils.isNumber(fromuid) && categories.exists(fromuid),- ]);+ const postData = await posts.getPostFields(pid, ['tid', 'uid', 'content', 'sourceContent']);const [canRead, isIgnoring] = await Promise.all([privileges.posts.can('topics:read', pid, postData.uid),topics.isIgnoring([postData.tid], postData.uid),]);- if (!canRead || isIgnoring[0] || !postData.uid || fromuid === postData.uid) {+ if (!canRead || isIgnoring[0] || !postData.uid || String(fromuid) === String(postData.uid)) {return;}- const [userData, topicTitle, postObj] = await Promise.all([- fromCategory ? categories.getCategoryFields(fromuid, ['name']) : user.getUserFields(fromuid, ['username']),- topics.getTopicField(postData.tid, 'title'),+ const [displayName, topicTitle, postObj] = await Promise.all([+ user.getNotificationDisplayname(fromuid),+ topics.getNotificationTitle(postData.tid),posts.parsePost(postData),]);- const title = utils.decodeHTMLEntities(topicTitle);- const bodyShort = translator.compile(notification, userData.displayname || userData.name, title);-const notifObj = await notifications.create({type: command,- bodyShort: bodyShort,+ bodyShort: translator.compile(notification, displayName, topicTitle),bodyLong: postObj.content,pid: pid,tid: postData.tid,@@ -137,22 +130,16 @@ SocketHelpers.sendNotificationToTopicOwner = async function (tid, fromuid, commareturn;}- fromuid = parseInt(fromuid, 10);-- const [userData, topicData] = await Promise.all([- user.getUserFields(fromuid, ['username']),- topics.getTopicFields(tid, ['uid', 'slug', 'title']),+ const [displayname, title, topicData] = await Promise.all([+ user.getNotificationDisplayname(fromuid),+ topics.getNotificationTitle(tid),+ topics.getTopicFields(tid, ['uid', 'slug']),]);- if (fromuid === topicData.uid) {+ if (String(fromuid) === String(topicData.uid) || !topicData.uid) {return;}- const { displayname } = userData;-- const ownerUid = topicData.uid;- const title = utils.decodeHTMLEntities(topicData.title);-const notifObj = await notifications.create({bodyShort: translator.compile(notification, displayname, title),path: `/topic/${topicData.slug}`,@@ -160,9 +147,7 @@ SocketHelpers.sendNotificationToTopicOwner = async function (tid, fromuid, commafrom: fromuid,});- if (ownerUid) {- notifications.push(notifObj, [ownerUid]);- }+ notifications.push(notifObj, [topicData.uid]);};SocketHelpers.upvote = async function (data, notification) {diff --git a/src/socket.io/index.js b/src/socket.io/index.jsindex ca80a9e057..f1b062bdb2 100644--- a/src/socket.io/index.js+++ b/src/socket.io/index.js@@ -4,7 +4,6 @@ const os = require('os');const nconf = require('nconf');const winston = require('winston');const util = require('util');-const validator = require('validator');const cookieParser = require('cookie-parser')(nconf.get('secret'));const db = require('../database');@@ -169,8 +168,7 @@ async function onMessage(socket, payload) {}if (typeof event !== 'string') {- const escapedName = validator.escape(typeof event);- return callback({ message: `[[error:invalid-event, ${escapedName}]]` });+ return callback({ message: `[[error:invalid-event, ${typeof event}]]` });}const parts = event.split('.');@@ -186,8 +184,7 @@ async function onMessage(socket, payload) {if (process.env.NODE_ENV === 'development') {winston.warn(`[socket.io] Unrecognized message: ${event}`);}- const escapedName = validator.escape(String(event));- return callback({ message: `[[error:invalid-event, ${escapedName}]]` });+ return callback({ message: `[[error:invalid-event, ${event}]]` });}socket.previousEvents = socket.previousEvents || [];@@ -244,8 +241,7 @@ async function checkMaintenance(socket) {if (isAdmin) {return;}- const validator = require('validator');- throw new Error(`[[pages:maintenance.text, ${validator.escape(String(meta.config.title || 'NodeBB'))}]]`);+ throw new Error(`[[pages:maintenance.text, ${meta.config.title || 'NodeBB'}]]`);}async function validateSession(socket, errorMsg) {diff --git a/src/socket.io/plugins.js b/src/socket.io/plugins.jsindex ac197c0024..4bb3664663 100644--- a/src/socket.io/plugins.js+++ b/src/socket.io/plugins.js@@ -7,7 +7,7 @@ const SocketPlugins = {};How? From your plugin:- const SocketPlugins = require.main.require('./src/socket.io/plugins');+ const SocketPlugins = nodebb.require('./src/socket.io/plugins');SocketPlugins.myPlugin = {};SocketPlugins.myPlugin.myMethod = function(socket, data, callback) { ... };diff --git a/src/socket.io/user/picture.js b/src/socket.io/user/picture.jsindex 3ec0237fd0..a6e23b98a7 100644--- a/src/socket.io/user/picture.js+++ b/src/socket.io/user/picture.js@@ -47,8 +47,8 @@ module.exports = function (SocketUser) {list.pictures = list.pictures.map(({ type, url, text }) => ({type,username: text,- picture: String(url),- selected: url === String(userObj.picture),+ picture: url,+ selected: url === userObj.picture,}));list.pictures.unshift({diff --git a/src/test1.js b/src/test1.jsdeleted file mode 100644index 9fa801e58f..0000000000--- a/src/test1.js+++ /dev/null@@ -1,6 +0,0 @@--export function foo() {- console.log('foo called');-}--export const bar = 42;\ No newline at end of filediff --git a/src/topics/create.js b/src/topics/create.jsindex ef94fdaf42..8944bb7b09 100644--- a/src/topics/create.js+++ b/src/topics/create.js@@ -16,7 +16,7 @@ const meta = require('../meta');const posts = require('../posts');const privileges = require('../privileges');const categories = require('../categories');-const translator = require('../translator');+module.exports = function (Topics) {Topics.create = async function (data) {@@ -244,7 +244,6 @@ module.exports = function (Topics) {try {await Topics.notifyFollowers(postData, uid, {type: 'new-reply',- bodyShort: translator.compile('notifications:user-posted-to', postData.user.displayname, postData.topic.title),nid: `new_post:tid:${postData.topic.tid}:pid:${postData.pid}:uid:${uid}`,mergeId: `notifications:user-posted-to|${postData.topic.tid}`,});diff --git a/src/topics/data.js b/src/topics/data.jsindex 54b23ac1a6..df45470517 100644--- a/src/topics/data.js+++ b/src/topics/data.js@@ -1,11 +1,8 @@'use strict';-const validator = require('validator');-const db = require('../database');const categories = require('../categories');const utils = require('../utils');-const translator = require('../translator');const plugins = require('../plugins');const intFields = [@@ -80,14 +77,6 @@ module.exports = function (Topics) {};};-function escapeTitle(topicData, hasField) {- if (topicData) {- if (hasField('title')) {- topicData.title = translator.escape(validator.escape(topicData.title));- topicData.titleRaw = translator.escape(topicData.titleRaw || '');- }- }-}function modifyTopic(topic, fields) {if (!topic) {@@ -99,12 +88,9 @@ function modifyTopic(topic, fields) {db.parseIntFields(topic, intFields, fields);if (hasField('title')) {- topic.titleRaw = topic.title;topic.title = String(topic.title);}- escapeTitle(topic, hasField);-if (hasField('timestamp')) {topic.timestampISO = utils.toISOString(topic.timestamp);if (hasField('scheduled')) {@@ -131,12 +117,10 @@ function modifyTopic(topic, fields) {if (hasField('tags')) {const tags = String(topic.tags || '');topic.tags = tags.split(',').filter(Boolean).map((tag) => {- const escaped = validator.escape(String(tag));return {value: tag,- valueEscaped: escaped,valueEncoded: encodeURIComponent(tag),- class: escaped.replace(/\s/g, '-'),+ class: tag.replace(/\s/g, '-'),};});}diff --git a/src/topics/events.js b/src/topics/events.jsindex 0c4c50c5c6..c409cdbd75 100644--- a/src/topics/events.js+++ b/src/topics/events.js@@ -1,6 +1,5 @@'use strict';-const validator = require('validator');const _ = require('lodash');const nconf = require('nconf');const db = require('../database');@@ -9,7 +8,7 @@ const user = require('../user');const posts = require('../posts');const categories = require('../categories');const plugins = require('../plugins');-const translator = require('../translator');+const tx = require('../translator');const privileges = require('../privileges');const utils = require('../utils');const helpers = require('../helpers');@@ -87,8 +86,10 @@ Events.init = async () => {async function translateEventArgs(event, language, prefix, ...args) {const key = getTranslationKey(event, prefix);- const compiled = translator.compile.apply(null, [key, ...args]);- return utils.decodeHTMLEntities(await translator.translate(compiled, language));+ const txArgs = args.map(arg => utils.escapeHTML(arg));+ const compiled = tx.compile.apply(null, [key, ...txArgs]);+ const translated = await tx.translateKey(compiled, [], language);+ return utils.decodeHTMLEntities(translated);}async function translateSimple(event, language, prefix) {@@ -115,11 +116,12 @@ function renderUser(event) {const user = {...event.user,- displayname: validator.escape(String(event.user.displayname)),- userslug: validator.escape(String(event.user.userslug)),+ displayname: String(event.user.displayname),+ userslug: String(event.user.userslug),};-- return `${helpers.buildAvatar(user, '16px', true)} <a href="${relative_path}/user/${user.userslug}">${user.displayname}</a>`;+ const avatar = helpers.buildAvatar(user, '16px', true);+ const link = `<a href="${relative_path}/user/${helpers.escape(user.userslug)}">${helpers.escape(user.displayname)}</a>`;+ return `${avatar} ${link}`;}function renderCategory(category) {diff --git a/src/topics/follow.js b/src/topics/follow.jsindex d1afb7025c..4a4c4e3111 100644--- a/src/topics/follow.js+++ b/src/topics/follow.js@@ -5,7 +5,8 @@ const db = require('../database');const notifications = require('../notifications');const privileges = require('../privileges');const plugins = require('../plugins');-const utils = require('../utils');+const user = require('../user');+const tx = require('../translator');module.exports = function (Topics) {Topics.toggleFollow = async function (tid, uid) {@@ -157,14 +158,17 @@ module.exports = function (Topics) {if (!followers.length) {return;}-- let { title } = postData.topic;- if (title) {- title = utils.decodeHTMLEntities(title);- }-+ const [displayName, title] = await Promise.all([+ user.getNotificationDisplayname(exceptUid),+ Topics.getNotificationTitle(postData.topic.tid),+ ]);+ const typeToTxKey = {+ 'new-reply': 'notifications:user-posted-to',+ 'post-edit': 'notifications:user-edited-post',+ };const notification = await notifications.create({subject: title,+ bodyShort: tx.compile(typeToTxKey[notifData.type], displayName, title),bodyLong: postData.content,pid: postData.pid,path: `/post/${encodeURIComponent(postData.pid)}`,diff --git a/src/topics/index.js b/src/topics/index.jsindex 198cf7e7e6..2f25387bbd 100644--- a/src/topics/index.js+++ b/src/topics/index.js@@ -2,7 +2,6 @@const nconf = require('nconf');const _ = require('lodash');-const validator = require('validator');const db = require('../database');const posts = require('../posts');@@ -14,6 +13,7 @@ const categories = require('../categories');const activitypub = require('../activitypub');const privileges = require('../privileges');const social = require('../social');+const translator = require('../translator');const relative_path = nconf.get('relative_path');@@ -139,7 +139,7 @@ Topics.getTopicsByTids = async function (tids, options) {topic.category = result.categoriesMap[topic.cid];topic.user = topic.uid ? result.usersMap[topic.uid] : { ...result.usersMap[topic.uid] };if (result.tidToGuestHandle[topic.tid]) {- topic.user.username = validator.escape(result.tidToGuestHandle[topic.tid]);+ topic.user.username = result.tidToGuestHandle[topic.tid];topic.user.displayname = topic.user.username;}topic.teaser = result.teasers[i] || null;@@ -323,6 +323,11 @@ Topics.isLocked = async function (tid) {return locked === 1;};+Topics.getNotificationTitle = async function (tid) {+ const title = await Topics.getTopicField(tid, 'title');+ return translator.escape(title);+};+Topics.search = async function (tid, term) {if (!tid || !term) {throw new Error('[[error:invalid-data]]');diff --git a/src/topics/posts.js b/src/topics/posts.jsindex 1e8526f0a6..033703fba1 100644--- a/src/topics/posts.js+++ b/src/topics/posts.js@@ -2,7 +2,6 @@'use strict';const _ = require('lodash');-const validator = require('validator');const nconf = require('nconf');const db = require('../database');@@ -146,7 +145,7 @@ module.exports = function (Topics) {// Username override for guests, if enabledif (meta.config.allowGuestHandles && postObj.uid === 0 && postObj.handle) {- postObj.user.username = validator.escape(String(postObj.handle));+ postObj.user.username = String(postObj.handle);postObj.user.displayname = postObj.user.username;}}diff --git a/src/topics/tags.js b/src/topics/tags.jsindex 48bbb44e15..80d067d62e 100644--- a/src/topics/tags.js+++ b/src/topics/tags.js@@ -2,7 +2,6 @@'use strict';const async = require('async');-const validator = require('validator');const _ = require('lodash');const db = require('../database');@@ -12,7 +11,7 @@ const categories = require('../categories');const plugins = require('../plugins');const privileges = require('../privileges');const notifications = require('../notifications');-const translator = require('../translator');+const tx = require('../translator');const utils = require('../utils');const batch = require('../batch');const cache = require('../cache');@@ -339,9 +338,8 @@ module.exports = function (Topics) {return [];}tags.forEach((tag) => {- tag.valueEscaped = validator.escape(String(tag.value));tag.valueEncoded = encodeURIComponent(tag.value);- tag.class = tag.valueEscaped.replace(/\s/g, '-');+ tag.class = tag.value.replace(/\s/g, '-');});return tags;};@@ -609,15 +607,15 @@ module.exports = function (Topics) {};Topics.notifyTagFollowers = async function (postData, exceptUid) {- let { tags } = postData.topic;+ const { tags } = postData.topic;if (!tags.length) {return;}- tags = tags.map(tag => tag.value);- const [followersOfPoster, allFollowers, title] = await Promise.all([+ const [followersOfPoster, allFollowers, displayname, title] = await Promise.all([db.getSortedSetRange(`followers:${exceptUid}`, 0, -1),- db.getSortedSetRange(tags.map(tag => `tag:${tag}:followers`), 0, -1),+ db.getSortedSetRange(tags.map(tag => `tag:${tag.value}:followers`), 0, -1),+ user.getNotificationDisplayname(exceptUid),Topics.getTopicField(postData.topic.tid, 'title'),]);const followerSet = new Set(followersOfPoster);@@ -628,17 +626,18 @@ module.exports = function (Topics) {return;}- const { displayname } = postData.user;-const notifBase = 'notifications:user-posted-topic-with-tag';- let bodyShort = translator.compile(notifBase, displayname, title, tags[0]);+ let suffix = '';+ let tagArgs = tags.map(tag => tx.escape(tag.value));if (tags.length === 2) {- bodyShort = translator.compile(`${notifBase}-dual`, displayname, title, tags[0], tags[1]);+ suffix = '-dual';} else if (tags.length === 3) {- bodyShort = translator.compile(`${notifBase}-triple`, displayname, title, tags[0], tags[1], tags[2]);+ suffix = '-triple';} else if (tags.length > 3) {- bodyShort = translator.compile(`${notifBase}-multiple`, displayname, title, tags.join(', '));+ suffix = '-multiple';+ tagArgs = [tags.join(', ')];}+ const bodyShort = tx.compile(`${notifBase}${suffix}`, displayname, title, ...tagArgs);const notification = await notifications.create({type: 'new-topic-with-tag',diff --git a/src/upgrades/4.0.0/regenerate_slugs_for_users_with_periods.js b/src/upgrades/4.0.0/regenerate_slugs_for_users_with_periods.jsindex 8b516e1883..4681f7ccab 100644--- a/src/upgrades/4.0.0/regenerate_slugs_for_users_with_periods.js+++ b/src/upgrades/4.0.0/regenerate_slugs_for_users_with_periods.js@@ -13,17 +13,22 @@ module.exports = {await batch.processSortedSet('users:joindate', async (uids) => {const data = await user.getUsersFields(uids, ['username', 'userslug']);- await Promise.all(data.map(async ({ uid, username, userslug }) => {+ const bulkSet = [];+ const bulkAdd = [];+ const bulkRemove = [];+ data.forEach(({ uid, username, userslug }) => {if (username.includes('.') && userslug !== slugify(username)) {const value = slugify(username);- await Promise.all([- db.sortedSetRemove('userslug:uid', userslug),- user.setUserField(uid, 'userslug', value),- db.sortedSetAdd('userslug:uid', uid, value),- ]);+ bulkSet.push([`user:${uid}`, { userslug: value }]);+ bulkAdd.push([`userslug:uid`, uid, value]);+ bulkRemove.push(userslug);}- }));-+ });+ await Promise.all([+ db.sortedSetRemove('userslug:uid', bulkRemove),+ db.sortedSetAddBulk(bulkAdd),+ db.setObjectBulk(bulkSet),+ ]);progress.incr(uids.length);}, {batch: 500,diff --git a/src/upgrades/4.14.0/fix-system-chat-messages.js b/src/upgrades/4.14.0/fix-system-chat-messages.jsnew file mode 100644index 0000000000..851c701344--- /dev/null+++ b/src/upgrades/4.14.0/fix-system-chat-messages.js@@ -0,0 +1,55 @@+'use strict';++const db = require('../../database');+const batch = require('../../batch');+const user = require('../../user');+const tx = require('../../translator');+const utils = require('../../utils');++module.exports = {+ name: 'Fix system chat messages so they have tx string and a type field',+ timestamp: Date.UTC(2026, 5, 14),+ method: async function () {+ const { progress } = this;++ await batch.processSortedSet(`messages:mid`, async (mids) => {+ const messageData = await db.getObjects(mids.map(mid => `message:${mid}`));+ const bulkSet = [];+ for (const m of messageData) {+ if (m && m.content && String(m.system) === '1') {+ // eslint-disable-next-line no-await-in-loop+ const displayname = await user.getNotificationDisplayname(m.fromuid);+ const timestampISO = utils.toISOString(m.timestamp || Date.now());+ if (m.content.startsWith('room-rename,')) {+ const type = 'room-rename';+ // fix old room-rename message which hacked roomName into content+ // ie "room-rename, NEW ROOM NAME"+ const parts = m.content.split(',');+ const newRoomName = parts[1] ? parts[1].trim() : '';+ const content = tx.compile(+ `modules:chat.system.room-rename`,+ displayname,+ timestampISO,+ tx.escape(newRoomName)+ );+ bulkSet.push([`message:${m.mid}`, { type, content }]);+ } else if (m.content === 'user-join' || m.content === 'user-leave') {+ const type = m.content;+ const content = tx.compile(+ `modules:chat.system.${type}`,+ displayname,+ timestampISO+ );+ bulkSet.push([`message:${m.mid}`, { type, content }]);+ }+ }+ }++ await db.setObjectBulk(bulkSet);+ progress.incr(bulkSet.length);+ }, {+ batch: 500,+ progress,+ });+ },+};diff --git a/src/user/admin.js b/src/user/admin.jsindex 26ad8b2c3f..441c82bfbb 100644--- a/src/user/admin.js+++ b/src/user/admin.js@@ -4,7 +4,6 @@const fs = require('fs');const path = require('path');const winston = require('winston');-const validator = require('validator');const { AsyncParser } = require('@json2csv/node');const { baseDir } = require('../constants').paths;@@ -28,8 +27,7 @@ module.exports = function (User) {};User.getIPs = async function (uid, stop) {- const ips = await db.getSortedSetRevRange(`uid:${uid}:ip`, 0, stop);- return ips.map(ip => validator.escape(String(ip)));+ return await db.getSortedSetRevRange(`uid:${uid}:ip`, 0, stop);};User.getUsersCSV = async function () {diff --git a/src/user/approval.js b/src/user/approval.jsindex 96a59c212d..b144ba2ec4 100644--- a/src/user/approval.js+++ b/src/user/approval.js@@ -1,6 +1,5 @@'use strict';-const validator = require('validator');const winston = require('winston');const db = require('../database');@@ -11,6 +10,7 @@ const groups = require('../groups');const utils = require('../utils');const slugify = require('../slugify');const plugins = require('../plugins');+const tx = require('../translator');module.exports = function (User) {User.createOrQueue = async function (req, userData, opts = {}) {@@ -69,7 +69,7 @@ module.exports = function (User) {async function sendNotificationToAdmins(username) {const notifObj = await notifications.create({type: 'new-register',- bodyShort: `[[notifications:new-register, ${username}]]`,+ bodyShort: tx.compile('notifications:new-register', tx.escape(username)),nid: `new-register:${username}`,path: '/admin/manage/registration',mergeId: 'new-register',@@ -167,8 +167,6 @@ module.exports = function (User) {let users = await db.getObjects(keys);users = users.filter(Boolean).map((user, index) => {user.timestampISO = utils.toISOString(data[index].score);- user.email = validator.escape(String(user.email));- user.usernameEscaped = validator.escape(String(user.username));delete user.hashedPassword;return user;});diff --git a/src/user/auth.js b/src/user/auth.jsindex 3ff2523344..847e40de75 100644--- a/src/user/auth.js+++ b/src/user/auth.js@@ -1,6 +1,5 @@'use strict';-const validator = require('validator');const _ = require('lodash');const db = require('../database');const meta = require('../meta');@@ -68,7 +67,6 @@ module.exports = function (User) {if (sessObj && sessObj.meta) {sessObj.meta.current = curSessionId === sids[idx];sessObj.meta.datetimeISO = new Date(sessObj.meta.datetime).toISOString();- sessObj.meta.ip = validator.escape(String(sessObj.meta.ip));}return sessObj && sessObj.meta;}).filter(Boolean);diff --git a/src/user/bans.js b/src/user/bans.jsindex db1163307e..cab4332ebc 100644--- a/src/user/bans.js+++ b/src/user/bans.js@@ -176,8 +176,7 @@ module.exports = function (User) {]);await Promise.all(reasons.map(async (reason, i) => {reason.key = i;- reason.parsedBody = translator.escape(await plugins.hooks.fire('filter:parse.raw', reason.body || ''));- reason.body = translator.escape(reason.body);+ reason.parsedBody = await plugins.hooks.fire('filter:parse.raw', reason.body || '');reason.translatedType = translations.get(reason.type) || '';}));if (type !== '') {diff --git a/src/user/data.js b/src/user/data.jsindex 7a7382d315..49712fca5c 100644--- a/src/user/data.js+++ b/src/user/data.js@@ -11,7 +11,6 @@ const categories = require('../categories');const activitypub = require('../activitypub');const utils = require('../utils');const coverPhoto = require('../coverPhoto');-const translator = require('../translator');const relative_path = nconf.get('relative_path');const upload_url = nconf.get('upload_url');@@ -36,10 +35,7 @@ module.exports = function (User) {];let customFieldWhiteList = null;- const escapeFieldList = [- 'email', 'username', 'fullname', 'signature', 'displayname',- 'cover:position', 'birthday', 'aboutme',- ];+const urlFieldList = ['picture', 'cover:url',];@@ -281,7 +277,7 @@ module.exports = function (User) {// works around renderOverride supplying `url` to templatesif (user.url) {- user.remoteUrl = translator.escape(validator.escape(String(user.url)));+ user.remoteUrl = String(user.url);} else {delete user.url;}@@ -377,18 +373,11 @@ module.exports = function (User) {}});- escapeFieldList.forEach((field) => {- if (user[field] && typeof user[field] === 'string') {- user[field] = translator.escape(validator.escape(String(user[field])));- }- });urlFieldList.forEach((field) => {if (user[field] && typeof user[field] === 'string') {const trimmedValue = user[field].trim();const isValid = isValidUserUrlField(trimmedValue);- if (isValid) {- user[field] = translator.escape(trimmedValue);- } else {+ if (!isValid) {if (field === 'picture') {user.picture = User.getDefaultAvatar();} else if (field === 'cover:url') {diff --git a/src/user/follow.js b/src/user/follow.jsindex d14251d38c..14246b3259 100644--- a/src/user/follow.js+++ b/src/user/follow.js@@ -6,6 +6,7 @@ const plugins = require('../plugins');const activitypub = require('../activitypub');const db = require('../database');const utils = require('../utils');+const tx = require('../translator');module.exports = function (User) {User.follow = async function (uid, followuid) {@@ -132,12 +133,14 @@ module.exports = function (User) {};User.onFollow = async function (uid, targetUid) {- const userData = await User.getUserFields(uid, ['username', 'userslug']);- const { displayname } = userData;+ const [displayname, userData] = await Promise.all([+ User.getNotificationDisplayname(uid),+ User.getUserFields(uid, ['username', 'userslug']),+ ]);const notifObj = await notifications.create({type: 'follow',- bodyShort: `[[notifications:user-started-following-you, ${displayname}]]`,+ bodyShort: tx.compile('notifications:user-started-following-you', displayname),nid: `follow:${targetUid}:uid:${uid}`,from: uid,path: `/user/${userData.userslug}`,diff --git a/src/user/index.js b/src/user/index.jsindex de1e079bd0..b416ea586c 100644--- a/src/user/index.js+++ b/src/user/index.js@@ -10,6 +10,7 @@ const categories = require('../categories');const meta = require('../meta');const activitypub = require('../activitypub');const utils = require('../utils');+const translator = require('../translator');const User = module.exports;@@ -175,6 +176,23 @@ User.getUsernameByUserslug = async function (slug) {return await User.getUserField(uid, 'username');};+User.getNotificationDisplayname = async function (uid) {+ const isLocal = utils.isNumber(uid);+ const fromCategory = !isLocal && await categories.exists(uid);++ const userData = fromCategory ?+ await categories.getCategoryFields(uid, ['name']) :+ await User.getUserFields(uid, ['uid', 'username']);+ if (fromCategory) {+ return userData.name;+ }++ if (userData.uid === 0) {+ return userData.displayname; // [[global:guest]] or [[global:former-user]]+ }+ return translator.escape(userData.displayname);+};+User.getUidByEmail = async function (email) {return await db.sortedSetScore('email:uid', email.toLowerCase());};diff --git a/src/user/info.js b/src/user/info.jsindex 13f0fa3cfb..787bcfed1f 100644--- a/src/user/info.js+++ b/src/user/info.js@@ -1,7 +1,6 @@'use strict';const _ = require('lodash');-const validator = require('validator');const db = require('../database');const posts = require('../posts');@@ -27,7 +26,7 @@ module.exports = function (User) {expiry: expire, /* backward compatible alias */banned_until_readable: expire_readable,expiry_readable: expire_readable, /* backward compatible alias */- reason: validator.escape(String(banInfo.reason || '')),+ reason: banInfo.reason || '',};};@@ -64,8 +63,8 @@ module.exports = function (User) {set.timestamp = set.score;set.timestampISO = utils.toISOString(set.score);const parts = set.value.split(':');- set.value = validator.escape(String(parts[0]));- set.byUid = validator.escape(String(parts[2] || ''));+ set.value = parts[0];+ set.byUid = parts[2] || '';delete set.score;});@@ -116,7 +115,7 @@ module.exports = function (User) {banObj.until = parseInt(banObj.expire, 10);banObj.untilISO = utils.toISOString(banObj.until);banObj.timestampISO = utils.toISOString(banObj.timestamp);- banObj.reason = validator.escape(String(banObj.reason || '')) || noReasonLangKey;+ banObj.reason = banObj.reason || noReasonLangKey;return banObj;});}@@ -141,7 +140,7 @@ module.exports = function (User) {const userData = await User.getUsersFields(uids, ['uid', 'username', 'userslug', 'picture']);await Promise.all(notes.map(async (note, index) => {if (note) {- note.rawNote = validator.escape(String(note.note));+ note.rawNote = note.note;note.note = await plugins.hooks.fire('filter:parse.raw', String(note.note));note.user = userData[index];}diff --git a/src/user/invite.js b/src/user/invite.jsindex 9699a2a6fe..da10d2d42e 100644--- a/src/user/invite.js+++ b/src/user/invite.js@@ -3,7 +3,6 @@const async = require('async');const nconf = require('nconf');-const validator = require('validator');const winston = require('winston');const db = require('../database');@@ -17,7 +16,7 @@ const plugins = require('../plugins');module.exports = function (User) {User.getInvites = async function (uid) {const emails = await db.getSetMembers(`invitation:uid:${uid}`);- return emails.map(email => validator.escape(String(email)));+ return emails;};User.getInvitesNumber = async function (uid) {diff --git a/src/user/notifications.js b/src/user/notifications.jsindex 03b651953c..15431eb26d 100644--- a/src/user/notifications.js+++ b/src/user/notifications.js@@ -9,7 +9,7 @@ const meta = require('../meta');const notifications = require('../notifications');const privileges = require('../privileges');const plugins = require('../plugins');-const translator = require('../translator');+const tx = require('../translator');const topics = require('../topics');const user = require('./index');@@ -134,8 +134,10 @@ UserNotifications.getNotifications = async function (nids, uid) {await deleteUserNids(deletedNids, uid);notificationData = await notifications.merge(notificationData);await Promise.all(notificationData.map(async (n) => {- if (n && n.bodyShort) {- n.bodyShort = await translator.translate(n.bodyShort, userSettings.userLang);+ if (n) {+ if (n.bodyShort) {+ n.bodyShort = await tx.translateKey(n.bodyShort, [], userSettings.userLang);+ }}}));@@ -212,9 +214,10 @@ UserNotifications.deleteAll = async function (uid) {UserNotifications.sendTopicNotificationToFollowers = async function (uid, topicData, postData) {try {- const [allFollowers, title] = await Promise.all([+ const [displayname, allFollowers, title] = await Promise.all([+ user.getNotificationDisplayname(uid),db.getSortedSetRange(`followers:${uid}`, 0, -1),- topics.getTopicField(topicData.tid, 'title'),+ topics.getNotificationTitle(topicData.tid, 'title'),]);const followers = await privileges.categories.filterUids('read', topicData.cid, allFollowers);if (!followers.length) {@@ -223,7 +226,7 @@ UserNotifications.sendTopicNotificationToFollowers = async function (uid, topicDconst notifObj = await notifications.create({type: 'new-topic',- bodyShort: translator.compile('notifications:user-posted-topic', postData.user.displayname, title),+ bodyShort: tx.compile('notifications:user-posted-topic', displayname, title),bodyLong: postData.content,pid: postData.pid,path: `/post/${postData.pid}`,@@ -256,13 +259,13 @@ UserNotifications.sendWelcomeNotification = async function (uid) {UserNotifications.sendNameChangeNotification = async function (uid, username) {const notifObj = await notifications.create({- bodyShort: `[[user:username-taken-workaround, ${username}]]`,+ bodyShort: tx.compile('user:username-taken-workaround', tx.escape(username)),image: 'brand:logo',nid: `username_taken:${uid}`,datetime: Date.now(),});- await notifications.push(notifObj, uid);+ await notifications.push(notifObj, [uid]);};UserNotifications.pushCount = async function (uid) {diff --git a/src/user/settings.js b/src/user/settings.jsindex c7f69f4849..9a14995b0d 100644--- a/src/user/settings.js+++ b/src/user/settings.js@@ -1,8 +1,6 @@'use strict';-const validator = require('validator');-const meta = require('../meta');const db = require('../database');const activitypub = require('../activitypub');@@ -89,8 +87,8 @@ module.exports = function (User) {settings.disableIncomingChats = parseInt(getSetting(settings, 'disableIncomingChats', 0), 10) === 1;settings.topicSearchEnabled = parseInt(getSetting(settings, 'topicSearchEnabled', 0), 10) === 1;settings.updateUrlWithPostIndex = parseInt(getSetting(settings, 'updateUrlWithPostIndex', 1), 10) === 1;- settings.bootswatchSkin = validator.escape(String(settings.bootswatchSkin || ''));- settings.homePageRoute = validator.escape(String(settings.homePageRoute || '')).replace(///g, '/');+ settings.bootswatchSkin = settings.bootswatchSkin || '';+ settings.homePageRoute = settings.homePageRoute || '';settings.scrollToMyPost = parseInt(getSetting(settings, 'scrollToMyPost', 1), 10) === 1;settings.categoryWatchState = getSetting(settings, 'categoryWatchState', 'notwatching');settings.hideReadNotifications = parseInt(getSetting(settings, 'hideReadNotifications', 0), 10) === 1;diff --git a/src/utils.js b/src/utils.jsindex abc7a92e2a..14aecdd6d3 100644--- a/src/utils.js+++ b/src/utils.js@@ -7,11 +7,15 @@ const path = require('node:path');process.profile = function (operation, start) {console.log('%s took %d milliseconds', operation, process.elapsedTimeSince(start));};-+const NS_PER_SEC = 1e9;process.elapsedTimeSince = function (start) {const diff = process.hrtime(start);return (diff[0] * 1e3) + (diff[1] / 1e6);};+process.elapsedNano = function (start) {+ const [seconds, nanoseconds] = process.hrtime(start);+ return (seconds * NS_PER_SEC) + nanoseconds;+};const utils = { ...require('../public/src/utils.common') };utils.getLanguage = function () {diff --git a/src/views/400.tpl b/src/views/400.tplindex fb10fcfa81..7601ccf7c5 100644--- a/src/views/400.tpl+++ b/src/views/400.tpl@@ -6,7 +6,7 @@<div class="mx-auto p-4 bg-light border rounded"><i class="text-secondary fa fa-fw fa-4x fa-triangle-exclamation"></i></div>- {{{ if error }}}{error}{{{ else }}}[[global:400.message, {config.relative_path}]]{{{ end }}}+ {{{ if error }}}{tx(error)}{{{ else }}}[[global:400.message, {config.relative_path}]]{{{ end }}}</div></div></div>diff --git a/src/views/403.tpl b/src/views/403.tplindex 806eceb30c..761f7507e7 100644--- a/src/views/403.tpl+++ b/src/views/403.tpl@@ -6,7 +6,7 @@<div class="mx-auto p-4 bg-light border rounded"><i class="text-secondary fa fa-fw fa-4x fa-key"></i></div>- {{{ if error }}}{error}{{{ else }}}[[global:403.message]]{{{ end }}}+ {{{ if error }}}{tx(error)}{{{ else }}}[[global:403.message]]{{{ end }}}{{{ if !loggedIn }}}[[global:403.login, {config.relative_path}]]{{{ end }}}diff --git a/src/views/404.tpl b/src/views/404.tplindex 482e16ecd9..ddc2f47e7a 100644--- a/src/views/404.tpl+++ b/src/views/404.tpl@@ -6,7 +6,7 @@<div class="mx-auto p-4"><i class="text-secondary fa fa-fw fa-4x {{{ if icon }}}{icon}{{{ else }}}fa-otter{{{ end }}}"></i></div>- {{{ if error }}}{error}{{{ else }}}[[global:404.message, {config.relative_path}]]{{{ end }}}+ {{{ if error }}}{tx(error)}{{{ else }}}[[global:404.message, {config.relative_path}]]{{{ end }}}</div></div></div>diff --git a/src/views/500.tpl b/src/views/500.tplindex b24f7342a3..88552df5ec 100644--- a/src/views/500.tpl+++ b/src/views/500.tpl@@ -7,7 +7,7 @@<i class="text-secondary fa fa-fw fa-4x fa-triangle-exclamation"></i></div>[[global:500.message]]- {{{ if error }}}<div class="text-sm text-muted">{error}</div>{{{ end }}}+ {{{ if error }}}<div class="text-sm text-muted">{tx(error)}</div>{{{ end }}}</div></div></div>\ No newline at end of filediff --git a/src/views/admin/advanced/events.tpl b/src/views/admin/advanced/events.tplindex f20eca0547..9289d27bfc 100644--- a/src/views/admin/advanced/events.tpl+++ b/src/views/admin/advanced/events.tpl@@ -14,7 +14,7 @@<span class="badge bg-info">{events.type}</span><span class="badge bg-info">uid {events.uid}</span>{{{ if events.ip }}}<span class="badge bg-info">{events.ip}</span>{{{ end }}}- <a href="{config.relative_path}/user/{events.user.userslug}" target="_blank">{buildAvatar(events.user, "24px", true)}</a>+ <a href="{config.relative_path}/user/{events.user.userslug}" target="_blank">{{buildAvatar(events.user, "24px", true)}}</a><a href="{config.relative_path}/user/{events.user.userslug}" target="_blank">{events.user.username}</a><span class="text-xs">{events.timestampISO}</span></div>diff --git a/src/views/admin/dashboard.tpl b/src/views/admin/dashboard.tplindex 739ecaac02..d0b81e1bc9 100644--- a/src/views/admin/dashboard.tpl+++ b/src/views/admin/dashboard.tpl@@ -98,10 +98,10 @@{{{ each notices}}}<div class="text-sm">{{{ if ./done }}}- <i class="fa fa-fw fa-check text-success"></i> {./doneText}+ <i class="fa fa-fw fa-check text-success"></i> {tx(./doneText)}{{{ else }}}{{{ if ./link }}}<a href="{config.relative_path}{./link}" data-bs-toggle="tooltip" title="{./tooltip}">{{{ end }}}- <i class="fa fa-fw fa-times text-danger"></i> {./notDoneText}+ <i class="fa fa-fw fa-times text-danger"></i> {tx(./notDoneText)}{{{ if ./link }}}</a>{{{ end }}}{{{ end }}}</div>diff --git a/src/views/admin/dashboard/logins.tpl b/src/views/admin/dashboard/logins.tplindex 0d4ca60e0d..4a63afb9c4 100644--- a/src/views/admin/dashboard/logins.tpl+++ b/src/views/admin/dashboard/logins.tpl@@ -19,9 +19,9 @@{{{ each sessions }}}<tr><td class="d-flex gap-2 align-items-center">- <a href="{config.relative_path}/uid/{./user.uid}">{buildAvatar(./user, "18px", true)}</a>+ <a href="{config.relative_path}/uid/{./user.uid}">{{buildAvatar(./user, "18px", true)}}</a><a href="{config.relative_path}/uid/{./user.uid}">{./user.username}</a>- {userAgentIcons(@value)} {../browser} {../version} on {../platform}+ {{userAgentIcons(@value)}} {../browser} {../version} on {../platform}</td><td class="text-nowrap"><span class="timeago" title="{./datetimeISO}"></span></td></tr>diff --git a/src/views/admin/dashboard/topics.tpl b/src/views/admin/dashboard/topics.tplindex ee92cd254a..bf1cb39519 100644--- a/src/views/admin/dashboard/topics.tpl+++ b/src/views/admin/dashboard/topics.tpl@@ -12,9 +12,9 @@{{{ end }}}{{{ each topics }}}<tr>- <td><a href="{config.relative_path}/topic/{../slug}">{../title}</a></td>- <td>[[topic:posted-by, {../user.username}]]</td>- <td class="text-nowrap"><span class="timeago" data-title="{../timestampISO}"></span></td>+ <td><a href="{config.relative_path}/topic/{../slug}">{./title}</a></td>+ <td>[[topic:posted-by, {./user.username}]]</td>+ <td class="text-nowrap"><span class="timeago" title="{./timestampISO}"></span></td></tr>{{{ end }}}</tbody>diff --git a/src/views/admin/dashboard/users.tpl b/src/views/admin/dashboard/users.tplindex 1db7e85ef7..e760dc9032 100644--- a/src/views/admin/dashboard/users.tpl+++ b/src/views/admin/dashboard/users.tpl@@ -19,10 +19,10 @@{{{ end }}}{{{ each users }}}<tr>- <td>{../uid}</td>- <td>{../username}</td>- <td>{../email}</td>- <td class="text-nowrap"><span class="timeago" title="{../joindateISO}"></span></td>+ <td>{./uid}</td>+ <td>{./username}</td>+ <td>{./email}</td>+ <td class="text-nowrap"><span class="timeago" title="{./joindateISO}"></span></td></tr>{{{ end }}}</tbody>diff --git a/src/views/admin/extend/widgets.tpl b/src/views/admin/extend/widgets.tplindex f942962568..3112d73207 100644--- a/src/views/admin/extend/widgets.tpl+++ b/src/views/admin/extend/widgets.tpl@@ -33,7 +33,7 @@<div class="tab-pane {{{ if @first }}}active{{{ end }}}" data-template="{./template}">{{{ each templates.areas }}}<div class="area" data-template="{templates.template}" data-location="{./location}">- <h5>{./name} <span class="fs-6 text-secondary">{templates.template} / {./location}</span></h5>+ <h5>{tx(./name)} <span class="fs-6 text-secondary">{templates.template} / {./location}</span></h5><div class="card card-body text-bg-light widget-area {{{ if (./location == "drafts")}}} overflow-auto{{{ end }}}" {{{ if (./location == "drafts")}}}style="max-height: calc(100vh - 200px);"{{{ end }}}></div>@@ -75,7 +75,7 @@</div><div class="card-body hidden"><form>- {./content}+ {{./content}}</form></div></div>diff --git a/src/views/admin/federation/errors.tpl b/src/views/admin/federation/errors.tplindex 61f44b9d30..d850ecef30 100644--- a/src/views/admin/federation/errors.tpl+++ b/src/views/admin/federation/errors.tpl@@ -1,6 +1,6 @@<div component="settings/main/header" class="row border-bottom py-2 m-0 mb-3 sticky-top acp-page-main-header align-items-center"><div class="col-12 col-md-8 px-0 mb-1 mb-md-0">- <h4 class="fw-bold tracking-tight mb-0">{title}</h4>+ <h4 class="fw-bold tracking-tight mb-0">{tx(title)}</h4></div></div>diff --git a/src/views/admin/federation/relays.tpl b/src/views/admin/federation/relays.tplindex e7d6939413..c0f449b2fb 100644--- a/src/views/admin/federation/relays.tpl+++ b/src/views/admin/federation/relays.tpl@@ -1,6 +1,6 @@<div component="settings/main/header" class="row border-bottom py-2 m-0 mb-3 sticky-top acp-page-main-header align-items-center"><div class="col-12 col-md-8 px-0 mb-1 mb-md-0">- <h4 class="fw-bold tracking-tight mb-0">{title}</h4>+ <h4 class="fw-bold tracking-tight mb-0">{tx(title)}</h4></div></div>diff --git a/src/views/admin/header.tpl b/src/views/admin/header.tplindex 20a3cee3e5..172af30492 100644--- a/src/views/admin/header.tpl+++ b/src/views/admin/header.tpl@@ -1,10 +1,10 @@<!DOCTYPE html>-<html data-bs-theme="light" lang="{localeToHTML(acpLang, defaultLang)" {{{if languageDirection}}}data-dir="{languageDirection}" style="direction: {languageDirection};"{{{end}}}>+<html data-bs-theme="light" lang="{localeToHTML(acpLang, defaultLang)}" {{{if languageDirection}}}data-dir="{languageDirection}" style="direction: {languageDirection};"{{{end}}}><head><title>{title}</title>- {{{each metaTags}}}{buildMetaTag(@value)}{{{end}}}- {{{each linkTags}}}{buildLinkTag(@value)}{{{end}}}+ {{{each metaTags}}}{{buildMetaTag(@value)}}{{{end}}}+ {{{each linkTags}}}{{buildLinkTag(@value)}}{{{end}}}<link rel="stylesheet" type="text/css" href="{relative_path}/assets/admin{{{ if (languageDirection=="rtl") }}}-rtl{{{ end }}}.css?{cache-buster}" /><script>diff --git a/src/views/admin/manage/admins-mods.tpl b/src/views/admin/manage/admins-mods.tplindex 6375ea923e..5988b1dc78 100644--- a/src/views/admin/manage/admins-mods.tpl+++ b/src/views/admin/manage/admins-mods.tpl@@ -13,7 +13,7 @@<div class="administrator-area d-flex flex-wrap">{{{ each admins.members }}}<div class="badge text-bg-light m-1 p-1 border d-inline-flex gap-1 align-items-center" data-uid="{admins.members.uid}">- {buildAvatar(admins.members, "24px", true)}+ {{buildAvatar(admins.members, "24px", true)}}<a href="{config.relative_path}/user/{admins.members.userslug}">{admins.members.username}</a><button class="btn btn-ghost btn-sm p-0 remove-user-icon"><i class="fa fa-fw fa-times"></i>@@ -33,7 +33,7 @@<div class="global-moderator-area mb-2 d-flex flex-wrap">{{{ each globalMods.members }}}<div class="badge text-bg-light m-1 p-1 border d-inline-flex gap-1 align-items-center" data-uid="{globalMods.members.uid}">- {buildAvatar(globalMods.members, "24px", true)}+ {{buildAvatar(globalMods.members, "24px", true)}}<a href="{config.relative_path}/user/{globalMods.members.userslug}">{globalMods.members.username}</a><button class="btn btn-ghost btn-sm p-0 remove-user-icon"><i class="fa fa-fw fa-times"></i>@@ -69,7 +69,7 @@<div class="d-flex gap-2 justify-content-between flex-column flex-md-row align-items-start align-items-md-center mb-2 flex-wrap"><div class="d-flex flex-column flex-md-row gap-2 align-items-md-center"><div class="d-flex gap-1 align-items-center">- {buildCategoryIcon(@value, "28px", "rounded-1")}+ {{buildCategoryIcon(@value, "28px", "rounded-1")}}<h5 class="mb-0">{categoryMods.name}</h5></div>{{{ if categoryMods.subCategoryCount }}}@@ -85,7 +85,7 @@<div class="moderator-area d-flex flex-wrap" data-cid="{categoryMods.cid}">{{{ each categoryMods.moderators }}}<div class="badge text-bg-light m-1 p-1 border d-inline-flex gap-1 align-items-center" data-uid="{categoryMods.moderators.uid}">- {buildAvatar(categoryMods.moderators, "24px", true)}+ {{buildAvatar(categoryMods.moderators, "24px", true)}}<a href="{config.relative_path}/user/{categoryMods.moderators.userslug}">{categoryMods.moderators.username}</a><button class="btn btn-ghost btn-sm p-0 remove-user-icon"><i class="fa fa-fw fa-times" role="button"></i>diff --git a/src/views/admin/manage/api.tpl b/src/views/admin/manage/api.tplindex aceb343d74..686db99071 100644--- a/src/views/admin/manage/api.tpl+++ b/src/views/admin/manage/api.tpl@@ -1,7 +1,7 @@<div class="px-lg-4"><div component="settings/main/header" class="row d-flex flex-wrap justify-content-between border-bottom py-2 m-0 sticky-top acp-page-main-header align-items-center mb-3"><div class="col-12 col-md-8 px-0 mb-1 mb-md-0">- <h4 class="fw-bold tracking-tight mb-0">{title}</h4>+ <h4 class="fw-bold tracking-tight mb-0">{tx(./title)}</h4></div><div class="col-12 col-md-4 px-0 px-md-3"><div class="d-flex gap-1 justify-content-end">diff --git a/src/views/admin/manage/category-analytics.tpl b/src/views/admin/manage/category-analytics.tplindex b0a6b14828..e1330417ae 100644--- a/src/views/admin/manage/category-analytics.tpl+++ b/src/views/admin/manage/category-analytics.tpl@@ -3,7 +3,7 @@<div class="row border-bottom py-2 m-0 sticky-top acp-page-main-header align-items-center"><div class="col-12 px-0 mb-1 mb-md-0 d-flex justify-content-between align-items-center">- <h4 class="fw-bold tracking-tight mb-0">[[admin/manage/categories:analytics.title, {name}]]</h4>+ <h4 class="fw-bold tracking-tight mb-0">{{tx("admin/manage/categories:analytics.title", txEscape(name))}}</h4><!-- IMPORT admin/partials/category/selector-dropdown-right.tpl --></div></div>diff --git a/src/views/admin/manage/category-federation.tpl b/src/views/admin/manage/category-federation.tplindex adf64b624b..8c027afb1e 100644--- a/src/views/admin/manage/category-federation.tpl+++ b/src/views/admin/manage/category-federation.tpl@@ -76,7 +76,7 @@{{{ each followers }}}<tr data-uid="{./uid}"><td class="w-100 text-truncate" style="max-width: 1px;">- {buildAvatar(followers, "24px", true)}+ {{buildAvatar(followers, "24px", true)}}{./userslug}</td><td class="w-0">diff --git a/src/views/admin/manage/category.tpl b/src/views/admin/manage/category.tplindex 19b0efa116..e434836a85 100644--- a/src/views/admin/manage/category.tpl+++ b/src/views/admin/manage/category.tpl@@ -1,7 +1,7 @@<div class="category acp-page-container" data-cid="{category.cid}"><div component="settings/main/header" class="row border-bottom py-2 m-0 sticky-top acp-page-main-header align-items-center"><div class="col-12 col-md-8 px-0 mb-1 mb-md-0 d-flex justify-content-between align-items-center">- <h4 class="fw-bold tracking-tight mb-0">[[admin/manage/categories:edit-category]]</h4>+ <h4 class="fw-bold tracking-tight mb-0 text-nowrap">[[admin/manage/categories:edit-category]]</h4><!-- IMPORT admin/partials/category/selector-dropdown-right.tpl --></div><div class="col-12 col-md-4 px-0 px-md-3 ">diff --git a/src/views/admin/manage/digest.tpl b/src/views/admin/manage/digest.tplindex 9c6c226ef1..ce954ff39b 100644--- a/src/views/admin/manage/digest.tpl+++ b/src/views/admin/manage/digest.tpl@@ -28,9 +28,9 @@<tbody>{{{ each delivery }}}<tr>- <td>{buildAvatar(delivery, "24px", true)} <a href="{config.relative_path}/uid/{./uid}">{./username}</a></td>+ <td>{{buildAvatar(delivery, "24px", true)}} <a href="{config.relative_path}/uid/{./uid}">{./username}</a></td><td>{{{if ./setting}}}{./setting}{{{else}}}<em>[[admin/manage/digest:default]]</em>{{{end}}}</td>- <td>{./lastDelivery}</td>+ <td>{{tx(./lastDelivery)}}</td><td><button class="btn btn-sm btn-outline-secondary" data-action="resend" data-uid="{./uid}">[[admin/manage/digest:resend]]</button></td></tr>{{{ end }}}diff --git a/src/views/admin/manage/group.tpl b/src/views/admin/manage/group.tplindex 775bd5f77f..b3eeec0a56 100644--- a/src/views/admin/manage/group.tpl+++ b/src/views/admin/manage/group.tpl@@ -61,7 +61,7 @@<i id="group-icon" class="fa fa-2x {{{ if group.icon }}}{group.icon}{{{ end }}}" value="{group.icon}"></i></div><div class="w-100">- <input type="text" class="form-control" id="change-group-user-title" placeholder="The title of users if they are a member of this group" value="{group.userTitleEscaped}" maxlength="{maximumGroupTitleLength}" data-property />+ <input type="text" class="form-control" id="change-group-user-title" placeholder="The title of users if they are a member of this group" value="{group.userTitle}" maxlength="{maximumGroupTitleLength}" data-property /></div></div></div>@@ -171,18 +171,18 @@<li component="category/no-matches" role="presentation" class="category hidden"><a class="dropdown-item" role="menuitem">[[search:no-matches]]</a></li>- {{{each categories}}}+ {{{ each categories }}}<li role="presentation" class="category {{{ if categories.disabledClass }}}disabled{{{ end }}}" data-cid="{categories.cid}" data-name="{categories.name}" data-parent-cid="{categories.parentCid}"><a class="dropdown-item rounded-1" role="menuitem">{categories.level}<span component="category-markup"><div class="category-item d-inline-block">- {buildCategoryIcon(@value, "24px", "rounded-circle")}+ {{buildCategoryIcon(@value, "24px", "rounded-circle")}}{./name}</div></span></a></li>- {{{end}}}+ {{{ end }}}</ul></div></div>diff --git a/src/views/admin/manage/registration.tpl b/src/views/admin/manage/registration.tplindex 265066926c..8ac8740282 100644--- a/src/views/admin/manage/registration.tpl+++ b/src/views/admin/manage/registration.tpl@@ -25,7 +25,7 @@</thead><tbody>{{{ each users }}}- <tr data-username="{./usernameEscaped}">+ <tr data-username="{./username}"><td>{{{ if ./usernameSpam }}}<i class="fa fa-times-circle text-danger" title="[[admin/manage/registration:list.username-spam, {./spamData.username.frequency}, {./spamData.username.appears}, {./spamData.username.confidence}]]"></i>@@ -60,7 +60,7 @@{./ip}{{{ each ./ipMatch }}}<br>- {buildAvatar(@value, "24px", true)}+ {{buildAvatar(@value, "24px", true)}}<a href="{config.relative_path}/uid/{./uid}">{./username}</a>{{{ end }}}</td>diff --git a/src/views/admin/manage/tags.tpl b/src/views/admin/manage/tags.tplindex 5353a0a4d6..2f0a61d931 100644--- a/src/views/admin/manage/tags.tpl+++ b/src/views/admin/manage/tags.tpl@@ -31,10 +31,10 @@<div class="tag-list">{{{ each tags }}}- <div class="tag-row p-2 me-3 mb-1" data-tag="{tags.valueEscaped}">+ <div class="tag-row p-2 me-3 mb-1" data-tag="{tags.value}"><div><button disabled class="rounded-3 btn btn-light border position-relative">- {tags.valueEscaped}+ {tags.value}<span class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-secondary">{tags.score} <span class="visually-hidden">[[tags:tags]]</span></button></div>diff --git a/src/views/admin/manage/users/custom-reasons.tpl b/src/views/admin/manage/users/custom-reasons.tplindex 471177d24b..287c45e73b 100644--- a/src/views/admin/manage/users/custom-reasons.tpl+++ b/src/views/admin/manage/users/custom-reasons.tpl@@ -33,8 +33,8 @@<a href="#" component="sort/handle" class="btn btn-light btn-sm d-none d-md-block ui-sortable-handle" style="cursor:grab;"><i class="fa fa-arrows-up-down text-muted"></i></a></td><td class="text-nowrap">{./title}</td>- <td class="text-nowrap">{{{ if ./type }}}{./translatedType}{{{ else }}}[[admin/manage/custom-reasons:reason-all]]{{{ end }}}</td>- <td class="">{./parsedBody}</td>+ <td class="text-nowrap">{{{ if ./type }}}{tx(./translatedType)}{{{ else }}}[[admin/manage/custom-reasons:reason-all]]{{{ end }}}</td>+ <td class="">{{txEscape(./parsedBody)}}</td><td class=""><div class="d-flex justify-content-end gap-1"><button data-action="edit" data-key="{./key}" class="btn btn-light btn-sm">[[admin/admin:edit]]</button>diff --git a/src/views/admin/partials/breadcrumbs.tpl b/src/views/admin/partials/breadcrumbs.tplindex 506d7da541..1832f96553 100644--- a/src/views/admin/partials/breadcrumbs.tpl+++ b/src/views/admin/partials/breadcrumbs.tpl@@ -4,7 +4,7 @@<li{{{ if @last }}} component="breadcrumb/current"{{{ end }}} itemscope="itemscope" itemprop="itemListElement" itemtype="http://schema.org/ListItem" class="breadcrumb-item {{{ if @last }}}active{{{ end }}}"><meta itemprop="position" content="{@index}" />{{{ if ./url }}}<a href="{./url}" itemprop="item">{{{ end }}}- <span class="fw-semibold" itemprop="name">{./text}</span>+ <span class="fw-semibold" itemprop="name">{tx(./text)}</span>{{{ if ./url }}}</a>{{{ end }}}</li>{{{ end }}}diff --git a/src/views/admin/partials/categories/category-rows.tpl b/src/views/admin/partials/categories/category-rows.tplindex d15976227a..8f432ce63c 100644--- a/src/views/admin/partials/categories/category-rows.tpl+++ b/src/views/admin/partials/categories/category-rows.tpl@@ -10,14 +10,14 @@</button><div class="information flex-1 align-items-start d-flex gap-2"><div>- {buildCategoryIcon(@value, "28px", "rounded-1")}+ {{buildCategoryIcon(@value, "28px", "rounded-1")}}</div><div class="d-grid gap-0"><div class="title fw-semibold"><a class="category-header text-reset" href="{config.relative_path}/admin/manage/categories/{categories.cid}">{categories.name}</a> {{{ if categories.link }}}<a class="text-xs text-muted" href="{categories.link}"><i class="fa fa-link"></i> {categories.link}</a>{{{ end }}}</div>- {{{ if categories.descriptionParsed }}}- <div class="description text-muted text-xs w-100">{categories.descriptionParsed}</div>+ {{{ if categories.description }}}+ <div class="description text-muted text-xs w-100">{categories.description}</div>{{{ end }}}</div></div>diff --git a/src/views/admin/partials/categories/purge.tpl b/src/views/admin/partials/categories/purge.tplindex c20b70a0ab..0ed2b72a70 100644--- a/src/views/admin/partials/categories/purge.tpl+++ b/src/views/admin/partials/categories/purge.tpl@@ -1,5 +1,5 @@<form type="form">- [[admin/manage/categories:alert.confirm-purge, {name}]]+ {{tx("admin/manage/categories:alert.confirm-purge", name)}}<hr/><div class="progress"><div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="{topic_count}" style="width: 0%;">diff --git a/src/views/admin/partials/categories/select-category.tpl b/src/views/admin/partials/categories/select-category.tplindex 178b598448..2de3c6b9da 100644--- a/src/views/admin/partials/categories/select-category.tpl+++ b/src/views/admin/partials/categories/select-category.tpl@@ -18,7 +18,7 @@<a class="dropdown-item rounded-1" role="menuitem">{categories.level}<span component="category-markup"><div class="category-item d-inline-block">- {buildCategoryIcon(@value, "24px", "rounded-circle")}+ {{buildCategoryIcon(@value, "24px", "rounded-circle")}}{./name}</div></span>@@ -31,5 +31,5 @@</div>{{{ if message }}}-<div>{message}</div>+<div>{{message}}</div>{{{ end }}}\ No newline at end of filediff --git a/src/views/admin/partials/category/selector-dropdown-content.tpl b/src/views/admin/partials/category/selector-dropdown-content.tplindex 010f2b9ff7..ed624775b2 100644--- a/src/views/admin/partials/category/selector-dropdown-content.tpl+++ b/src/views/admin/partials/category/selector-dropdown-content.tpl@@ -2,12 +2,12 @@<span component="category-selector-selected" class="d-flex align-items-center gap-1">{{{ if (selectedCategory && !showCategorySelectLabel) }}}<span class="category-item d-inline-flex align-items-center gap-1">- {buildCategoryIcon(selectedCategory, "24px", "rounded-circle")}- <span class="fw-semibold">{selectedCategory.name}</span>+ {{buildCategoryIcon(selectedCategory, "24px", "rounded-circle")}}+ <span class="fw-semibold text-truncate" style="max-width:200px;">{tx(selectedCategory.name)}</span></span>{{{ else }}}<i class="fa fa-fw {{{ if selectCategoryIcon }}}{selectCategoryIcon}{{{ else }}}fa-list{{{ end }}}"></i>- {{{ if selectCategoryLabel }}}{selectCategoryLabel}{{{ else }}}[[topic:thread-tools.select-category]]{{{ end }}}+ {{{ if selectCategoryLabel }}}{tx(selectCategoryLabel)}{{{ else }}}[[topic:thread-tools.select-category]]{{{ end }}}{{{ end }}}</span><span class="caret"></span>@@ -25,11 +25,11 @@</li>{{{each categoryItems}}}<li role="presentation" class="category {{{ if ./disabledClass }}}disabled {{{ end }}}" data-cid="{./cid}" data-name="{./name}" data-parent-cid="{./parentCid}">- <a href="#" class="dropdown-item rounded-1" role="menu-item">{./level}- <span component="category-markup" style="{{{ if ./match }}}font-weight: bold;{{{end}}}">+ <a href="#" class="dropdown-item rounded-1" role="menu-item">+ <span component="category-markup" style="{{{ if ./match }}}font-weight: bold;{{{end}}} margin-left: calc({./depth} * 24px);"><div class="category-item d-inline-flex align-items-center gap-1">{{{ if ./icon }}}- {buildCategoryIcon(@value, "24px", "rounded-circle")}+ {{buildCategoryIcon(@value, "24px", "rounded-circle")}}{{{ end }}}{./name}</div>diff --git a/src/views/admin/partials/dashboard/graph.tpl b/src/views/admin/partials/dashboard/graph.tplindex c01b923109..a9b6ec079b 100644--- a/src/views/admin/partials/dashboard/graph.tpl+++ b/src/views/admin/partials/dashboard/graph.tpl@@ -1,7 +1,7 @@<div class="card shadow-none mb-3" id="analytics-panel"><div class="card-header"><div class="d-flex justify-content-between align-items-center">- {graphTitle}+ {tx(graphTitle)}<div class="d-flex gap-1 align-items-center"><a class="btn btn-sm btn-light lh-sm" target="_blank" id="view-as-json" href="{config.relative_path}/api/v3/admin/analytics/{set}?type=hourly" data-bs-toggle="tooltip" data-bs-placement="bottom" title="[[admin/dashboard:view-as-json]]"><i class="fa fa-fw fa-xs fa-terminal text-primary"></i></a>diff --git a/src/views/admin/partials/dashboard/stats.tpl b/src/views/admin/partials/dashboard/stats.tplindex 098dacddff..b45b793548 100644--- a/src/views/admin/partials/dashboard/stats.tpl+++ b/src/views/admin/partials/dashboard/stats.tpl@@ -22,9 +22,9 @@<tr><td class="fw-semibold text-nowrap">{{{ if ./href }}}- <a href="{./href}">{./name}</a>+ <a href="{./href}">{tx(./name)}</a>{{{ else }}}- {./name}+ {tx(./name)}{{{ end }}}</td><td class="text-end">{formattedNumber(./yesterday)}</td>diff --git a/src/views/admin/partials/groups/memberlist.tpl b/src/views/admin/partials/groups/memberlist.tplindex 6881b3667c..7192583df9 100644--- a/src/views/admin/partials/groups/memberlist.tpl+++ b/src/views/admin/partials/groups/memberlist.tpl@@ -17,7 +17,7 @@<tr data-uid="{group.members.uid}"><td class="member-name d-flex justify-content-between align-items-center"><div class="d-flex align-items-center gap-2">- <a href="{config.relative_path}/user/{group.members.userslug}">{buildAvatar(group.members, "24px", true)}</a>+ <a href="{config.relative_path}/user/{group.members.userslug}">{{buildAvatar(group.members, "24px", true)}}</a><a href="{config.relative_path}/user/{group.members.userslug}">{group.members.username}</a> <i title="[[groups:owner]]" class="user-owner-icon fa fa-star text-warning {{{ if !group.members.isOwner }}}invisible{{{ end }}}"></i></div>diff --git a/src/views/admin/partials/manage_user_groups.tpl b/src/views/admin/partials/manage_user_groups.tplindex 03804d8be9..5b184960ab 100644--- a/src/views/admin/partials/manage_user_groups.tpl+++ b/src/views/admin/partials/manage_user_groups.tpl@@ -1,13 +1,13 @@{{{ each users }}}<div data-uid="{users.uid}">- <h5>{users.username}</h5>+ <h5>{./username}</h5><div class="group-area">- {{{ each users.groups }}}- <div class="group-card float-start m-1" data-group-name="{users.groups.nameEscaped}">- <a href="{config.relative_path}/admin/manage/groups/{users.groups.slug}"><span class="badge p-2" style="color:{users.groups.textColor}; background-color: {users.groups.labelColor};">{{{ if users.groups.icon }}}<i class="fa {users.groups.icon}"></i> {{{ end }}}{users.groups.displayName} <i class="ms-2 remove-group-icon fa fa-times" role="button"></i></span></a>+ {{{ each ./groups }}}+ <div class="group-card float-start m-1" data-group-name="{./name}">+ <a href="{config.relative_path}/admin/manage/groups/{./slug}"><span class="badge p-2" style="color:{./textColor}; background-color: {./labelColor};">{{{ if ./icon }}}<i class="fa {./icon}"></i> {{{ end }}}{./name} <i class="ms-2 remove-group-icon fa fa-times" role="button"></i></span></a></div>{{{ end }}}</div>- <input data-uid="{users.uid}" class="form-control group-search" placeholder="[[admin/manage/users:add-group]]" />+ <input data-uid="{./uid}" class="form-control group-search" placeholder="[[admin/manage/users:add-group]]" /></div>{{{ end }}}\ No newline at end of filediff --git a/src/views/admin/partials/navigation.tpl b/src/views/admin/partials/navigation.tplindex 29465797f8..7097a55d27 100644--- a/src/views/admin/partials/navigation.tpl+++ b/src/views/admin/partials/navigation.tpl@@ -160,14 +160,14 @@<div id="collapsePlugins" class="accordion-collapse collapse" data-bs-parent="#accordionACP"><div class="accordion-body p-0 d-grid">{{{ each plugins }}}- <a class="btn btn-ghost btn-sm text-start" href="{relative_path}/admin{./route}">{./name}</a>+ <a class="btn btn-ghost btn-sm text-start" href="{relative_path}/admin{./route}">{tx(./name)}</a>{{{ end }}}{{{ if authentication.length }}}<hr/><div class="text-sm ms-4">[[admin/menu:section-social-auth]]</div>{{{ each authentication }}}- <a class="btn btn-ghost btn-sm text-start" href="{relative_path}/admin{./route}">{./name}</a>+ <a class="btn btn-ghost btn-sm text-start" href="{relative_path}/admin{./route}">{tx(./name)}</a>{{{ end }}}{{{ end }}}<hr/>diff --git a/src/views/admin/partials/privileges/category.tpl b/src/views/admin/partials/privileges/category.tplindex 9c85ec86d1..153e90faeb 100644--- a/src/views/admin/partials/privileges/category.tpl+++ b/src/views/admin/partials/privileges/category.tpl@@ -18,13 +18,13 @@<th colspan="2">[[admin/manage/categories:privileges.section-group]]</th><th class="text-center">[[admin/manage/privileges:select-clear-all]]</th>{{{ each privileges.labelData }}}- <th class="text-center" data-type="{./type}">{./label}</th>+ <th class="text-center" data-type="{./type}">{tx(./label)}</th>{{{ end }}}</tr></thead><tbody>{{{ each privileges.groups }}}- <tr data-group-name="{privileges.groups.nameEscaped}" data-private="{{{ if privileges.groups.isPrivate }}}1{{{ else }}}0{{{ end }}}">+ <tr data-group-name="{privileges.groups.name}" data-private="{{{ if privileges.groups.isPrivate }}}1{{{ else }}}0{{{ end }}}"><td>{{{ if privileges.groups.isPrivate }}}{{{ if (privileges.groups.name == "banned-users") }}}@@ -54,7 +54,7 @@<input autocomplete="off" type="checkbox" class="form-check-input float-none checkbox-helper"></div></td>- {spawnPrivilegeStates(cid, privileges.groups.name, ../privileges, ../types)}+ {{spawnPrivilegeStates(cid, privileges.groups.name, ../privileges, ../types)}}</tr>{{{ end }}}</tbody>@@ -111,7 +111,7 @@<th colspan="2">[[admin/manage/categories:privileges.section-user]]</th><th class="text-center">[[admin/manage/privileges:select-clear-all]]</th>{{{ each privileges.labelData }}}- <th class="text-center" data-type="{./type}">{./label}</th>+ <th class="text-center" data-type="{./type}">{tx(./label)}</th>{{{ end }}}</tr></thead>@@ -119,7 +119,7 @@{{{ each privileges.users }}}<tr data-uid="{privileges.users.uid}"{{{ if privileges.users.banned }}} data-banned{{{ end }}}><td>- {buildAvatar(privileges.users, "24px", true)}+ {{buildAvatar(privileges.users, "24px", true)}}{{{ if privileges.users.banned }}}<i class="ban fa fa-gavel text-danger" title="[[admin/manage/categories:privileges.banned-user-inheritance]]"></i>{{{ end }}}@@ -133,7 +133,7 @@<input autocomplete="off" type="checkbox" class="form-check-input float-none checkbox-helper"></div></td>- {spawnPrivilegeStates(cid, privileges.users.username, ../privileges, ../types)}+ {{spawnPrivilegeStates(cid, privileges.users.username, ../privileges, ../types)}}</tr>{{{ end }}}</tbody>diff --git a/src/views/admin/partials/privileges/global.tpl b/src/views/admin/partials/privileges/global.tplindex 6da2387679..beb4fbb7d2 100644--- a/src/views/admin/partials/privileges/global.tpl+++ b/src/views/admin/partials/privileges/global.tpl@@ -20,13 +20,13 @@<th colspan="2">[[admin/manage/categories:privileges.section-group]]</th><th class="text-center">[[admin/manage/privileges:select-clear-all]]</th>{{{ each privileges.labelData }}}- <th class="text-center" data-type="{./type}">{./label}</th>+ <th class="text-center" data-type="{./type}">{tx(./label)}</th>{{{ end }}}</tr></thead><tbody>{{{ each privileges.groups }}}- <tr data-group-name="{privileges.groups.nameEscaped}" data-private="{{{ if privileges.groups.isPrivate }}}1{{{ else }}}0{{{ end }}}">+ <tr data-group-name="{privileges.groups.name}" data-private="{{{ if privileges.groups.isPrivate }}}1{{{ else }}}0{{{ end }}}"><td>{{{ if privileges.groups.isPrivate }}}{{{ if (privileges.groups.name == "banned-users") }}}@@ -41,7 +41,7 @@</td><td></td><td class="text-center"><input autocomplete="off" type="checkbox" class="checkbox-helper"></td>- {spawnPrivilegeStates(cid, privileges.groups.name, ../privileges, ../types)}+ {{spawnPrivilegeStates(cid, privileges.groups.name, ../privileges, ../types)}}</tr>{{{ end }}}</tbody>@@ -86,7 +86,7 @@<th colspan="2">[[admin/manage/categories:privileges.section-user]]</th><th class="text-center">[[admin/manage/privileges:select-clear-all]]</th>{{{ each privileges.labelData }}}- <th class="text-center" data-type="{./type}">{./label}</th>+ <th class="text-center" data-type="{./type}">{tx(./label)}</th>{{{ end }}}</tr></thead>@@ -94,7 +94,7 @@{{{ each privileges.users }}}<tr data-uid="{privileges.users.uid}"{{{ if privileges.users.banned }}} data-banned{{{ end }}}><td>- {buildAvatar(privileges.users, "24px", true)}+ {{buildAvatar(privileges.users, "24px", true)}}{{{ if privileges.users.banned }}}<i class="ban fa fa-gavel text-danger" title="[[admin/manage/categories:privileges.banned-user-inheritance]]"></i>{{{ end }}}@@ -104,7 +104,7 @@<!-- need this empty --></td><td class="text-center"><input autocomplete="off" type="checkbox" class="checkbox-helper"></td>- {spawnPrivilegeStates(cid, privileges.users.username, ../privileges, ../types)}+ {{spawnPrivilegeStates(cid, privileges.users.username, ../privileges, ../types)}}</tr>{{{ end }}}</tbody>diff --git a/src/views/admin/partials/rewards/inputs.tpl b/src/views/admin/partials/rewards/inputs.tplnew file mode 100644index 0000000000..a6a36cb4b0--- /dev/null+++ b/src/views/admin/partials/rewards/inputs.tpl@@ -0,0 +1,15 @@+{{{ each inputs }}}+<label class="form-label text-nowrap" for="{./name}">{./label}</label>+{{{ if (./type == "select") }}}+<select class="form-select form-select-sm" name="{./name}" >+ {{{ each ./values }}}+ <option value="{./value}">{./name}</option>+ {{{ end }}}+</select>+{{{ end }}}++{{{ if (./type == "text") }}}+<input type="text" class="form-control form-control-sm" name="${./name}" />+{{{ end }}}+{{{ end }}}+diff --git a/src/views/admin/partials/settings/header.tpl b/src/views/admin/partials/settings/header.tplindex e716866997..993277741e 100644--- a/src/views/admin/partials/settings/header.tpl+++ b/src/views/admin/partials/settings/header.tpl@@ -1,6 +1,6 @@<div component="settings/main/header" class="row border-bottom py-2 m-0 sticky-top acp-page-main-header align-items-center"><div class="col-12 col-md-8 px-0 mb-1 mb-md-0">- <h4 class="fw-bold tracking-tight mb-0">{title}</h4>+ <h4 class="fw-bold tracking-tight mb-0">{tx(title)}</h4></div>{{{ if !hideSave }}}<div class="col-12 col-md-4 px-0 px-md-3">diff --git a/src/views/admin/settings/navigation.tpl b/src/views/admin/settings/navigation.tplindex cbcc40ee19..f9638e59fe 100644--- a/src/views/admin/settings/navigation.tpl+++ b/src/views/admin/settings/navigation.tpl@@ -59,7 +59,7 @@<div class="row mb-3"><div class="col-sm-4"><label class="form-label" for="nav:text">[[admin/settings/navigation:text]]</label>- <input id="nav:text" class="form-control unescape" type="text" name="text" value="{enabled.text}" />+ <input id="nav:text" class="form-control" type="text" name="text" value="{enabled.text}" /></div><div class="col-sm-4">@@ -69,7 +69,7 @@<div class="col-sm-4"><label class="form-label" for="nav:tooltip">[[admin/settings/navigation:tooltip]]</label>- <input id="nav:tooltip" class="form-control unescape" type="text" name="title" value="{enabled.title}" />+ <input id="nav:tooltip" class="form-control" type="text" name="title" value="{enabled.title}" /></div></div>@@ -137,15 +137,15 @@</div><div class="d-flex flex-column"><p class="mb-0">- <strong>{available.text}</strong>+ <strong>{tx(./text)}</strong></p><p class="mb-0">- {{{ if available.core }}}+ {{{ if ./core }}}<span class="badge bg-primary-subtle text-primary">[[admin/settings/navigation:core]]</span>{{{ else }}}<span class="badge bg-secondary-subtle text-secondary">[[admin/settings/navigation:plugin]]</span>{{{ end }}}- <span class="badge text-bg-none"><code>{available.route}</code></span>+ <span class="badge text-bg-none"><code>{./route}</code></span></p></div></li>diff --git a/src/views/admin/settings/user.tpl b/src/views/admin/settings/user.tplindex e37759a11b..047829efd8 100644--- a/src/views/admin/settings/user.tpl+++ b/src/views/admin/settings/user.tpl@@ -350,7 +350,7 @@{{{ each notificationSettings }}}<div class="row"><div class="mb-3 col-7">- <label class="form-label">{./label}</label>+ <label class="form-label">{tx(./label)}</label></div><div class="mb-3 col-5"><select class="form-select" data-field="{./name}">diff --git a/src/views/chat.tpl b/src/views/chat.tplindex 682effc82e..8c7d9aed3d 100644--- a/src/views/chat.tpl+++ b/src/views/chat.tpl@@ -2,7 +2,7 @@<div class="modal-dialog m-0"><div class="modal-content m-4" component="chat/message/window"><div class="modal-header d-flex gap-4 justify-content-between">- <div id="chat-room-title-{roomId}" class="fs-6 flex-grow-1 fw-semibold tracking-tight text-truncate text-nowrap" component="chat/room/name" data-icon="{icon}">{{{ if ./roomName }}}<i class="fa {icon} text-muted"></i> {roomName}{{{ else }}}{./chatWithMessage}{{{ end}}}</div>+ <div id="chat-room-title-{roomId}" class="fs-6 flex-grow-1 fw-semibold tracking-tight text-truncate text-nowrap" component="chat/room/name" data-icon="{icon}">{{{ if ./roomName }}}<i class="fa {icon} text-muted"></i> {roomName}{{{ else }}}{{tx(./chatWithMessage)}}{{{ end}}}</div><div class="d-flex gap-1 align-items-center"><button type="button" class="btn btn-ghost btn-sm d-none d-md-flex align-self-stretch align-items-center" data-action="maximize" title="[[modules:chat.maximize]]" data-bs-toggle="tooltip" data-bs-placement="bottom"><i class="fa fa-fw fa-expand text-muted"></i>diff --git a/src/views/chats.tpl b/src/views/chats.tplindex 7b343ddba7..1970101838 100644--- a/src/views/chats.tpl+++ b/src/views/chats.tpl@@ -22,7 +22,7 @@{{{ each publicRooms }}}<div component="chat/public/room" class="btn btn-ghost btn-sm ff-sans d-flex justify-content-between hover-parent {{{ if ./unread}}}unread{{{ end }}}" data-roomid="{./roomId}"><div class="d-flex gap-1 align-items-baseline">- <i class="fa {./icon} text-muted"></i> <span class="text-start">{./roomName}</span>+ <i class="fa {./icon} text-muted"></i> <span class="text-start" component="chat/room/title">{./roomName}</span><div component="chat/public/room/unread/count" data-count="{./unreadCount}" class="badge border bg-light text-primary {{{ if !./unreadCount }}}hidden{{{ end }}}">{./unreadCountText}</div></div><div>diff --git a/src/views/emails/digest.tpl b/src/views/emails/digest.tplindex e1027a9fdd..0adb7369ae 100644--- a/src/views/emails/digest.tpl+++ b/src/views/emails/digest.tpl@@ -72,7 +72,7 @@<li style="text-decoration: none; list-style-type: none; padding-bottom: 0.5em;"><table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%"><tr>- <td style="padding: 6px 16px; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; width: 32px; vertical-align: middle;">{renderDigestAvatar(@value)}</td>+ <td style="padding: 6px 16px; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; width: 32px; vertical-align: middle;">{{renderDigestAvatar(@value)}}</td><td style="padding: 6px 16px; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; line-height: 16px; color: #333333;"><p style="margin: 0;"><a style="text-decoration:none !important; text-decoration:none; color: #333333;" href="{url}/topic/{topTopics.slug}"><strong>{topTopics.title}</strong></a></p><p style="margin: 0; font-size: 12px;"><a style="text-decoration:none !important; text-decoration:none; color: #aaaaaa; line-height: 16px;" href="{url}/uid/{topTopics.teaser.user.uid}"><strong>{topTopics.teaser.user.displayname}</strong></a></p>@@ -107,7 +107,7 @@<li style="text-decoration: none; list-style-type: none; padding-bottom: 0.5em;"><table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%"><tr>- <td style="padding: 6px 16px; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; width: 32px; vertical-align: middle;">{renderDigestAvatar(@value)}</td>+ <td style="padding: 6px 16px; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; width: 32px; vertical-align: middle;">{{renderDigestAvatar(@value)}}</td><td style="padding: 6px 16px; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; line-height: 16px; color: #333333;"><p style="margin: 0;"><a style="text-decoration:none !important; text-decoration:none; color: #333333;" href="{url}/topic/{popularTopics.slug}"><strong>{popularTopics.title}</strong></a></p><p style="margin: 0; font-size: 12px;"><a style="text-decoration:none !important; text-decoration:none; color: #aaaaaa; line-height: 16px;" href="{url}/uid/{popularTopics.teaser.user.uid}"><strong>{popularTopics.teaser.user.displayname}</strong></a></p>@@ -142,7 +142,7 @@<li style="text-decoration: none; list-style-type: none; padding-bottom: 0.5em;"><table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%"><tr>- <td style="padding: 6px 16px; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; width: 32px; vertical-align: middle;">{renderDigestAvatar(@value)}</td>+ <td style="padding: 6px 16px; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; width: 32px; vertical-align: middle;">{{renderDigestAvatar(@value)}}</td><td style="padding: 6px 16px; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; line-height: 16px; color: #333333;"><p style="margin: 0;"><a style="text-decoration:none !important; text-decoration:none; color: #333333;" href="{url}/topic/{recent.slug}"><strong>{recent.title}</strong></a></p><p style="margin: 0; font-size: 12px;"><a style="text-decoration:none !important; text-decoration:none; color: #aaaaaa; line-height: 16px;" href="{url}/uid/{recent.teaser.user.uid}"><strong>{recent.teaser.user.displayname}</strong></a></p>diff --git a/src/views/flags/detail.tpl b/src/views/flags/detail.tplindex d8f7806242..499d4bc574 100644--- a/src/views/flags/detail.tpl+++ b/src/views/flags/detail.tpl@@ -85,7 +85,7 @@{{{ each history }}}<div class="d-flex flex-column gap-1"><div class="d-flex gap-2 align-items-center">- <a class="d-flex text-decoration-none" href="{config.relative_path}/user/{./user.userslug}">{buildAvatar(./user, "16px", true)}</a>+ <a class="d-flex text-decoration-none" href="{config.relative_path}/user/{./user.userslug}">{{buildAvatar(./user, "16px", true)}}</a><a href="{config.relative_path}/user/{./user.userslug}">{./user.username}</a><span class="timeago text-muted text-nowrap" title="{./datetimeISO}"></span></div>@@ -93,7 +93,7 @@<ul class="list-unstyled">{{{ each ./fields }}}<li>- [[flags:{@key}]]{{{ if @value }}} → <span class="fw-semibold">{@value}</span>{{{ end }}}+ [[flags:{@key}]]{{{ if @value }}} → <span class="fw-semibold">{tx(@value)}</span>{{{ end }}}</li>{{{ end }}}{{{ each ./meta }}}@@ -115,16 +115,16 @@<div component="flag/content" class="d-flex flex-column gap-1 pb-3 border-bottom">{{{ if type_bool.post }}}<div class="d-flex gap-2 align-items-center">- <a class="d-flex text-decoration-none" href="{config.relative_path}/user/{target.user.userslug}">{buildAvatar(target.user, "16px", true)}</a>+ <a class="d-flex text-decoration-none" href="{config.relative_path}/user/{target.user.userslug}">{{buildAvatar(target.user, "16px", true)}}</a><a href="{config.relative_path}/user/{target.user.userslug}">{target.user.username}</a><span class="timeago text-muted" title="{target.timestampISO}"></span></div>- <blockquote>{target.content}</blockquote>+ <blockquote>{{txEscape(target.content)}}</blockquote>{{{ end }}}{{{ if type_bool.user }}}<div class="d-flex gap-2 align-items-center lh-1 mb-2">- <a href="{config.relative_path}/user/{./target.userslug}">{buildAvatar(target, "16px", true)}</a>+ <a href="{config.relative_path}/user/{./target.userslug}">{{buildAvatar(target, "16px", true)}}</a><a href="{config.relative_path}/user/{./target.userslug}">{target.username}</a></div><blockquote>{{{ if target.aboutme }}}{target.aboutme}{{{ else }}}<em>[[flags:target-aboutme-empty]]</em>{{{ end }}}</blockquote>@@ -140,7 +140,7 @@{{{ each reports }}}<li class="d-flex flex-column gap-1" component="flag/report" data-timestamp="{./timestamp}"><div class="d-flex gap-2 align-items-center">- <a class="d-flex text-decoration-none" href="{config.relative_path}/user/{./reporter.userslug}">{buildAvatar(./reporter, "16px", true)}</a>+ <a class="d-flex text-decoration-none" href="{config.relative_path}/user/{./reporter.userslug}">{{buildAvatar(./reporter, "16px", true)}}</a><a href="{config.relative_path}/user/{./reporter.userslug}">{./reporter.username}</a><span class="timeago text-muted" title="{./timestampISO}"></span></div>@@ -161,7 +161,7 @@{{{ each notes }}}<li class="d-flex flex-column gap-1" component="flag/note" data-datetime="{./datetime}" data-index="{@index}"><div class="d-flex gap-2 align-items-center">- <a href="{config.relative_path}/user/{./user.userslug}">{buildAvatar(./user, "16px", true)}</a>+ <a href="{config.relative_path}/user/{./user.userslug}">{{buildAvatar(./user, "16px", true)}}</a><a href="{config.relative_path}/user/{./user.userslug}">{./user.username}</a><span class="timeago text-muted" title="{./datetimeISO}"></span><div class=" ms-auto flex-shrink-0">diff --git a/src/views/groups/details.tpl b/src/views/groups/details.tplnew file mode 100644index 0000000000..cb9f2bb6fa--- /dev/null+++ b/src/views/groups/details.tpl@@ -0,0 +1,92 @@+<div component="groups/container" class="groups details flex-fill">+ <div class="cover position-absolute start-0 top-0" component="groups/cover" style="background-image: url({group.cover:url}?{config.cache-buster}); background-position: {group.cover:position};">+ <div class="container">+ {{{ if group.isOwner }}}+ <div class="controls text-center">+ <span class="upload p-2 m-2 rounded-1 text-bg-light opacity-75"><i class="fa fa-fw fa-upload"></i></span>+ <span class="resize p-2 m-2 rounded-1 text-bg-light opacity-75"><i class="fa fa-fw fa-arrows"></i></span>+ <span class="remove p-2 m-2 rounded-1 text-bg-light opacity-75"><i class="fa fa-fw fa-times"></i></span>+ </div>+ <a href="#" class="save btn btn-primary">[[groups:cover-save]] <i class="fa fa-fw fa-floppy-o"></i></a>+ <div class="indicator text-bg-primary">[[groups:cover-saving]] <i class="fa fa-fw fa-refresh fa-spin"></i></div>+ {{{ end }}}+ </div>+ </div>++ <div class="d-flex flex-column flex-md-row justify-content-md-between pb-4 mb-4 mt-2 border-bottom gap-3">+ <div class="d-flex flex-column mt-1 gap-2">+ <div class="d-flex flex-column flex-md-row align-items-md-center gap-2">+ <h3 class="mb-0 text-capitalize">{generateGroupDisplayName(group)}</h3>+ <div>+ {{{ if group.private }}}<span class="badge text-bg-light border border-1">[[groups:details.private]]</span>{{{ end }}}+ {{{ if group.hidden }}}<span class="badge text-bg-light border border-1">[[groups:details.hidden]]</span>{{{ end }}}+ </div>+ </div>+ <div>+ {{txEscape(group.descriptionParsed)}}+ </div>+ </div>+ <div class="d-flex gap-2 align-items-start">+ {{{ if loggedIn }}}+ {{membershipBtn(group)}}+ {{{ end }}}+ {{{ if isAdmin }}}+ <a href="{config.relative_path}/admin/manage/groups/{group.slug}" target="_blank" class="btn btn-light text-nowrap"><i class="fa fa-gear"></i> [[user:edit]]</a>+ {{{ end }}}+ </div>+ </div>++ <div class="d-flex flex-column flex-md-row">+ <div data-widget-area="left">+ {{{each widgets.left}}}+ {{widgets.left.html}}+ {{{end}}}+ </div>+ <!-- IMPORT partials/groups/sidebar-left.tpl -->++ <div class="flex-grow-1 ps-md-2 ps-lg-5" style="min-width:0;">+ <div class="tab-content">+ <div class="tab-pane fade show active" id="groups-posts" role="tabpanel">+ <h3 class="fw-semibold fs-5 mb-0">[[global:posts]]</h3>+ {{{ if !posts.length }}}+ <div class="alert alert-info my-2">[[groups:details.has-no-posts]]</div>+ {{{ end }}}+ <!-- IMPORT partials/posts_list.tpl -->+ </div>+ <div class="tab-pane fade" id="groups-members" role="tabpanel">+ <h3 class="fw-semibold fs-5 mb-3">[[groups:details.members]]</h3>++ <!-- IMPORT partials/groups/memberlist.tpl -->+ </div>+ {{{ if group.isOwner }}}+ <div class="tab-pane fade" id="groups-pending" role="tabpanel">+ <h3 class="fw-semibold fs-5 mb-3">[[groups:details.pending]]</h3>+ <!-- IMPORT partials/groups/pending.tpl -->+ </div>++ <div class="tab-pane fade" id="groups-invited" role="tabpanel">+ <h3 class="fw-semibold fs-5 mb-3">[[groups:details.invited]]</h3>+ <!-- IMPORT partials/groups/invited.tpl -->+ </div>++ <div class="tab-pane fade" id="groups-admin" role="tabpanel">+ <div class="d-flex align-items-center gap-1 justify-content-between mb-3 flex-wrap">+ <h3 class="fw-semibold fs-5">[[groups:details.owner-options]]</h3>+ <div class="d-flex justify-content-end gap-2">+ <button class="btn btn-link btn-sm text-danger border-danger" type="button" data-action="delete">[[groups:details.delete-group]]</button>+ <button class="btn btn-primary btn-sm" type="button" data-action="update">[[global:save-changes]]</button>+ </div>+ </div>+ <!-- IMPORT partials/groups/admin.tpl -->+ </div>+ {{{ end }}}+ </div>+ </div>++ <div data-widget-area="right">+ {{{each widgets.right}}}+ {{widgets.right.html}}+ {{{end}}}+ </div>+ </div>+</div>diff --git a/src/views/groups/list.tpl b/src/views/groups/list.tplnew file mode 100644index 0000000000..6d62e93482--- /dev/null+++ b/src/views/groups/list.tpl@@ -0,0 +1,58 @@+<div data-widget-area="header">+ {{{each widgets.header}}}+ {{widgets.header.html}}+ {{{end}}}+</div>+<div class="groups list flex-fill">+ <h3 class="fw-semibold">[[pages:groups]]</h3>+ <div class="d-flex flex-wrap justify-content-between">+ <div class="mb-2 mb-md-0">+ <div class="text-sm d-flex flex-wrap align-items-center gap-2">+ [[topic:sort-by]]+ <div class="d-flex flex-wrap gap-2">+ <a href="?sort=alpha" class="btn btn-ghost btn-sm ff-secondary fw-semibold text-nowrap {{{ if (sort == "alpha") }}}active{{{ end }}}">[[groups:details.group-name]]</a>+ <a href="?sort=count" class="btn btn-ghost btn-sm ff-secondary fw-semibold text-nowrap {{{ if (sort == "count") }}}active{{{ end }}}">[[groups:details.member-count]]</a>+ <a href="?sort=date" class="btn btn-ghost btn-sm ff-secondary fw-semibold text-nowrap {{{ if (sort == "date") }}}active{{{ end }}}">[[groups:details.creation-date]]</a>+ </div>+ </div>+ </div>+ <div>+ <div class="d-flex justify-content-end gap-2">+ <div>+ {{{ if allowGroupCreation }}}+ <button class="btn btn-primary btn-sm text-nowrap" data-action="new"><i class="fa fa-users"></i> [[groups:new-group]]</button>+ {{{ end }}}+ <select class="form-select hidden" id="search-sort">+ <option value="alpha">[[groups:details.group-name]]</option>+ <option value="count">[[groups:details.member-count]]</option>+ <option value="date">[[groups:details.creation-date]]</option>+ </select>+ </div>+ <div>+ <div class="input-group">+ <input type="text" class="form-control form-control-sm" placeholder="[[global:search]]" name="query" id="search-text">+ <button id="search-button" class="btn btn-primary btn-sm" aria-label="[[global:search]]">+ <i class="fa fa-search"></i>+ </button>+ </div>+ </div>+ </div>+ </div>+ </div>++ <hr />++ <div component="groups/container" class="row" id="groups-list">+ {{{ if groups.length }}}+ <!-- IMPORT partials/groups/list.tpl -->+ {{{ else }}}+ <div class="col-12">+ <div class="alert alert-warning">+ [[groups:no-groups-found]]+ </div>+ </div>+ {{{ end }}}+ </div>++ <!-- IMPORT partials/paginator.tpl -->+</div>diff --git a/src/views/groups/members.tpl b/src/views/groups/members.tplnew file mode 100644index 0000000000..ffec941ab3--- /dev/null+++ b/src/views/groups/members.tpl@@ -0,0 +1,10 @@+<!-- IMPORT partials/breadcrumbs.tpl -->+<div class="users flex-fill">+ <div id="users-container" class="users-container row row-cols-2 row-cols-md-3 row-cols-lg-4 row-cols-xl-5 g-4">+ {{{ each users }}}+ <!-- IMPORT partials/users/item.tpl -->+ {{{ end }}}+ </div>++ <!-- IMPORT partials/paginator.tpl -->+</div>\ No newline at end of filediff --git a/src/views/login.tpl b/src/views/login.tplindex 2510d67aec..d62b920727 100644--- a/src/views/login.tpl+++ b/src/views/login.tpl@@ -12,8 +12,8 @@<div class="login-block"><form class="d-flex flex-column gap-3" role="form" method="post" id="login-form"><div class="mb-2 d-flex flex-column gap-2">- <label for="username">{allowLoginWith}</label>- <input class="form-control" type="text" placeholder="{allowLoginWith}" name="username" id="username" autocorrect="off" autocapitalize="off" autocomplete="nickname" value="{username}" aria-required="true"/>+ <label for="username">{tx(allowLoginWith)}</label>+ <input class="form-control" type="text" placeholder="{tx(allowLoginWith)}" name="username" id="username" autocorrect="off" autocapitalize="off" autocomplete="nickname" value="{username}" aria-required="true"/></div><div class="mb-2 d-flex flex-column gap-2">@@ -33,7 +33,7 @@{{{ each loginFormEntry }}}<div class="mb-2 loginFormEntry d-flex flex-column gap-2 {./styleName}">- <label for="{./inputId}">{./label}</label>+ <label for="{./inputId}">{tx(./label)}</label><div>{{./html}}</div></div>{{{ end }}}@@ -84,7 +84,7 @@<i class="flex-shrink-0 {./icons.normal}" style="color:{./color};"></i>{{{ end }}}{{{ if ./labels.login }}}- <div class="flex-grow-1 text-body text-sm">{./labels.login}</div>+ <div class="flex-grow-1 text-body text-sm">{tx(./labels.login)}</div>{{{ end }}}</a></li>{{{ end }}}diff --git a/src/views/modals/announcers.tpl b/src/views/modals/announcers.tplindex 2d95bad25b..04bcc0ec35 100644--- a/src/views/modals/announcers.tpl+++ b/src/views/modals/announcers.tpl@@ -1,5 +1,5 @@<div class="mb-3">{{{ each announcers }}}- <a class="text-decoration-none" href="{config.relative_path}/user/{./userslug}">{buildAvatar(@value, "24px", true)}</a>+ <a class="text-decoration-none" href="{config.relative_path}/user/{./userslug}">{{buildAvatar(@value, "24px", true)}}</a>{{{ end }}}</div>diff --git a/src/views/modals/change-picture.tpl b/src/views/modals/change-picture.tplindex d743e6efdf..b24e23863c 100644--- a/src/views/modals/change-picture.tpl+++ b/src/views/modals/change-picture.tpl@@ -5,10 +5,10 @@<div class="d-flex align-items-center gap-3"><button component="profile/picture/button" type="button" class="btn btn-ghost border d-flex p-3 flex-grow-1 {{{ if ./selected }}}active{{{ end }}}" data-type="{./type}" data-url="{./picture}"><div class="flex-shrink-0">- {buildAvatar(pictures, "48px", true)}+ {{buildAvatar(pictures, "48px", true)}}</div><div class="flex-grow-1 ms-3 align-self-center fs-5 text-start">- {./username}+ {tx(./username)}</div></button><button class="btn btn-sm btn-ghost border {{{ if (./type != "uploaded") }}}invisible{{{ end }}}" data-action="remove-uploaded" data-url="{./picture}"><i class="text-danger fa-solid fa-trash-can"></i></button>@@ -20,7 +20,7 @@<div class="d-flex flex-column gap-2"><h5>[[user:avatar-background-colour]]</h5><div class="d-flex gap-2 flex-wrap">- <a href="#" class="lh-1 p-1" data-bg-color="transparent"><i class="fa-solid fa-2x fa-ban text-secondary"></i></a>+ <a href="#" class="lh-1 p-1" data-bg-color="transparent"><i class="fa-solid fa-2x fa-ban text-secondary fa-width-auto"></i></a>{{{ each iconBackgrounds }}}<a href="#" class="lh-1 p-1 {{{ if ./selected }}}selected{{{ end }}}" data-bg-color="{./color}" style="color: {./color};"><i class="fa-solid fa-2x fa-circle fa-width-auto"></i></a>{{{ end }}}diff --git a/src/views/modals/create-room.tpl b/src/views/modals/create-room.tplindex e5cd4daee5..81bb695a76 100644--- a/src/views/modals/create-room.tpl+++ b/src/views/modals/create-room.tpl@@ -12,14 +12,14 @@<li component="chat/search/start-typing"><a href="#" class="dropdown-item rounded-1" role="menuitem">[[admin/menu:search.start-typing]]</a></li><li component="chat/search/no-users" class="hidden"><a href="#" class="dropdown-item rounded-1" role="menuitem">[[users:no-users-found]]</a></li>{{{ each searchUsers }}}- <li component="chat/search/user" data-uid="{./uid}"><a href="#" class="dropdown-item rounded-1" role="menuitem">{buildAvatar(@value, "24px", true)} {./username}</a></li>+ <li component="chat/search/user" data-uid="{./uid}"><a href="#" class="dropdown-item rounded-1" role="menuitem">{{buildAvatar(@value, "24px", true)}} {./username}</a></li>{{{ end }}}</ul></div><ul component="chat/room/users" class="list-group mt-2">{{{ each selectedUsers }}}<li class="list-group-item d-flex gap-2 align-items-center justify-content-between" component="chat/user" data-uid="{./uid}">- <a href="#" class="text-reset text-decoration-none">{buildAvatar(@value, "24px", true)} {./username}</a>+ <a href="#" class="text-reset text-decoration-none">{{buildAvatar(@value, "24px", true)}} {./username}</a><button component="chat/room/users/remove" class="btn btn-sm btn-light"><i class="fa fa-times text-danger"></i></button></li>{{{ end }}}diff --git a/src/views/modals/crop_picture.tpl b/src/views/modals/crop_picture.tplindex adaa271609..169791aab9 100644--- a/src/views/modals/crop_picture.tpl+++ b/src/views/modals/crop_picture.tpl@@ -30,7 +30,7 @@</div></div><div class="modal-footer">- <button class="btn btn-outline-secondary" data-bs-dismiss="modal">Close</button>+ <button class="btn btn-outline-secondary" data-bs-dismiss="modal">[[global:close]]</button><button class="btn btn-primary upload-btn {{{ if !allowSkippingCrop }}}hidden{{{ end }}}">[[user:upload-picture]]</button><button class="btn btn-primary crop-btn">[[user:upload-cropped-picture]]</button></div>diff --git a/src/views/modals/crossposts.tpl b/src/views/modals/crossposts.tplindex 8b7d2b9272..ab796e96bd 100644--- a/src/views/modals/crossposts.tpl+++ b/src/views/modals/crossposts.tpl@@ -2,7 +2,7 @@{{{ if crossposts.length }}}<p>[[topic:crossposts.listing]]</p>{{{ each crossposts }}}- {buildCategoryLabel(./category, "a", "border")}+ {{buildCategoryLabel(./category, "a", "border")}}{{{ end }}}{{{ else }}}<p>[[topic:crossposts.none]]</p>diff --git a/src/views/modals/manage-editors.tpl b/src/views/modals/manage-editors.tplindex 9faea98675..476bfd595e 100644--- a/src/views/modals/manage-editors.tpl+++ b/src/views/modals/manage-editors.tpl@@ -16,7 +16,7 @@<div class="d-flex flex-wrap" component="topic/editors">{{{ each editors }}}<div class="badge text-bg-light m-1 p-1 border d-inline-flex gap-1 align-items-center" data-uid="{./uid}">- {buildAvatar(@value, "24px", true)}+ {{buildAvatar(@value, "24px", true)}}<a href="{config.relative_path}/user/{./userslug}">{./username}</a><button class="btn btn-ghost btn-sm p-0 remove-user-icon"><i class="fa fa-fw fa-times"></i>diff --git a/src/views/modals/rename-room.tpl b/src/views/modals/rename-room.tplindex fe797b6b95..acafb24443 100644--- a/src/views/modals/rename-room.tpl+++ b/src/views/modals/rename-room.tpl@@ -1,4 +1,4 @@-<input type="text" class="form-control" id="roomName" placeholder="[[modules:chat.rename-placeholder]]" />+<input type="text" class="form-control" id="roomName" placeholder="[[modules:chat.rename-placeholder]]" value="{roomName}" /><p class="form-text">[[modules:chat.rename-help]]</p>\ No newline at end of filediff --git a/src/views/modals/upload-file.tpl b/src/views/modals/upload-file.tplindex 8ad1b357c3..b0733f8ba6 100644--- a/src/views/modals/upload-file.tpl+++ b/src/views/modals/upload-file.tpl@@ -2,14 +2,14 @@<div class="modal-dialog"><div class="modal-content"><div class="modal-header">- <h5 class="modal-title">{title}</h5>+ <h5 class="modal-title">{tx(title)}</h5><button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="[[global:buttons.close]]"></button></div><div class="modal-body"><form class="mb-3" id="uploadForm" action="" method="post" enctype="multipart/form-data"><div>{{{ if description }}}- <label class="form-label" for="fileInput">{description}</label>+ <label class="form-label" for="fileInput">{tx(description)}</label>{{{ end }}}<input type="file" id="fileInput" name="files[]" {{{ if accept }}}accept="{accept}"{{{ end }}}>{{{ if showHelp }}}@@ -37,7 +37,7 @@</div><div class="modal-footer"><button class="btn btn-outline-secondary" data-bs-dismiss="modal">[[global:close]]</button>- <button id="fileUploadSubmitBtn" class="btn btn-primary">{button}</button>+ <button id="fileUploadSubmitBtn" class="btn btn-primary">{tx(button)}</button></div></div></div>diff --git a/src/views/modals/votes.tpl b/src/views/modals/votes.tplindex e9a31422ec..3ba516e42a 100644--- a/src/views/modals/votes.tpl+++ b/src/views/modals/votes.tpl@@ -2,7 +2,7 @@<div class="mb-3"><h4>[[global:upvoters]] <small>({upvoteCount})</small></h4>{{{ each upvoters }}}- <a class="text-decoration-none" href="{config.relative_path}/user/{./userslug}">{buildAvatar(@value, "24px", true)}</a>+ <a class="text-decoration-none" href="{config.relative_path}/user/{./userslug}">{{buildAvatar(@value, "24px", true)}}</a>{{{ end }}}</div>{{{ end }}}@@ -10,7 +10,7 @@<div><h4>[[global:downvoters]] <small>({downvoteCount})</small></h4>{{{ each downvoters }}}- <a class="text-decoration-none" href="{config.relative_path}/user/{./userslug}">{buildAvatar(@value, "24px", true)}</a>+ <a class="text-decoration-none" href="{config.relative_path}/user/{./userslug}">{{buildAvatar(@value, "24px", true)}}</a>{{{ end }}}</div>{{{ end }}}\ No newline at end of filediff --git a/src/views/outgoing.tpl b/src/views/outgoing.tplindex d432170338..936c922c7c 100644--- a/src/views/outgoing.tpl+++ b/src/views/outgoing.tpl@@ -8,7 +8,9 @@</div><div class="col-10 offset-1 col-md-4 offset-4 d-flex flex-column gap-3">- <a href="{outgoing}" rel="nofollow noopener noreferrer" class="btn btn-primary text-break">[[notifications:continue-to, {outgoing}]]</a>+ <a href="{outgoing}" rel="nofollow noopener noreferrer" class="btn btn-primary text-break">+ {{tx("notifications:continue-to", txEscape(outgoing))}}+ </a><a href="#" class="btn btn-link" onclick="history.back(); return false;">[[notifications:return-to, {title}]]</a></div></div>diff --git a/src/views/partials/acceptTos.tpl b/src/views/partials/acceptTos.tplindex 53e31c3aed..e2afd3ff3f 100644--- a/src/views/partials/acceptTos.tpl+++ b/src/views/partials/acceptTos.tpl@@ -1,6 +1,6 @@<div><label class="form-label">[[register:terms-of-use]]</label>- <div class="tos">{termsOfUse}</div>+ <div class="tos">{{termsOfUse}}</div><div class="form-check"><input class="form-check-input" type="checkbox" name="agree-terms" id="agree-terms"><label class="form-check-label" for="agree-terms">[[register:agree-to-terms-of-use]]</label>diff --git a/src/views/partials/category/filter-dropdown-content.tpl b/src/views/partials/category/filter-dropdown-content.tplindex 4905ce3cc2..293a1c3c67 100644--- a/src/views/partials/category/filter-dropdown-content.tpl+++ b/src/views/partials/category/filter-dropdown-content.tpl@@ -1,7 +1,7 @@<button type="button" class="btn btn-ghost btn-sm d-flex align-items-center ff-secondary d-flex gap-2 dropdown-toggle h-100" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{{ if selectedCategory }}}<span class="category-item d-inline-flex align-items-center gap-1">- {buildCategoryIcon(selectedCategory, "18px", "rounded-circle")}+ {{buildCategoryIcon(selectedCategory, "18px", "rounded-circle")}}<span class="d-none d-md-inline fw-semibold">{selectedCategory.name}</span></span>{{{ else }}}@@ -30,13 +30,12 @@{{{each categoryItems}}}<li role="presentation" class="category {{{ if ./disabledClass }}}disabled{{{ end }}}" data-cid="{./cid}" data-parent-cid="{./parentCid}" data-name="{./name}"><a class="dropdown-item rounded-1 d-flex align-items-center gap-2 {{{ if ./disabledClass }}}disabled{{{ end }}}" role="menuitem" href="#">- {./level}- <span component="category-markup" class="flex-grow-1" style="{{{ if ./match }}}font-weight: bold;{{{end}}}">+ <span component="category-markup" class="flex-grow-1" style="{{{ if ./match }}}font-weight: bold;{{{end}}} margin-left: calc({./depth} * 24px);"><div class="category-item d-inline-flex align-items-center gap-1">{{{ if ./icon }}}- {buildCategoryIcon(@value, "24px", "rounded-circle")}+ {{buildCategoryIcon(@value, "24px", "rounded-circle")}}{{{ end }}}- <span class="category-name">{./name}</span>+ <span class="category-name">{tx(./name)}</span></div></span><i component="category/select/icon" class="flex-shrink-0 fa fa-fw fa-check {{{ if !./selected }}}invisible{{{ end }}}"></i>diff --git a/src/views/partials/category/selector-dropdown-content.tpl b/src/views/partials/category/selector-dropdown-content.tplindex 7fd9854dd5..1b71a40e57 100644--- a/src/views/partials/category/selector-dropdown-content.tpl+++ b/src/views/partials/category/selector-dropdown-content.tpl@@ -2,12 +2,12 @@<span component="category-selector-selected" class="fw-semibold">{{{ if (selectedCategory && !showCategorySelectLabel) }}}<span class="category-item d-inline-flex align-items-center gap-1">- {buildCategoryIcon(selectedCategory, "24px", "rounded-circle")}- <span class="category-name">{selectedCategory.name}</span>+ {{buildCategoryIcon(selectedCategory, "24px", "rounded-circle")}}+ <span class="category-name">{tx(selectedCategory.name)}</span></span>{{{ else }}}<i class="fa fa-fw {{{ if selectCategoryIcon }}}{selectCategoryIcon}{{{ else }}}fa-list{{{ end }}} text-primary"></i>- <span class="d-none d-md-inline">{{{ if selectCategoryLabel }}}{selectCategoryLabel}{{{ else }}}[[topic:thread-tools.select-category]]{{{ end }}}</span>+ <span class="d-none d-md-inline">{{{ if selectCategoryLabel }}}{tx(selectCategoryLabel)}{{{ else }}}[[topic:thread-tools.select-category]]{{{ end }}}</span>{{{ end }}}</span></button>@@ -23,13 +23,13 @@</li>{{{ each categoryItems }}}<li role="presentation" class="category {{{ if ./disabledClass }}}disabled {{{ end }}}" data-cid="{./cid}" data-name="{./name}" data-parent-cid="{./parentCid}">- <a class="dropdown-item rounded-1 {{{ if ./disabledClass }}}disabled{{{ end }}}" role="menuitem" href="#">{./level}- <span component="category-markup" style="{{{ if ./match }}}font-weight: bold;{{{end}}}">+ <a class="dropdown-item rounded-1 {{{ if ./disabledClass }}}disabled{{{ end }}}" role="menuitem" href="#">+ <span component="category-markup" style="{{{ if ./match }}}font-weight: bold;{{{end}}} margin-left: calc({./depth} * 24px);"><span class="category-item d-inline-flex align-items-center gap-1">{{{ if ./icon }}}- {buildCategoryIcon(@value, "24px", "rounded-circle")}+ {{buildCategoryIcon(@value, "24px", "rounded-circle")}}{{{ end }}}- <span class="category-name">{./name}</span>+ <span class="category-name">{tx(./name)}</span></span></span></a>diff --git a/src/views/partials/category/sort.tpl b/src/views/partials/category/sort.tplindex 757f804ffc..06bfad0d97 100644--- a/src/views/partials/category/sort.tpl+++ b/src/views/partials/category/sort.tpl@@ -1,7 +1,7 @@<div class="dropdown bottom-sheet" component="thread/sort"><button class="btn btn-ghost btn-sm ff-secondary d-flex gap-2 align-items-center dropdown-toggle h-100" data-bs-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false" aria-label="[[aria:topic-sort-option, {sortOptionLabel}]]"><i class="fa fa-fw fa-arrow-down-wide-short text-primary"></i>- <span class="d-none d-md-inline fw-semibold">{sortOptionLabel}</span>+ <span class="d-none d-md-inline fw-semibold">{tx(sortOptionLabel)}</span></button><ul class="dropdown-menu p-1 text-sm" role="menu">diff --git a/src/views/partials/chats/composer.tpl b/src/views/partials/chats/composer.tplindex 1de046ced3..2cbba022a7 100644--- a/src/views/partials/chats/composer.tpl+++ b/src/views/partials/chats/composer.tpl@@ -7,11 +7,11 @@<button component="chat/upload/button" class="btn btn-ghost btn-sm d-flex p-2" type="button" title="[[global:upload]]" data-bs-toggle="tooltip"><i class="fa fa-fw fa-upload"></i></button>{{{ end }}}<div class="flex-grow-1 align-self-center">- <textarea component="chat/input" placeholder="{{{ if roomName }}}[[modules:chat.placeholder.message-room, {txEscape(roomName)}]]{{{ else }}}[[modules:chat.placeholder.mobile]]{{{ end }}}" class="bg-transparent text-body form-control chat-input mousetrap rounded-0 border-0 shadow-none px-1 py-0" style="min-height: 1.5rem;height:0;max-height:30vh;resize:none;"></textarea>+ <textarea component="chat/input" placeholder="{{{ if roomName }}}{{tx("modules:chat.placeholder.message-room", txEscape(roomName))}}{{{ else }}}[[modules:chat.placeholder.mobile]]{{{ end }}}" class="bg-transparent text-body form-control chat-input mousetrap rounded-0 border-0 shadow-none px-1 py-0" style="min-height: 1.5rem;height:0;max-height:30vh;resize:none;"></textarea></div><div class="d-flex gap-1">{{{ each composerActions }}}- <button data-action="{./action}" class="btn btn-ghost btn-sm d-flex p-2 {./class}" type="button" title="{./title}" data-bs-toggle="tooltip"><i class="fa {./icon}"></i></button>+ <button data-action="{./action}" class="btn btn-ghost btn-sm d-flex p-2 {./class}" type="button" title="{tx(./title)}" data-bs-toggle="tooltip"><i class="fa {./icon}"></i></button>{{{ end }}}<button class="btn btn-ghost btn-sm d-flex p-2" type="button" data-action="send" title="[[modules:chat.send]]" data-bs-toggle="tooltip"><i class="fa fa-fw fa-paper-plane text-primary"></i></button></div>diff --git a/src/views/partials/chats/manage-room-users.tpl b/src/views/partials/chats/manage-room-users.tplindex 8489cbb15b..0841166d07 100644--- a/src/views/partials/chats/manage-room-users.tpl+++ b/src/views/partials/chats/manage-room-users.tpl@@ -1,7 +1,7 @@{{{ each users }}}<li class="list-group-item d-flex align-items-center justify-content-between" data-uid="{./uid}" data-index="{./index}"><div class="d-flex gap-1 align-items-center">- {buildAvatar(users, "24px", true)}+ {{buildAvatar(users, "24px", true)}}<span>{./username} <i component="chat/manage/user/owner/icon" class="fa fa-star text-warning {{{ if !./isOwner }}}hidden{{{ end }}}" title="[[modules:chat.owner]]" data-bs-toggle="tooltip"></i></span></div><div class="d-flex gap-1">diff --git a/src/views/partials/chats/message-window.tpl b/src/views/partials/chats/message-window.tplindex ebec5013f9..a60a0aaed7 100644--- a/src/views/partials/chats/message-window.tpl+++ b/src/views/partials/chats/message-window.tpl@@ -15,7 +15,7 @@<div component="chat/header" class="d-flex align-items-center px-md-3 gap-3"><a href="#" data-action="close" role="button" class="flex-shrink-0 d-flex d-md-none btn btn-ghost border align-text-top"><i class="fa fa-chevron-left"></i></a><h5 component="chat/header/title" class="members flex-grow-1 fw-semibold tracking-tight mb-0 text-truncate text-nowrap" style="line-height: initial;">- {{{ if ./roomName }}}<i class="fa {icon} text-muted"></i> {roomName}{{{ else }}}{./chatWithMessage}{{{ end}}}+ {{{ if ./roomName }}}<i class="fa {icon} text-muted"></i> {roomName}{{{ else }}}{{tx(./chatWithMessage) }}{{{ end}}}</h5><!-- IMPORT partials/chats/options.tpl -->diff --git a/src/views/partials/chats/message.tpl b/src/views/partials/chats/message.tplindex 3d2e0ce122..2340e476ee 100644--- a/src/views/partials/chats/message.tpl+++ b/src/views/partials/chats/message.tpl@@ -5,7 +5,7 @@{{{ end }}}<div class="message-header lh-1 d-flex align-items-center gap-2 text-sm {{{ if !messages.newSet }}}hidden{{{ end }}} pb-2">- <a href="{config.relative_path}/user/{messages.fromUser.userslug}" class="text-decoration-none">{buildAvatar(messages.fromUser, "18px", true, "not-responsive")}</a>+ <a href="{config.relative_path}/user/{messages.fromUser.userslug}" class="text-decoration-none">{{buildAvatar(messages.fromUser, "18px", true, "not-responsive")}}</a><span class="chat-user fw-semibold"><a href="{config.relative_path}/user/{messages.fromUser.userslug}">{messages.fromUser.displayname}</a></span>{{{ if messages.fromUser.banned }}}<span class="badge bg-danger">[[user:banned]]</span>@@ -18,8 +18,8 @@<div component="chat/message/edited" class="text-muted ms-auto {{{ if !messages.edited }}}hidden{{{ end }}}" title="[[global:edited-timestamp, {isoTimeToLocaleString(messages.editedISO, config.userLang)}]]"><i class="fa fa-edit"></i></span></div></div><div class="message-body-wrapper">- <div component="chat/message/body" class="message-body ps-0 py-0 overflow-auto text-break">- {messages.content}+ <div component="chat/message/body" class="message-body ps-0 py-0 overflow-auto text-break mb-last-0 mb-3">+ {{renderContent(messages.content, messages.deleted)}}</div><!-- IMPORT partials/chats/reactions.tpl --><div component="chat/message/controls" class="position-relative">diff --git a/src/views/partials/chats/options.tpl b/src/views/partials/chats/options.tplindex 88deba08d2..59633a944a 100644--- a/src/views/partials/chats/options.tpl+++ b/src/views/partials/chats/options.tpl@@ -85,13 +85,13 @@<div component="chat/user/list/btn" class="btn btn-ghost btn-sm d-none d-lg-flex flex-nowrap align-items-center gap-2" title="[[modules:chat.view-users-list]]" data-bs-toggle="tooltip" data-bs-placement="bottom"><div class="d-flex text-nowrap">{{{ if ./users.0 }}}- <span style="width: 18px; z-index: 3;" class="text-decoration-none" href="{config.relative_path}/user/{./users.0.userslug}">{buildAvatar(./users.0, "24px", true)}</span>+ <span style="width: 18px; z-index: 3;" class="text-decoration-none" href="{config.relative_path}/user/{./users.0.userslug}">{{buildAvatar(./users.0, "24px", true)}}</span>{{{ end }}}{{{ if ./users.1 }}}- <span style="width: 18px; z-index: 2;" class="text-decoration-none" href="{config.relative_path}/user/{./users.1.userslug}">{buildAvatar(./users.1, "24px", true)}</span>+ <span style="width: 18px; z-index: 2;" class="text-decoration-none" href="{config.relative_path}/user/{./users.1.userslug}">{{buildAvatar(./users.1, "24px", true)}}</span>{{{ end }}}{{{ if ./users.2 }}}- <span style="width: 24px; z-index: 1;" class="text-decoration-none" href="{config.relative_path}/user/{./users.2.userslug}">{buildAvatar(./users.2, "24px", true)}</span>+ <span style="width: 24px; z-index: 1;" class="text-decoration-none" href="{config.relative_path}/user/{./users.2.userslug}">{{buildAvatar(./users.2, "24px", true)}}</span>{{{ end }}}</div>{formattedNumber(./userCount)}diff --git a/src/views/partials/chats/parent.tpl b/src/views/partials/chats/parent.tplindex 81e566a6d4..dba26aaea5 100644--- a/src/views/partials/chats/parent.tpl+++ b/src/views/partials/chats/parent.tpl@@ -2,11 +2,11 @@<div component="chat/message/parent" data-parent-mid="{messages.parent.mid}" data-uid="{messages.parent.fromuid}" class="btn btn-ghost btn-sm d-flex gap-2 ff-secondary text-start flex-row w-100"><div class="d-flex gap-2 text-sm text-nowrap"><div class="d-flex flex-nowrap gap-1 align-items-center">- <a href="{config.relative_path}/user/{messages.parent.user.userslug}" class="text-decoration-none lh-1">{buildAvatar(messages.parent.user, "14px", true, "not-responsive align-middle")}</a>+ <a href="{config.relative_path}/user/{messages.parent.user.userslug}" class="text-decoration-none lh-1">{{buildAvatar(messages.parent.user, "14px", true, "not-responsive align-middle")}}</a><a class="chat-user fw-semibold text-truncate" style="max-width: 150px;" href="{config.relative_path}/user/{messages.parent.user.userslug}">{messages.parent.user.displayname}</a></div><span class="chat-timestamp text-muted timeago text-nowrap hidden" title="{messages.parent.timestampISO}"></span></div>- <div component="chat/message/parent/content" class="text-muted line-clamp-1 text-break w-100">{messages.parent.content}</div>+ <div component="chat/message/parent/content" class="text-muted line-clamp-1 text-break w-100">{{txEscape(messages.parent.content)}}</div></div></div>\ No newline at end of filediff --git a/src/views/partials/chats/pinned-messages-list.tpl b/src/views/partials/chats/pinned-messages-list.tplindex 7fbe978328..9286a29a5b 100644--- a/src/views/partials/chats/pinned-messages-list.tpl+++ b/src/views/partials/chats/pinned-messages-list.tpl@@ -6,7 +6,7 @@{{{ end }}}<div class="message-header lh-1 d-flex align-items-center gap-2 text-sm pb-2">- <a href="{config.relative_path}/user/{messages.fromUser.userslug}" class="text-decoration-none">{buildAvatar(messages.fromUser, "18px", true, "not-responsive")}</a>+ <a href="{config.relative_path}/user/{messages.fromUser.userslug}" class="text-decoration-none">{{buildAvatar(messages.fromUser, "18px", true, "not-responsive")}}</a><span class="chat-user fw-semibold"><a href="{config.relative_path}/user/{messages.fromUser.userslug}">{messages.fromUser.displayname}</a></span><span class="chat-timestamp text-muted timeago" title="{messages.timestampISO}"></span>@@ -14,7 +14,7 @@</div><div class="message-body-wrapper"><div component="chat/message/body" class="message-body ps-0 py-0 overflow-auto text-break">- {messages.content}+ {{txEscape(messages.content)}}</div><div component="chat/message/controls" class="position-relative"><div class="btn-group border shadow-sm controls position-absolute bg-body end-0" style="bottom:1rem;">diff --git a/src/views/partials/chats/recent_room.tpl b/src/views/partials/chats/recent_room.tplindex 2ba8314a0f..ba4403e7bc 100644--- a/src/views/partials/chats/recent_room.tpl+++ b/src/views/partials/chats/recent_room.tpl@@ -8,11 +8,11 @@{{{ if ./users.length }}}{{{ if ./groupChat}}}<div class="position-relative stacked-avatars">- <span class="text-decoration-none position-absolute" href="{config.relative_path}/user/{./users.1.userslug}">{buildAvatar(./users.1, "24px", true)}</span>- <span class="text-decoration-none position-absolute" href="{config.relative_path}/user/{./users.0.userslug}" >{buildAvatar(./users.0, "24px", true)}</span>+ <span class="text-decoration-none position-absolute" href="{config.relative_path}/user/{./users.1.userslug}">{{buildAvatar(./users.1, "24px", true)}}</span>+ <span class="text-decoration-none position-absolute" href="{config.relative_path}/user/{./users.0.userslug}" >{{buildAvatar(./users.0, "24px", true)}}</span></div>{{{ else }}}- <span href="{config.relative_path}/user/{./users.0.userslug}" class="text-decoration-none">{buildAvatar(./users.0, "32px", true)}</span>+ <span href="{config.relative_path}/user/{./users.0.userslug}" class="text-decoration-none">{{buildAvatar(./users.0, "32px", true)}}</span>{{{ end }}}{{{ else }}}<span class="avatar avatar-rounded text-bg-warning" component="avatar/icon" style="--avatar-size: 32px;">?</span>@@ -27,7 +27,7 @@{{{ if !./lastUser.uid }}}[[modules:chat.no-users-in-room]]{{{ else }}}- {./usernames}+ {tx(./usernames)}{{{ end }}}{{{ end }}}</div>diff --git a/src/views/partials/chats/room-teaser.tpl b/src/views/partials/chats/room-teaser.tplindex ee5aa856d8..92f8688e35 100644--- a/src/views/partials/chats/room-teaser.tpl+++ b/src/views/partials/chats/room-teaser.tpl@@ -1,7 +1,7 @@<div component="chat/room/teaser">{{{ if ./teaser }}}<div class="teaser-content text-sm line-clamp-3 text-break">- {buildAvatar(./teaser.user, "14px", true, "align-middle")}+ {{buildAvatar(./teaser.user, "14px", true, "align-middle")}}<strong class="text-xs fw-semibold teaser-username">{./teaser.user.displayname}:</strong>{./teaser.content}</div>diff --git a/src/views/partials/chats/system-message.tpl b/src/views/partials/chats/system-message.tplindex 04cbfcf588..45c6b7514b 100644--- a/src/views/partials/chats/system-message.tpl+++ b/src/views/partials/chats/system-message.tpl@@ -1,7 +1,7 @@<li component="chat/system-message" class="system-message text-muted small py-4 py-md-2 gap-3 d-flex align-items-center justify-content-center" data-mid="{messages.messageId}" data-uid="{messages.fromuid}" data-index="{messages.index}" data-self="{messages.self}" data-break="0" data-timestamp="{messages.timestamp}"><hr class="d-none d-md-inline-block my-1" style="width: 10%;"/><div>- [[modules:chat.system.{messages.content}, {messages.fromUser.displayname}, {messages.timestampISO}]]+ {{tx(messages.content)}}</div><hr class="d-none d-md-inline-block my-1" style="width: 10%;"/></li>\ No newline at end of filediff --git a/src/views/partials/chats/user-list.tpl b/src/views/partials/chats/user-list.tplindex 5825ab7874..c37bf8bc27 100644--- a/src/views/partials/chats/user-list.tpl+++ b/src/views/partials/chats/user-list.tpl@@ -1,7 +1,7 @@<div component="chat/user/list" class="border-start hidden d-flex flex-column gap-1 p-1 overflow-auto ghost-scrollbar" style="min-width:240px; width: 240px;">{{{ each users }}}<a data-index="{./index}" data-uid="{./uid}" class="btn btn-ghost btn-sm d-flex ff-secondary d-flex justify-content-start align-items-center gap-2 {{{ if ./online }}}online{{{ end}}}" href="{config.relative_path}/uid/{./uid}">- <div>{buildAvatar(users, "24px", true)}</div>+ <div>{{buildAvatar(users, "24px", true)}}</div><div class="d-flex gap-1 flex-grow-1 text-nowrap text-truncate"><span component="chat/user/list/username" class="text-truncate">{./displayname}</span>{{{ if ./isOwner }}}<span><i class="fa fa-star text-warning" data-bs-toggle="tooltip" title="[[modules:chat.owner]]"></i></span>{{{ end }}}diff --git a/src/views/partials/chats/user.tpl b/src/views/partials/chats/user.tplindex 9ed5b71fbf..9977cfabec 100644--- a/src/views/partials/chats/user.tpl+++ b/src/views/partials/chats/user.tpl@@ -1 +1 @@-<a href="{config.relative_path}/user/{rooms.users.userslug}" class="text-decoration-none">{buildAvatar(rooms.users, "32px", true)}</a>\ No newline at end of file+<a href="{config.relative_path}/user/{rooms.users.userslug}" class="text-decoration-none">{{buildAvatar(rooms.users, "32px", true)}}</a>\ No newline at end of filediff --git a/src/views/partials/feed/item.tpl b/src/views/partials/feed/item.tplindex fda941f469..888b3d13f0 100644--- a/src/views/partials/feed/item.tpl+++ b/src/views/partials/feed/item.tpl@@ -22,21 +22,21 @@<div class="d-flex gap-3 p-3"><div class="d-none d-lg-block">- <a class="lh-1 text-decoration-none" href="{config.relative_path}/user/{./user.userslug}">{buildAvatar(./user, "40px", true, "not-responsive")}</a>+ <a class="lh-1 text-decoration-none" href="{config.relative_path}/user/{./user.userslug}">{{buildAvatar(./user, "40px", true, "not-responsive")}}</a></div><div class="post-body d-flex flex-column gap-2 flex-grow-1 hover-parent" style="min-width: 0px;"><div class="d-flex flex-column gap-2 post-info"><div class="d-flex gap-2 text-truncate"><div class="text-sm"><div class="post-author d-flex align-items-center gap-1">- <a class="d-inline d-lg-none lh-1 text-decoration-none" href="{config.relative_path}/user/{./user.userslug}">{buildAvatar(./user, "16px", true, "not-responsive")}</a>+ <a class="d-inline d-lg-none lh-1 text-decoration-none" href="{config.relative_path}/user/{./user.userslug}">{{buildAvatar(./user, "16px", true, "not-responsive")}}</a><a class="lh-normal fw-semibold text-nowrap" href="{config.relative_path}/user/{./user.userslug}">{./user.displayname}</a></div><span class="timeago text-muted lh-normal" title="{./timestampISO}"></span></div><div class="ms-auto">{{{ if (./category.cid != "-1") }}}- {buildCategoryLabel(./category, "a", "border text-xs flex-shrink-0")}+ {{buildCategoryLabel(./category, "a", "border text-xs flex-shrink-0")}}{{{ end }}}{{{ if showSelect }}}<div class="checkbox ms-auto" style="max-width:max-content">@@ -56,7 +56,7 @@<div component="post/content" class="content text-sm text-break position-relative line-clamp-6"><a href="{config.relative_path}/post/{encodeURIComponent(./pid)}" class="stretched-link"></a>- {./content}+ {{./content}}</div><button component="show/more" class="btn btn-link btn-sm fw-semibold hidden ff-secondary text-secondary ms-auto me-auto">[[world:see-more]]</button><hr class="my-2"/>@@ -76,12 +76,12 @@{{{ end }}}<div class="d-inline-flex flex-column px-3 py-2 rounded gap-2 bg-body-tertiary align-self-start"><div class="d-flex align-items-top gap-2">- <a class="text-decoration-none avatar-tooltip" title="{./topic.teaser.user.displayname}" href="{config.relative_path}/user/{./topic.teaser.user.userslug}">{buildAvatar(./topic.teaser.user, "18px", true)} {./topic.teaser.user.displayname}</a>+ <a class="text-decoration-none avatar-tooltip" title="{./topic.teaser.user.displayname}" href="{config.relative_path}/user/{./topic.teaser.user.userslug}">{{buildAvatar(./topic.teaser.user, "18px", true)}} {./topic.teaser.user.displayname}</a><a class="permalink text-muted timeago text-xs" href="{config.relative_path}/topic/{./topic.slug}{{{ if ./index }}}/{./index}{{{ end }}}" title="{./topic.teaser.timestampISO}" aria-label="[[global:lastpost]]"></a></div><div class="post-content text-xs text-break line-clamp-sm-2 lh-sm position-relative flex-fill"><a class="stretched-link" tabindex="-1" href="{config.relative_path}/topic/{./topic.slug}{{{ if ./topic.teaser.index }}}/{./topic.teaser.index}{{{ end }}}" aria-label="[[global:lastpost]]"></a>- {./topic.teaser.content}+ {{./topic.teaser.content}}</div></div></div>diff --git a/src/views/partials/flags/filters.tpl b/src/views/partials/flags/filters.tplindex c639aa4e00..cc97cb286f 100644--- a/src/views/partials/flags/filters.tpl+++ b/src/views/partials/flags/filters.tpl@@ -15,8 +15,8 @@<button type="button" class="filter-btn btn btn-light btn-sm border dropdown-toggle {{{ if filters.cid }}}active-filter{{{ end }}}" data-bs-toggle="dropdown">{{{ if selectedCategory }}}<span class="category-item d-inline-flex align-items-baseline gap-1">- {buildCategoryIcon(selectedCategory, "18px", "rounded-circle align-self-center")}- <span class="visible-md-inline visible-lg-inline">{selectedCategory.name}</span>+ {{buildCategoryIcon(selectedCategory, "18px", "rounded-circle align-self-center")}}+ <span class="visible-md-inline visible-lg-inline">{tx(selectedCategory.name)}</span></span>{{{ else }}}<span class="visible-md-inline visible-lg-inline">[[unread:all-categories]]</span>@@ -30,22 +30,7 @@<hr class="mt-2 mb-0"/></div><ul component="category/list" class="list-unstyled mb-0 text-sm category-dropdown-menu ghost-scrollbar" role="menu">- {{{each categoryItems}}}- <li role="presentation" class="category {{{ if ../disabledClass }}}disabled{{{ end }}}" data-cid="{../cid}" data-parent-cid="{../parentCid}" data-name="{../name}">- <a class="dropdown-item rounded-1 d-flex align-items-center gap-2" role="menuitem" href="#">- {../level}- <span component="category-markup" class="flex-grow-1" style="{{{ if ../match }}}font-weight: bold;{{{end}}}">- <div class="category-item d-inline-flex align-items-center gap-1">- {{{ if ./icon }}}- {buildCategoryIcon(@value, "24px", "rounded-circle")}- {{{ end }}}- {./name}- </div>- </span>- <i component="category/select/icon" class="flex-shrink-0 fa fa-fw fa-check {{{ if !../selected }}}invisible{{{ end }}}"></i>- </a>- </li>- {{{end}}}+ <!-- filled by categorySearch module--></ul></div></div>@@ -104,7 +89,7 @@<div component="user/filter/selected" class="d-flex flex-wrap gap-2">{{{ each selected.assignee }}}<div class="d-flex px-2 py-1 rounded-1 text-bg-primary gap-2 align-items-center text-sm">- {buildAvatar(@value, "16px", true)} {./username}+ {{buildAvatar(@value, "16px", true)}} {./username}<button component="user/filter/delete" data-uid="{./uid}" class="btn btn-primary btn-sm py-0"><i class="fa fa-times fa-xs"></i></button></div>{{{ end }}}@@ -112,7 +97,7 @@<hr/><div component="user/filter/results" class="d-flex flex-wrap gap-2">{{{ each userFilterResults }}}- <button class="btn btn-light btn-sm border" data-uid="{./uid}" data-username="{./username}">{buildAvatar(@value, "16px", true)} {./username}</button>+ <button class="btn btn-light btn-sm border" data-uid="{./uid}" data-username="{./username}">{{buildAvatar(@value, "16px", true)}} {./username}</button>{{{ end }}}</div></li>@@ -131,7 +116,7 @@<div component="user/filter/selected" class="d-flex flex-wrap gap-2">{{{ each selected.reporterId }}}<div class="d-flex px-2 py-1 rounded-1 text-bg-primary gap-2 align-items-center text-sm">- {buildAvatar(@value, "16px", true)} {./username}+ {{buildAvatar(@value, "16px", true)}} {./username}<button component="user/filter/delete" data-uid="{./uid}" class="btn btn-primary btn-sm py-0"><i class="fa fa-times fa-xs"></i></button></div>{{{ end }}}@@ -139,7 +124,7 @@<hr/><div component="user/filter/results" class="d-flex flex-wrap gap-2">{{{ each userFilterResults }}}- <button class="btn btn-light btn-sm border" data-uid="{./uid}" data-username="{./username}">{buildAvatar(@value, "16px", true)} {./username}</button>+ <button class="btn btn-light btn-sm border" data-uid="{./uid}" data-username="{./username}">{{buildAvatar(@value, "16px", true)}} {./username}</button>{{{ end }}}</div></li>@@ -158,7 +143,7 @@<div component="user/filter/selected" class="d-flex flex-wrap gap-2">{{{ each selected.targetUid }}}<div class="d-flex px-2 py-1 rounded-1 text-bg-primary gap-2 align-items-center text-sm">- {buildAvatar(@value, "16px", true)} {./username}+ {{buildAvatar(@value, "16px", true)}} {./username}<button component="user/filter/delete" data-uid="{./uid}" class="btn btn-primary btn-sm py-0"><i class="fa fa-times fa-xs"></i></button></div>{{{ end }}}@@ -166,7 +151,7 @@<hr/><div component="user/filter/results" class="d-flex flex-wrap gap-2">{{{ each userFilterResults }}}- <button class="btn btn-light btn-sm border" data-uid="{./uid}" data-username="{./username}">{buildAvatar(@value, "16px", true)} {./username}</button>+ <button class="btn btn-light btn-sm border" data-uid="{./uid}" data-username="{./username}">{{buildAvatar(@value, "16px", true)}} {./username}</button>{{{ end }}}</div></li>diff --git a/src/views/partials/fontawesome.tpl b/src/views/partials/fontawesome.tplindex 5c4583da39..ada9d1a6aa 100644--- a/src/views/partials/fontawesome.tpl+++ b/src/views/partials/fontawesome.tpl@@ -10,6 +10,6 @@</div><p class="form-text text-center">For a full list of icons, please consult:- <a href="https://fontawesome.com/v6/icons/">FontAwesome</a>+ <a href="https://fontawesome.com/icons">FontAwesome</a></p></div>\ No newline at end of filediff --git a/src/views/partials/groups/admin.tpl b/src/views/partials/groups/admin.tplnew file mode 100644index 0000000000..1d0cb4fab7--- /dev/null+++ b/src/views/partials/groups/admin.tpl@@ -0,0 +1,90 @@+<div class="options mb-5">+ <form component="groups/settings" role="form">+ <div class="row">+ <div class="col-12 col-lg-6">+ <div class="mb-3">+ <label class="form-label" for="name">[[groups:details.group-name]]</label>+ <input {{{ if group.system }}}readonly{{{ end }}} class="form-control" name="name" id="name" type="text" value="{group.displayName}" />+ </div>+ <div class="mb-3">+ <label class="form-label" for="description">[[groups:details.description]]</label>+ <textarea class="form-control" name="description" id="description" type="text" maxlength="255" rows="5">{group.description}</textarea>+ </div>++ <div class="form-check mb-3">+ <label class="form-check-label" for="private">[[groups:details.private]]</label>+ <input class="form-check-input" name="private" id="private" type="checkbox"{{{ if group.private }}} checked{{{ end }}}>+ {{{ if !allowPrivateGroups }}}+ <p class="form-text">+ [[groups:details.private-system-help]]+ </p>+ {{{ end }}}+ <p class="form-text text-xs m-0">+ [[groups:details.private-help]]+ </p>+ </div>+ <div class="form-check mb-3">+ <label class="form-check-label" for="hidden">[[groups:details.hidden]]</label>+ <input class="form-check-input" name="hidden" id="hidden" type="checkbox"{{{ if group.hidden }}} checked{{{ end }}}>+ <p class="form-text text-xs m-0">+ [[groups:details.hidden-help]]+ </p>+ </div>++ <div class="form-check mb-3">+ <label class="form-check-label" for="disableJoinRequests">[[groups:details.disableJoinRequests]]</label>+ <input class="form-check-input" name="disableJoinRequests" id="disableJoinRequests" type="checkbox"{{{ if group.disableJoinRequests }}} checked{{{ end }}}>+ </div>+ <div class="form-check mb-3">+ <label class="form-check-label" for="disableLeave">[[groups:details.disableLeave]]</label>+ <input class="form-check-input" name="disableLeave" id="disableLeave" type="checkbox"{{{if group.disableLeave}}} checked{{{end}}}>+ </div>++ <div class="mb-3">+ <label class="form-label" for="memberPostCids">[[groups:details.member-post-cids]]</label>+ <div class="d-flex gap-1">+ <div class="member-post-cids-selector">+ <!-- IMPORT partials/category/selector-dropdown-left.tpl -->+ </div>+ <input id="memberPostCids" type="text" class="form-control form-control-sm" value="{group.memberPostCids}">+ </div>+ </div>+ </div>+ <div class="col-12 col-lg-6">+ <div class="d-flex gap-2 align-items-center mb-3">+ <div class="form-check">+ <label class="form-check-label" for="userTitleEnabled">[[groups:details.userTitleEnabled]]</label>+ <input class="form-check-input" name="userTitleEnabled" id="userTitleEnabled" type="checkbox"{{{ if group.userTitleEnabled }}} checked{{{ end }}}>+ </div>+ <span class="badge rounded-1 text-uppercase text-truncate rounded-1 d-flex align-items-center gap-1 {{{ if !group.userTitleEnabled }}} hide{{{ end }}}" style="max-width:150px; color: {group.textColor}; background-color: {group.labelColor}"><i class="fa {{{ if (group.icon && (group.icon != "fa-nbb-none")) }}}{group.icon}{{{ else }}}hidden{{{ end }}}"></i><span class="badge-text">{{{ if group.userTitle }}}{group.userTitle}{{{ end }}}</span></span>+ </div>+++ <div class="mb-3">+ <label class="form-label" for="userTitle">[[groups:details.badge-text]]</label>+ <div class="d-flex gap-1">+ <input component="groups/userTitleOption" class="form-control" name="userTitle" id="userTitle" type="text" maxlength="40" value="{group.userTitle}"{{{ if !group.userTitleEnabled }}} disabled{{{ end }}} />+ <button component="groups/userTitleOption" type="button" class="btn btn-outline-secondary text-nowrap" data-action="icon-select"{{{ if !group.userTitleEnabled }}} disabled{{{ end }}}>[[groups:details.change-icon]]</button>+ <input type="hidden" name="icon" value="{{{ if group.icon }}}{group.icon}{{{ end }}}" />+ <div id="icons" class="hidden">+ <div class="icon-container">+ <div class="row nbb-fa-icons">+ <!-- IMPORT partials/fontawesome.tpl -->+ </div>+ </div>+ </div>+ </div>+ </div>+ <div class="mb-3 d-flex align-items-center justify-content-between gap-5">+ <label class="form-label mb-0 text-nowrap" for="labelColor" class="badge-color-label">[[groups:details.change-label-colour]]</label>+ <input class="form-control p-1" component="groups/userTitleOption" type="color" name="labelColor" id="labelColor" value="{{{ if group.labelColor }}}{group.labelColor}{{{ end }}}" style="width: 128px;" />+ </div>+ <div class="d-flex align-items-center justify-content-between gap-5">+ <label class="form-label mb-0 text-nowrap" for="textColor" class="badge-color-label">[[groups:details.change-text-colour]]</label>+ <input class="form-control p-1" component="groups/userTitleOption" type="color" name="textColor" id="textColor" value="{{{ if group.textColor }}}{group.textColor}{{{ end }}}" style="width: 128px;"/>+ </div>+ </div>+ </div>++ </form>+</div>diff --git a/src/views/partials/groups/badge.tpl b/src/views/partials/groups/badge.tplnew file mode 100644index 0000000000..667aaf0821--- /dev/null+++ b/src/views/partials/groups/badge.tpl@@ -0,0 +1 @@+<a href="{config.relative_path}/groups/{./slug}" class="badge rounded-1 text-uppercase text-truncate text-decoration-none d-flex align-items-center gap-1" style="max-width: 150px; line-height: normal; color:{./textColor};background-color: {./labelColor};"><i class="fa {{{ if (./icon && (./icon != "fa-nbb-none")) }}}{./icon}{{{else}}}hidden{{{ end }}}"></i><span class="badge-text">{{{ if ./userTitle }}}{./userTitle}{{{ end }}}</span></a>\ No newline at end of filediff --git a/src/views/partials/groups/invited.tpl b/src/views/partials/groups/invited.tplnew file mode 100644index 0000000000..3b15ce0143--- /dev/null+++ b/src/views/partials/groups/invited.tpl@@ -0,0 +1,33 @@+<label class="text-xs text-muted">[[groups:invited.search]]</label>+<div class="input-group mb-2">+ <input class="form-control" type="text" component="groups/members/invite"/>+ <span class="input-group-text search-button"><i class="fa fa-search"></i></span>+</div>++<div class="mb-2">+ <label class="text-xs text-muted">[[groups:bulk-invite-instructions]]</label>+ <textarea class="form-control" component="groups/members/bulk-invite"></textarea>+</div>++<div class="mb-2 clearfix">+ <button type="button" class="btn btn-primary btn-sm float-end" component="groups/members/bulk-invite-button">[[groups:bulk-invite]]</button>+</div>++<div style="max-height: 500px; overflow: auto;">+ <div component="groups/invited/alert" class="alert alert-info {{{ if group.invited.length }}}hidden{{{ end }}}">[[groups:invited.none]]</div>+ <table component="groups/invited" class="table table-hover">+ <tbody>+ {{{ each group.invited }}}+ <tr data-uid="{group.invited.uid}" class="align-middle">+ <td class="member-name p-2 d-flex align-items-center justify-content-between">+ <div class="d-flex align-items-center gap-2">+ <a class="text-decoration-none" href="{config.relative_path}/user/{group.invited.userslug}">{{buildAvatar(group.invited, "24px", true)}}</a>+ <a href="{config.relative_path}/user/{group.invited.userslug}">{group.invited.username}</a>+ </div>+ <button class="btn btn-outline-secondary btn-sm text-nowrap" data-action="rescindInvite">[[groups:invited.uninvite]]</button>+ </td>+ </tr>+ {{{ end }}}+ </tbody>+ </table>+</div>\ No newline at end of filediff --git a/src/views/partials/groups/list.tpl b/src/views/partials/groups/list.tplnew file mode 100644index 0000000000..c430512b25--- /dev/null+++ b/src/views/partials/groups/list.tpl@@ -0,0 +1,17 @@+{{{ each groups }}}+<div class="col-xl-4 col-lg-6 col-sm-12 mb-3" component="groups/summary" data-slug="{./slug}">+ <div class="card h-100 group-hover-bg border p-1">+ <a href="{config.relative_path}/groups/{./slug}" class="card-header border-0 rounded-1 pointer d-block list-cover" style="{{{ if ./cover:thumb:url }}}background-image: url({./cover:thumb:url});background-size: cover; min-height: 125px; background-position: {./cover:position}{{{ end }}}" aria-label="{tx("aria:group-page-link-for", txEscape(./displayName))}"></a>+ <a href="{config.relative_path}/groups/{./slug}" class="d-block h-100 text-reset text-decoration-none">+ <div class="card-body d-flex flex-column gap-2 h-100 pb-2">+ <div class="d-flex">+ <div class="flex-grow-1 fs-6 fw-semibold text-capitalize">{generateGroupDisplayName(@value)}</div>+ <div class="align-self-start flex-shrink-0 badge border border-gray-300 fw-normal text-body"><i class="text-secondary fa-solid fa-users"></i> {formattedNumber(./memberCount)}</div>+ </div>+ <div class="text-sm line-clamp-3 mb-last-0">{{txEscape(./descriptionParsed)}}</div>+ <span class="timeago text-xs text-secondary mt-auto" title="{./createtimeISO}"></span>+ </div>+ </a>+ </div>+</div>+{{{ end }}}\ No newline at end of filediff --git a/src/views/partials/groups/memberlist.tpl b/src/views/partials/groups/memberlist.tplnew file mode 100644index 0000000000..ae0c448706--- /dev/null+++ b/src/views/partials/groups/memberlist.tpl@@ -0,0 +1,47 @@+<div class="d-flex {{{ if group.isOwner }}}justify-content-between{{{ else }}}justify-content-end{{{ end }}} mb-3">+ {{{ if isAdmin }}}+ <div class="flex-shrink-0">+ <button component="groups/members/add" type="button" class="btn btn-primary btn-sm me-3" title="[[groups:details.add-member]]"><i class="fa fa-user-plus"></i> [[groups:details.add-member]]</button>+ </div>+ {{{ end }}}+ <div>+ <div class="input-group">+ <input class="form-control form-control-sm" type="text" component="groups/members/search" placeholder="[[global:search]]"/>+ <button class="btn btn-primary btn-sm search-button" type="button">+ <i class="fa fa-search"></i>+ </button>+ </div>+ </div>+</div>++<div component="groups/members" data-nextstart="{group.membersNextStart}" class="mb-5" style="max-height: 500px; overflow: auto;">+ <table class="table table-hover">+ <tbody>+ {{{each group.members}}}+ <tr class="w-100" data-uid="{group.members.uid}" data-isowner="{{{ if group.members.isOwner }}}1{{{ else }}}0{{{ end }}}">+ <td class="member-name p-2 w-100 ">+ <div class="d-flex align-items-center justify-content-between">+ <div class="d-flex align-items-center gap-2">+ <a class="text-decoration-none" href="{config.relative_path}/user/{group.members.userslug}">{{buildAvatar(group.members, "24px", true)}}</a>+ <a class="align-text-top" href="{config.relative_path}/user/{group.members.userslug}">{group.members.username}</a>+ <i component="groups/owner/icon" title="[[groups:owner]]" class="user-owner-icon fa fa-star align-text-top text-warning {{{ if !group.members.isOwner }}}invisible{{{ end }}}"></i>+ </div>++ {{{ if group.isOwner }}}+ <div class="owner-controls d-flex gap-1">+ <a class="btn btn-light btn-sm" href="#" data-action="toggleOwnership" title="[[groups:details.grant]]">+ <i class="fa fa-star text-warning"></i>+ </a>++ <a class="btn btn-light btn-sm" href="#" data-action="kick" title="[[groups:details.kick]]">+ <i class="fa fa-ban text-danger"></i>+ </a>+ </div>+ {{{ end }}}+ </div>+ </td>+ </tr>+ {{{end}}}+ </tbody>+ </table>+</div>\ No newline at end of filediff --git a/src/views/partials/groups/pending.tpl b/src/views/partials/groups/pending.tplnew file mode 100644index 0000000000..96a15fb4da--- /dev/null+++ b/src/views/partials/groups/pending.tpl@@ -0,0 +1,29 @@+{{{ if group.pending.length }}}+<div class="d-flex justify-content-end gap-2 mb-3">+ <button class="btn btn-danger btn-sm" data-action="rejectAll">[[groups:pending.reject-all]]</button>+ <button class="btn btn-success btn-sm" data-action="acceptAll">[[groups:pending.accept-all]]</button>++</div>+{{{ end }}}++<div style="max-height: 500px;overflow: auto;">+ <div component="groups/pending/alert" class="alert alert-info {{{ if group.pending.length }}}hidden{{{ end }}}">[[groups:pending.none]]</div>+ <table component="groups/pending" class="table table-hover">+ <tbody>+ {{{ each group.pending }}}+ <tr data-uid="{group.pending.uid}" class="align-middle">+ <td class="member-name p-2 d-flex align-items-center justify-content-between">+ <div class="d-flex gap-2">+ <a class="text-decoration-none" href="{config.relative_path}/user/{group.pending.userslug}">{{buildAvatar(group.pending, "24px", true)}}</a>+ <a href="{config.relative_path}/user/{group.pending.userslug}">{group.pending.username}</a>+ </div>+ <div class="d-flex gap-2">+ <button class="btn btn-danger btn-sm" data-action="reject">[[groups:pending.reject]]</a></li>+ <button class="btn btn-success btn-sm" data-action="accept">[[groups:pending.accept]]</a></li>+ </div>+ </td>+ </tr>+ {{{ end }}}+ </tbody>+ </table>+</div>diff --git a/src/views/partials/groups/sidebar-left.tpl b/src/views/partials/groups/sidebar-left.tplnew file mode 100644index 0000000000..9c7feb1042--- /dev/null+++ b/src/views/partials/groups/sidebar-left.tpl@@ -0,0 +1,27 @@+<div class="flex-shrink-0 pe-2 border-end-md text-sm mb-3 flex-basis-md-200">+ <div class="nav sticky-md-top d-flex flex-row flex-md-column flex-wrap gap-1" style="top: 1rem; z-index: 1;">+ <button data-bs-toggle="tab" data-bs-target="#groups-posts" class="btn btn-ghost btn-sm text-start d-flex align-items-baseline ff-secondary fw-semibold {{{ if template.groups/details }}}active{{{ end }}}">+ <div class="flex-grow-1">[[global:posts]]</div>+ </button>+ <button data-bs-toggle="tab" data-bs-target="#groups-members" class="btn btn-ghost btn-sm text-start d-flex align-items-baseline ff-secondary fw-semibold gap-2">+ <div class="flex-grow-1">[[groups:members]]</div>+ <span component="group/member/count" class="flex-shrink-0 text-xs lh-1" title="{formattedNumber(group.memberCount)}">{humanReadableNumber(group.memberCount)}</span>+ </button>++ {{{ if group.isOwner }}}+ <button data-bs-toggle="tab" data-bs-target="#groups-pending" class="btn btn-ghost btn-sm text-start d-flex align-items-baseline ff-secondary fw-semibold gap-2">+ <div class="flex-grow-1">[[groups:details.pending]]</div>+ <span component="group/pending/count" class="flex-shrink-0 text-xs lh-1" title="{formattedNumber(group.pending.length)}">{humanReadableNumber(group.pending.length)}</span>+ </button>++ <button data-bs-toggle="tab" data-bs-target="#groups-invited" class="btn btn-ghost btn-sm text-start d-flex align-items-baseline ff-secondary fw-semibold gap-2">+ <div class="flex-grow-1">[[groups:details.invited]]</div>+ <span component="group/invited/count" class="flex-shrink-0 text-xs lh-1" title="{formattedNumber(group.invited.length)}">{humanReadableNumber(group.invited.length)}</span>+ </button>++ <button data-bs-toggle="tab" data-bs-target="#groups-admin" class="btn btn-ghost btn-sm text-start d-flex align-items-baseline ff-secondary fw-semibold">+ <div class="flex-grow-1">[[global:header.admin]]</div>+ </button>+ {{{ end }}}+ </div>+</div>diff --git a/src/views/partials/noscript/message.tpl b/src/views/partials/noscript/message.tplindex 8a5a1a4471..d47189c97b 100644--- a/src/views/partials/noscript/message.tpl+++ b/src/views/partials/noscript/message.tpl@@ -2,7 +2,7 @@<noscript><div class="alert alert-info"><p>- {noScriptMessage}+ {tx(noScriptMessage)}</p></div></noscript>diff --git a/src/views/partials/tags/filter-dropdown-content.tpl b/src/views/partials/tags/filter-dropdown-content.tplindex acdfbbfc15..3bd0d836fd 100644--- a/src/views/partials/tags/filter-dropdown-content.tpl+++ b/src/views/partials/tags/filter-dropdown-content.tpl@@ -23,11 +23,11 @@</a></li>{{{ each tagItems }}}- <li role="presentation" data-tag="{./valueEscaped}">+ <li role="presentation" data-tag="{./value}"><a class="dropdown-item rounded-1 d-flex align-items-center gap-2" role="menuitem" href="#"><span component="tag-markup" class="flex-grow-1"><div class="d-inline-flex align-items-center gap-1">- {./valueEscaped}+ {./value}</div></span><i component="tag/select/icon" class="flex-shrink-0 fa fa-fw fa-check {{{ if !./selected }}}invisible{{{ end }}}"></i>diff --git a/src/views/partials/toast.tpl b/src/views/partials/toast.tplnew file mode 100644index 0000000000..77a777586a--- /dev/null+++ b/src/views/partials/toast.tpl@@ -0,0 +1,19 @@+<div id="{alert_id}" role="alert" class="alert alert-dismissible alert-{type} fade show" component="toaster/toast">+ <div class="alert-progress position-absolute top-0 start-0 bottom-0 h-100 z-0" style=" opacity:0.1;"></div>+ <div component="toast/body" class="d-flex flex-wrap gap-2 position-relative">+ {{{ if image }}}+ <img component="toast/image" src="{image}" height="80" style="width: auto;" />+ {{{ end }}}+ <div class="d-flex flex-column gap-2">+ {{{ if title }}}+ <strong component="toast/title">{tx(title)}</strong>+ {{{ end }}}++ {{{ if message }}}+ <p class="m-0" component="toast/message">{{tx(message)}}</p>+ {{{ end }}}+ </div>+ </div>++ <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="close"></button>+</div>diff --git a/src/views/partials/topic-filters.tpl b/src/views/partials/topic-filters.tplindex 0dc3cd4669..48cfcfbb85 100644--- a/src/views/partials/topic-filters.tpl+++ b/src/views/partials/topic-filters.tpl@@ -1,13 +1,13 @@<div class="dropdown bottom-sheet{{{ if !filters.length }}} hidden{{{ end }}}"><button type="button" class="btn btn-ghost btn-sm ff-secondary d-flex gap-2 align-items-center dropdown-toggle h-100" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-fw fa-filter text-primary"></i>- <span class="visible-md-inline visible-lg-inline fw-semibold">{selectedFilter.name}</span>+ <span class="visible-md-inline visible-lg-inline fw-semibold">{tx(selectedFilter.name)}</span></button><ul class="dropdown-menu p-1 text-sm" role="menu">{{{each filters}}}<li role="presentation" class="category {{{if filters.selected}}}selected{{{end}}}"><a class="dropdown-item rounded-1 d-flex align-items-center gap-2" role="menuitem" href="{config.relative_path}/{filters.url}">- <div class="flex-grow-1">{filters.name}</div>+ <div class="flex-grow-1">{tx(filters.name)}</div><i class="flex-shrink-0 fa fa-fw {{{ if filters.selected }}}fa-check{{{ end }}}"></i></a></li>diff --git a/src/views/partials/topic-terms.tpl b/src/views/partials/topic-terms.tplindex da7c2abd7b..f9ff6ad837 100644--- a/src/views/partials/topic-terms.tpl+++ b/src/views/partials/topic-terms.tpl@@ -1,13 +1,13 @@<div class="dropdown bottom-sheet {{{ if !terms.length }}}hidden{{{ end }}}"><button type="button" class="btn btn-ghost btn-sm ff-secondary d-flex align-items-center gap-2 dropdown-toggle h-100" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-fw fa-clock text-primary"></i>- <span class="visible-md-inline visible-lg-inline fw-semibold">{selectedTerm.name}</span>+ <span class="visible-md-inline visible-lg-inline fw-semibold">{tx(selectedTerm.name)}</span></button><ul class="dropdown-menu p-1 text-sm" role="menu">{{{each terms}}}<li role="presentation" class="category"><a class="dropdown-item rounded-1 d-flex align-items-center gap-2" role="menuitem" href="{config.relative_path}/{terms.url}">- <div class="flex-grow-1">{terms.name}</div>+ <div class="flex-grow-1">{tx(terms.name)}</div><i class="flex-shrink-0 fa fa-fw {{{ if terms.selected }}}fa-check{{{ end }}}"></i></a></li>diff --git a/src/views/partials/topic/meta-tags.tpl b/src/views/partials/topic/meta-tags.tplnew file mode 100644index 0000000000..80e8f7b40d--- /dev/null+++ b/src/views/partials/topic/meta-tags.tpl@@ -0,0 +1,17 @@+<meta itemprop="headline" content="{title}">+<meta itemprop="text" content="{title}">+<meta itemprop="url" content="{url}">+<meta itemprop="datePublished" content="{timestampISO}">+<meta itemprop="dateModified" content="{lastposttimeISO}">+<div itemprop="author" itemscope itemtype="https://schema.org/Person">+ <meta itemprop="name" content="{author.username}">+ {{{ if author.userslug }}}<meta itemprop="url" content="{config.relative_path}/user/{author.userslug}">{{{ end }}}+</div>+<div itemprop="interactionStatistic" itemscope itemtype="https://schema.org/InteractionCounter">+ <meta itemprop="interactionType" content="https://schema.org/CommentAction">+ <meta itemprop="userInteractionCount" content="{increment(postcount, "-1")}">+</div>+<div itemprop="interactionStatistic" itemscope itemtype="https://schema.org/InteractionCounter">+ <meta itemprop="interactionType" content="https://schema.org/LikeAction">+ <meta itemprop="userInteractionCount" content="{upvotes}">+</div>\ No newline at end of filediff --git a/src/views/partials/topic/post-parent.tpl b/src/views/partials/topic/post-parent.tplindex 5e73f8cf70..f61659c754 100644--- a/src/views/partials/topic/post-parent.tpl+++ b/src/views/partials/topic/post-parent.tpl@@ -1,11 +1,11 @@<div component="post/parent" data-collapsed="true" data-parent-pid="{./parent.pid}" data-uid="{./parent.uid}" class="btn btn-ghost btn-sm d-flex gap-2 text-start flex-row mb-2" style="font-size: 13px;"><div class="d-flex gap-2 text-nowrap"><div class="d-flex flex-nowrap gap-1 align-items-center">- <a href="{config.relative_path}/user/{./parent.user.userslug}" class="text-decoration-none lh-1">{buildAvatar(./parent.user, "16px", true, "not-responsive align-middle")}</a>+ <a href="{config.relative_path}/user/{./parent.user.userslug}" class="text-decoration-none lh-1">{{buildAvatar(./parent.user, "16px", true, "not-responsive align-middle")}}</a><a class="fw-semibold text-truncate" style="max-width: 150px;" href="{config.relative_path}/user/{./parent.user.userslug}">{./parent.user.displayname}</a></div><a href="{config.relative_path}/post/{encodeURIComponent(./parent.pid)}" class="text-muted timeago text-nowrap hidden" title="{./parent.timestampISO}"></a></div>- <div component="post/parent/content" class="text-muted line-clamp-1 text-break w-100">{./parent.content}</div>+ <div component="post/parent/content" class="text-muted line-clamp-1 text-break w-100">{{txEscape(./parent.content)}}</div></div>diff --git a/src/views/partials/topic/post-preview.tpl b/src/views/partials/topic/post-preview.tplindex d3436bf6ba..ab95a74106 100644--- a/src/views/partials/topic/post-preview.tpl+++ b/src/views/partials/topic/post-preview.tpl@@ -2,13 +2,13 @@<div class="d-flex flex-column gap-2"><div class="d-flex gap-2 align-items-center"><div>- <a href="{{{ if post.user.userslug }}}{config.relative_path}/user/{post.user.userslug}{{{ else }}}#{{{ end }}}">{buildAvatar(post.user, "20px", true, "", "user/picture")}</a>+ <a href="{{{ if post.user.userslug }}}{config.relative_path}/user/{post.user.userslug}{{{ else }}}#{{{ end }}}">{{buildAvatar(post.user, "20px", true, "", "user/picture")}}</a><a href="{{{ if post.user.userslug }}}{config.relative_path}/user/{post.user.userslug}{{{ else }}}#{{{ end }}}">{post.user.username}</a></div><div><a href="{config.relative_path}/post/{post.pid}" class="timeago text-xs text-secondary lh-1" style="vertical-align: middle;" title="{post.timestampISO}"></a></div></div>- <div class="content ghost-scrollbar" style="max-height: 300px; overflow-y:auto;">{post.content}</div>+ <div class="content ghost-scrollbar" style="max-height: 300px; overflow-y:auto;">{{post.content}}</div></div></div>diff --git a/src/views/partials/topic/tools-right.tpl b/src/views/partials/topic/tools-right.tpldeleted file mode 100644index e69de29bb2..0000000000diff --git a/src/views/partials/topic/topic-menu-list.tpl b/src/views/partials/topic/topic-menu-list.tplindex b6ee58d0b5..e6f798f2ad 100644--- a/src/views/partials/topic/topic-menu-list.tpl+++ b/src/views/partials/topic/topic-menu-list.tpl@@ -22,11 +22,11 @@{{{ end }}}<li>- <a component="topic/merge" href="#" class="dropdown-item rounded-1 d-flex align-items-center gap-2" role="menuitem"><i class="fa fa-fw fa-code-fork text-secondary"></i> [[topic:thread-tools.merge]]</a>+ <a component="topic/merge" href="#" class="dropdown-item rounded-1 d-flex align-items-center gap-2" role="menuitem"><i class="fa-solid fa-code-merge text-secondary"></i> [[topic:thread-tools.merge]]</a></li><li>- <a component="topic/fork" href="#" class="dropdown-item rounded-1 d-flex align-items-center gap-2" role="menuitem"><i class="fa fa-fw fa-code-fork text-secondary"></i> [[topic:thread-tools.fork]]</a>+ <a component="topic/fork" href="#" class="dropdown-item rounded-1 d-flex align-items-center gap-2" role="menuitem"><i class="fa-solid fa-code-fork text-secondary"></i> [[topic:thread-tools.fork]]</a></li><li>diff --git a/src/views/partials/users/filter-dropdown-content.tpl b/src/views/partials/users/filter-dropdown-content.tplindex e639059b2d..2ea8fa943c 100644--- a/src/views/partials/users/filter-dropdown-content.tpl+++ b/src/views/partials/users/filter-dropdown-content.tpl@@ -1,6 +1,6 @@<button type="button" class="btn btn-ghost btn-sm d-flex align-items-center gap-2 ff-secondary dropdown-toggle h-100" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{{ if selectedUser }}}- <span class="fw-semibold">{buildAvatar(selectedUser, "20px", true, "not-responsive")} {selectedUser.username}</span>+ <span class="fw-semibold">{{buildAvatar(selectedUser, "20px", true, "not-responsive")}} {selectedUser.username}</span>{{{ else }}}<span class="fw-semibold">[[users:all-users]]</span>{{{ end }}} <span class="caret text-primary opacity-75"></span>@@ -15,7 +15,7 @@{{{ each users }}}<li role="presentation" class="user {{{ if ./selected}}}selected{{{end}}}"><a class="dropdown-item rounded-1 d-flex align-items-center gap-2" role="menuitem" href="{config.relative_path}/{./url}">- <div class="flex-grow-1 d-inline-flex gap-1 align-items-center">{buildAvatar(@value, "24px", true, "not-responsive")} {./username}</div>+ <div class="flex-grow-1 d-inline-flex gap-1 align-items-center">{{buildAvatar(@value, "24px", true, "not-responsive")}} {./username}</div><i class="flex-shrink-0 fa fa-fw {{{ if ./selected }}}fa-check{{{ end }}}"></i></a></li>diff --git a/src/views/post-queue.tpl b/src/views/post-queue.tplindex a0dfbf5a4b..82bd668d59 100644--- a/src/views/post-queue.tpl+++ b/src/views/post-queue.tpl@@ -111,7 +111,7 @@</div><div class="text-sm lh-1">{{{ if posts.user.userslug}}}- <a class="text-decoration-none d-flex align-items-center gap-1" href="{config.relative_path}/uid/{posts.user.uid}">{buildAvatar(posts.user, "24px", true, "not-responsive")} {posts.user.username}</a>+ <a class="text-decoration-none d-flex align-items-center gap-1" href="{config.relative_path}/uid/{posts.user.uid}">{{buildAvatar(posts.user, "24px", true, "not-responsive")}} {posts.user.username}</a>{{{ else }}}{posts.user.username}{{{ end }}}@@ -147,18 +147,18 @@<span class="small topic-title text-break">{{{ if posts.data.tid }}}<div class="d-flex flex-column align-items-start gap-1">- <a href="{config.relative_path}/topic/{posts.data.tid}">{txEscape(posts.topic.title)}</a>+ <a href="{config.relative_path}/topic/{posts.data.tid}">{posts.topic.title}</a><span class="badge text-body border border-gray-300 stats text-xs"><span class="text-lowercase fw-normal">[[global:lastpost]]</span><span title="{posts.topic.lastposttimeISO}" class="timeago fw-bold"></span></span></div>{{{ end }}}- <span class="title-text">{txEscape(posts.data.title)}</span>+ <span class="title-text">{posts.data.title}</span></span>{{{if !posts.data.tid}}}<div class="topic-title-editable hidden">- <input class="form-control form-control-sm" type="text" value="{txEscape(posts.data.title)}"/>+ <input class="form-control form-control-sm" type="text" value="{posts.data.title}"/></div>{{{end}}}</li>@@ -176,7 +176,7 @@<div class="topic-category"><a href="{config.relative_path}/category/{posts.category.slug}"><div class="category-item d-inline-block">- {buildCategoryIcon(./category, "24px", "rounded-circle")}+ {{buildCategoryIcon(./category, "24px", "rounded-circle")}}<span class="text-sm">{posts.category.name}</span></div></a>@@ -195,7 +195,7 @@<div class="topic-category"><a href="{config.relative_path}/category/{posts.crosspostCategory.slug}"><div class="category-item d-inline-block">- {buildCategoryIcon(./crosspostCategory, "24px", "rounded-circle")}+ {{buildCategoryIcon(./crosspostCategory, "24px", "rounded-circle")}}<span class="text-sm">{posts.crosspostCategory.name}</span></div></a>@@ -214,7 +214,7 @@</div><div class="tag-list">{{{ each posts.data.tags }}}- <a href="{config.relative_path}/tags/{encodeURIComponent(@value)}"><span class="badge border border-gray-300 fw-normal tag">{escape(@value)}</span></a>+ <a href="{config.relative_path}/tags/{encodeURIComponent(@value)}"><span class="badge border border-gray-300 fw-normal tag">{@value}</span></a>{{{ end }}}</div><div class="topic-tags-editable hidden">@@ -250,9 +250,9 @@<button data-action="editContent" class="btn btn-ghost btn-sm ff-secondary border text-xs">[[post-queue:edit]]</button>{{{ end }}}</div>- <div class="post-content mb-auto text-break px-3 py-0 h-100">{txEscape(posts.data.content)}</div>- <div class="post-content-editable flex-grow-1 hidden">- <textarea class="form-control w-100 h-100 p-3">{txEscape(posts.data.rawContent)}</textarea>+ <div class="post-content mb-auto text-break px-3 py-0 px-1 h-100">{{txEscape(posts.data.content)}}</div>+ <div class="post-content-editable flex-grow-1 hidden px-2">+ <textarea class="form-control w-100 h-100 px-2">{posts.data.rawContent}</textarea></div><div component="post-queue/link-container" class="hidden border-top mx-3 py-3"><label class="text-secondary form-text mb-2">[[post-queue:links-in-this-post]]</label>@@ -265,9 +265,9 @@{{{ each posts.data.thumbs }}}<div class="position-relative"><a class="d-inline-block" href="#">- <img class="rounded-1 bg-light" style="width:auto; max-width: 5.33rem; height: 3.33rem; object-fit: contain;" src="{escape(@value)}" />+ <img class="rounded-1 bg-light" style="width:auto; max-width: 5.33rem; height: 3.33rem; object-fit: contain;" src="{@value}" /></a>- <a href="#" data-action="removeThumb" class="link-danger position-absolute btn top-0 start-100 translate-middle p-1"><i class="fa-solid fa-circle-xmark"></i></button>+ <a href="#" data-action="removeThumb" class="link-danger position-absolute btn shadow-none top-0 start-100 translate-middle p-1"><i class="fa-solid fa-circle-xmark"></i></button></div>{{{ end }}}<a class="btn btn-ghost d-inline-block p-0" href="#" data-action="uploadThumb">diff --git a/src/views/register.tpl b/src/views/register.tplindex c1e08206b7..d694e72fb5 100644--- a/src/views/register.tpl+++ b/src/views/register.tpl@@ -42,7 +42,7 @@{{{ each regFormEntry }}}<div class="mb-2 regFormEntry d-flex flex-column gap-2 {./styleName}">- <label for="{./inputId}">{./label}</label>+ <label for="{./inputId}">{tx(./label)}</label><div>{{./html}}</div></div>{{{ end }}}@@ -68,6 +68,9 @@<input id="token" type="hidden" name="token" value="" /><input id="noscript" type="hidden" name="noscript" value="true" /><input type="hidden" name="_csrf" value="{config.csrf_token}" />+ {{{ if (config.userLang != config.defaultLang) }}}+ <input type="hidden" name="userLang" value="{config.userLang}" />+ {{{ end }}}</form></div></div>@@ -86,7 +89,7 @@<i class="flex-shrink-0 {./icons.normal}" style="color:{./color};"></i>{{{ end }}}{{{ if ./labels.register }}}- <div class="flex-grow-1 text-body text-sm">{./labels.register}</div>+ <div class="flex-grow-1 text-body text-sm">{tx(./labels.register)}</div>{{{ end }}}</a></li>diff --git a/src/views/registerComplete.tpl b/src/views/registerComplete.tplindex c770e235ba..136c4c8578 100644--- a/src/views/registerComplete.tpl+++ b/src/views/registerComplete.tpl@@ -27,7 +27,7 @@<div class="col-12 col-sm-8 offset-sm-2"><div class="card"><div class="card-body">- {@value}+ {{@value}}</div></div></div>diff --git a/src/views/reset.tpl b/src/views/reset.tplindex 0dab7438ba..b81537d491 100644--- a/src/views/reset.tpl+++ b/src/views/reset.tpl@@ -1,24 +1,26 @@-<div class="flex-fill">- <div class="alert alert-info">- [[reset_password:enter-email]]- </div>-- <div class="card card-body bg-light">- <div class="alert alert-success alert-dismissible hide" id="success">- <button type="button" class="btn-close" data-bs-dismiss="alert"></button>- [[reset_password:password-reset-sent]]- </div>- <div class="alert alert-danger alert-dismissible hide" id="error">- <button type="button" class="btn-close" data-bs-dismiss="alert"></button>- [[reset_password:invalid-email]]+<div class="flex-fill row justify-content-center">+ <div class="col-12 col-md-5 col-lg-4 px-md-0">+ <div class="alert alert-info">+ [[reset_password:enter-email]]</div>- <form onsubmit="return false;">- <div class="mb-3">- <input type="email" class="form-control form-control-lg" id="email" placeholder="[[reset_password:enter-email-address]]" autocomplete="off">++ <div class="card card-body bg-light">+ <div class="alert alert-success alert-dismissible hide" id="success">+ <button type="button" class="btn-close" data-bs-dismiss="alert"></button>+ [[reset_password:password-reset-sent]]</div>- <div class="d-grid">- <button class="btn btn-primary btn-lg" id="reset" type="submit">[[reset_password:reset-password]]</button>+ <div class="alert alert-danger alert-dismissible hide" id="error">+ <button type="button" class="btn-close" data-bs-dismiss="alert"></button>+ [[reset_password:invalid-email]]</div>- </form>+ <form onsubmit="return false;">+ <div class="mb-3">+ <input type="email" class="form-control" id="email" placeholder="[[reset_password:enter-email-address]]" autocomplete="off">+ </div>+ <div class="d-grid">+ <button class="btn btn-primary" id="reset" type="submit">[[reset_password:reset-password]]</button>+ </div>+ </form>+ </div></div></div>\ No newline at end of filediff --git a/src/views/tos.tpl b/src/views/tos.tplindex c2568cd233..ca62a206f4 100644--- a/src/views/tos.tpl+++ b/src/views/tos.tpl@@ -1,4 +1,4 @@<h3>[[register:terms-of-use]]</h3><hr/>-{termsOfUse}+{{termsOfUse}}diff --git a/src/widgets/index.js b/src/widgets/index.jsindex 1e0ac6415d..80384a0f06 100644--- a/src/widgets/index.js+++ b/src/widgets/index.js@@ -27,7 +27,9 @@ widgets.render = async function (uid, options) {config = await apiController.loadConfig(options.req);}- const widgetData = await Promise.all(locations.map(location => renderLocation(location, data, uid, options, config)));+ const widgetData = await Promise.all(+ locations.map(location => renderLocation(location, data, uid, options, config))+ );const returnData = {};locations.forEach((location, i) => {diff --git a/test/activitypub/mocks.js b/test/activitypub/mocks.jsindex 93ee49bff7..7bc0a19ba9 100644--- a/test/activitypub/mocks.js+++ b/test/activitypub/mocks.js@@ -209,7 +209,7 @@ describe('Mocking', () => {// Mock the mentions plugin's getMatchesconst mentionPath = path.join(__dirname, '../../node_modules/nodebb-plugin-mentions');- mentionPlugin = require.main.require(mentionPath);+ mentionPlugin = nodebb.require(mentionPath);mentionPlugin.getMatches = async (content) => {const matches = new Set();// Simple regex to find @username mentionsdiff --git a/test/build.js b/test/build.jsindex 40bd2b6165..8259213818 100644--- a/test/build.js+++ b/test/build.js@@ -87,7 +87,12 @@ describe('Build', () => {const build = require('../src/meta/build');before(async () => {- await fs.promises.rm(path.join(__dirname, '../build/public'), { recursive: true, force: true });+ await fs.promises.rm(path.join(__dirname, '../build/public'), {+ recursive: true,+ force: true,+ maxRetries: 5,+ retryDelay: 100,+ });await db.sortedSetAdd('plugins:active', Date.now(), 'nodebb-plugin-markdown');});diff --git a/test/categories.js b/test/categories.jsindex 9cde26201a..984acefda3 100644--- a/test/categories.js+++ b/test/categories.js@@ -49,7 +49,7 @@ describe('Categories', () => {assert.ifError(err);assert(categoryData);- assert.equal('Test Category & NodeBB', categoryData.name);+ assert.equal('Test Category & NodeBB', categoryData.name);assert.equal(categoryObj.description, categoryData.description);assert.strictEqual(categoryObj.disabled, 0);done();@@ -80,7 +80,7 @@ describe('Categories', () => {it('should load a category route', async () => {const { response, body } = await request.get(`${nconf.get('url')}/api/category/${categoryObj.cid}/test-category`);assert.equal(response.statusCode, 200);- assert.equal(body.name, 'Test Category & NodeBB');+ assert.equal(body.name, 'Test Category & NodeBB');assert(body);});@@ -897,23 +897,11 @@ describe('Categories', () => {description: '[[topic:forked-message, javascript:alert(origin), foobar]]',});- const data = await Categories.getCategoryData(category.cid);- assert.strictEqual(data.name, '[[topic:merged-message, javascript:alert(origin), foobar]]');- assert.strictEqual(data.description, '[[topic:forked-message, javascript:alert(origin), foobar]]');- assert.strictEqual(data.descriptionParsed, '[[topic:forked-message, javascript:alert(origin), foobar]]');- const { response, body } = await request.get(`${nconf.get('url')}/api/category/${category.cid}/test-category`);-- // title comes from category.name so should be escaped as well- assert.strictEqual(body.title, 'This topic has been merged into <a href="">foobar</a>');-- // breadcrumbs should be translated & escaped too- assert.strictEqual(body.breadcrumbs[1].text, 'This topic has been merged into <a href="">foobar</a>');-- assert.strictEqual(body.name, 'This topic has been merged into <a href="">foobar</a>');-- assert.strictEqual(body.description, 'This topic was forked from <a href="">foobar</a>');-- assert.strictEqual(body.descriptionParsed, 'This topic was forked from <a href="">foobar</a>');+ const { response, body } = await request.get(`${nconf.get('url')}/category/${category.cid}/test-category`);+ const debug = body.slice(0, 1000);+ assert(body.includes('<title>This topic has been merged into <a href="">foobar</a> | NodeBB</title>'), debug);+ assert(body.includes('<meta name="title" content="This topic has been merged into <a href="">foobar</a>" />'), debug);+ assert(body.includes('<meta name="description" content="This topic was forked from <a href="">foobar</a>" />'), debug);});});diff --git a/test/controllers.js b/test/controllers.jsindex 7f0751871d..1c78ad8eae 100644--- a/test/controllers.js+++ b/test/controllers.js@@ -213,7 +213,7 @@ describe('Controllers', () => {{ it: 'should load recent rss feed', url: `/recent.rss` },{ it: 'should load top rss feed', url: `/top.rss` },{ it: 'should load popular rss feed', url: `/popular.rss` },- { it: 'should load popular rss feed with term', url: `/popular/day.rss` },+ { it: 'should load popular rss feed with term', url: `/popular/daily.rss` },{ it: 'should load recent posts rss feed', url: `/recentposts.rss` },{ it: 'should load category recent posts rss feed', url: `/category/1/recentposts.rss` },{ it: 'should load user topics rss feed', url: `/user/foo/topics.rss` },@@ -249,9 +249,11 @@ describe('Controllers', () => {});it('should properly escape outgoing url query params', async () => {- const { response, body } = await request.get(`${nconf.get('url')}/api/outgoing?url=https://foo.com%3Fbest=%5B%5Btopic:merged-message,%20javascript:alert(origin)%5D%5D`);+ const { response, body } = await request.get(`${nconf.get('url')}/outgoing?url=https://foo.com%3Fbest=%5B%5Btopic:merged-message,%20javascript:alert(origin)%5D%5D`);assert.equal(response.statusCode, 200);- assert.strictEqual(body.outgoing, 'https://foo.com/?best=&lsqb;&lsqb;topic:merged-message,%20javascript:alert(origin)&rsqb;&rsqb;');++ assert(body.includes('<a href="https://foo.com?best=[[topic:merged-message, javascript:alert(origin)]]"'));+ assert(body.includes('https://foo.com?best=[[topic:merged-message, javascript:alert(origin)]]'));});it('should load /register/complete', async () => {@@ -1300,12 +1302,18 @@ describe('Controllers', () => {it('should parse about me', async () => {await user.setUserFields(fooUid, {picture: '/assets/uploads/path/to/picture',- aboutme: 'hi i am a bot [[topic:moved-from]] <script>alert("xss")</script>',+ aboutme: 'hi i am a bot [[topic:moved-from]]<script>alert("xss")</script>',});const { response, body } = await request.get(`${nconf.get('url')}/api/user/foo`);assert.equal(response.statusCode, 200);- assert.equal(body.aboutmeParsed, 'hi i am a bot [[topic:moved-from]] ');+ // should be unescaped in api+ assert.equal(body.aboutmeParsed, 'hi i am a bot [[topic:moved-from]]');assert.equal(body.picture, '/assets/uploads/path/to/picture');++ const { response: response2, body: body2 } = await request.get(`${nconf.get('url')}/user/foo`);+ // should not be translated in html+ assert(body2.includes('hi i am a bot [[topic:moved-from]]'));+ assert(!body2.includes('Moved from'));});it('should not return reputation if reputation is disabled', async () => {@@ -1436,16 +1444,16 @@ describe('Controllers', () => {const { response, body } = await request.get(`${nconf.get('url')}/api/config`);assert.equal(response.statusCode, 200);assert.ok(body.cookies);- assert.equal(translator.escape('[[global:cookies.message]]'), body.cookies.message);- assert.equal(translator.escape('[[global:cookies.accept]]'), body.cookies.dismiss);- assert.equal(translator.escape('[[global:cookies.learn-more]]'), body.cookies.link);+ assert.equal('[[global:cookies.message]]', body.cookies.message);+ assert.equal('[[global:cookies.accept]]', body.cookies.dismiss);+ assert.equal('[[global:cookies.learn-more]]', body.cookies.link);});it('response should be parseable when entries have apostrophes', async () => {await meta.configs.set('cookieConsentMessage', 'Julian\'s Message');const { response, body } = await request.get(`${nconf.get('url')}/api/config`);assert.equal(response.statusCode, 200);- assert.equal('Julian's Message', body.cookies.message);+ assert.equal(body.cookies.message, 'Julian\'s Message');});});diff --git a/test/flags.js b/test/flags.jsindex e7000cb417..8c292878fb 100644--- a/test/flags.js+++ b/test/flags.js@@ -907,7 +907,7 @@ describe('Flags', () => {assert(exists);});- it('should escape flag reason', async () => {+ it('should escape flag reason and not translate it', async () => {const postData = await Topics.reply({tid: tid,uid: 1,@@ -922,12 +922,19 @@ describe('Flags', () => {body: {type: 'post',id: postData.pid,- reason: '"<script>alert(\'ok\');</script>',+ reason: '"<script>alert(\'ok\');</script> [[global:votes]]',},});const flagData = await Flags.get(body.response.flagId);- assert.strictEqual(flagData.reports[0].value, '"<script>alert('ok');</script>');+ // unescape in api+ assert.strictEqual(flagData.reports[0].value, '"<script>alert(\'ok\');</script> [[global:votes]]');++ // escaped in html+ const { body: body2 } = await request.get(`${nconf.get('url')}/flags/${body.response.flagId}`, {+ jar, body: {},+ });+ assert(body2.includes('"<script>alert('ok');</script> [[global:votes]]'));});it('should return undefined for invalid filters', async () => {diff --git a/test/groups.js b/test/groups.jsindex 3f9ee81d1b..12690ea2e1 100644--- a/test/groups.js+++ b/test/groups.js@@ -17,7 +17,7 @@ const apiGroups = require('../src/api/groups');const meta = require('../src/meta');const navigation = require('../src/navigation/admin');const translator = require('../src/translator');-+const request = require('../src/request');describe('Groups', () => {let adminUid;@@ -150,15 +150,20 @@ describe('Groups', () => {describe('description', () => {it('should not translate group description', async () => {const desc = '[[global:403.login, javascript:alert(document.domain)]]';- const txEscapedDesc = translator.escape(desc);await Groups.create({- name: 'tx escape',+ name: 'tx-escape',description: desc,private: 0,hidden: 0,});- const data = await Groups.get('tx escape', {});- assert.strictEqual(data.descriptionParsed, txEscapedDesc);+ const data = await Groups.get('tx-escape', {});+ // should not be tx escaped in api+ assert.strictEqual(data.descriptionParsed, desc);++ // should not be translated in the html+ const { response, body } = await request.get(`${nconf.get('url')}/groups/tx-escape`, {});+ assert(body.includes('[[global:403.login, javascript:alert(document.domain)]]'));+ assert(!body.includes('Perhaps you should'));});});@@ -493,7 +498,7 @@ describe('Groups', () => {assert.strictEqual('updatetestgroup', groupObj.slug);const navItems = await navigation.get();- assert.strictEqual(navItems[0].route, '/categories');+ assert.strictEqual(navItems[0].route, '/categories');});it('should fail if system groups is being renamed', (done) => {diff --git a/test/messaging.js b/test/messaging.jsindex 356eb84d9e..3f441c5c15 100644--- a/test/messaging.js+++ b/test/messaging.js@@ -215,7 +215,8 @@ describe('Messaging Library', () => {const { messages } = body.response;assert.equal(messages.length, 2);assert.strictEqual(messages[0].system, 1);- assert.strictEqual(messages[0].content, 'user-join');+ assert.strictEqual(messages[0].type, 'user-join');+ assert.strictEqual(messages[0].content, `[[modules:chat.system.user-join, baz, ${messages[0].timestampISO}]]`);const { response, body: body2 } = await callv3API('put', `/chats/${roomId}/messages/${messages[0].messageId}`, {message: 'test',@@ -294,7 +295,8 @@ describe('Messaging Library', () => {const { messages } = body.response;const message = messages.pop();assert.strictEqual(message.system, 1);- assert.strictEqual(message.content, 'user-leave');+ assert.strictEqual(message.type, 'user-leave');+ assert.strictEqual(message.content, `[[modules:chat.system.user-leave, baz, ${message.timestampISO}]]`);});it('should not send a user-leave system message when a user tries to leave a room they are not in', async () => {@@ -305,12 +307,14 @@ describe('Messaging Library', () => {assert.equal(messages.length, 4);let message = messages.pop();assert.strictEqual(message.system, 1);- assert.strictEqual(message.content, 'user-leave');+ assert.strictEqual(message.type, 'user-leave');+ assert.strictEqual(message.content, `[[modules:chat.system.user-leave, baz, ${message.timestampISO}]]`);// The message before should still be a user-joinmessage = messages.pop();assert.strictEqual(message.system, 1);- assert.strictEqual(message.content, 'user-join');+ assert.strictEqual(message.type, 'user-join');+ assert.strictEqual(message.content, `[[modules:chat.system.user-join, herp, ${message.timestampISO}]]`);});it('should make both users owners on room creation', async () => {@@ -533,7 +537,8 @@ describe('Messaging Library', () => {const message = messages.pop();assert.strictEqual(message.system, 1);- assert.strictEqual(message.content, 'room-rename, new room name');+ assert.strictEqual(message.type, 'room-rename');+ assert.strictEqual(message.content, `[[modules:chat.system.room-rename, foo, ${message.timestampISO}, new room name]]`);});it('should fail to load room with invalid-data', async () => {@@ -581,23 +586,38 @@ describe('Messaging Library', () => {assert(Array.isArray(rooms));});- it('should escape teaser', async () => {+ it('should escape teaser in the rendered html', async () => {await callv3API('post', `/chats/${roomId}`, { roomId: roomId, message: '<svg/onload=alert(document.location);' }, 'foo');const { rooms } = await api.chats.list({ uid: mocks.users.foo.uid }, { start: 0, stop: 9, uid: mocks.users.foo.uid });- assert.equal(rooms[0].teaser.content, '<svg/onload=alert(document.location);');+ // in the api not escaped+ assert.equal(rooms[0].teaser.content, '<svg/onload=alert(document.location);');++ const { response, body } = await request.get(`${nconf.get('url')}/chats/${roomId}`, {+ jar: mocks.users.foo.jar,+ });+ // in the rendered output should be escaped+ assert(body.includes('<svg/onload=alert(document.location)'));});it('should not translate chat messages if they have translation keys', async () => {- await callv3API('post', `/chats/${roomId}`, { roomId: roomId, message: '[[global:404.login]]' }, 'foo');+ const message = '[[global:403.login]]';+ await callv3API('post', `/chats/${roomId}`, { roomId, message }, 'foo');const { rooms } = await api.chats.list({ uid: mocks.users.foo.uid }, { start: 0, stop: 9, uid: mocks.users.foo.uid });const room = await api.chats.get({ uid: mocks.users.foo.uid }, { uid: mocks.users.foo.uid, roomId });- const txEscaped = translator.escape('[[global:404.login]]');- assert.strictEqual(room.messages[room.messages.length - 1].content, txEscaped);- assert.strictEqual(rooms[0].teaser.content, txEscaped);+ // in the api not escaped+ assert.strictEqual(room.messages[room.messages.length - 1].content, message);+ assert.strictEqual(rooms[0].teaser.content, message);++ // in the html escaped+ const { response, body } = await request.get(`${nconf.get('url')}/chats/${roomId}`, {+ jar: mocks.users.foo.jar,+ });+ assert(body.includes(message));+ assert(!body.includes('Perhaps you should'));});it('should escape chatWithMessage', async () => {@@ -613,10 +633,11 @@ describe('Messaging Library', () => {{ uid: mocks.users.foo.uid }, { start: 0, stop: 9, uid: mocks.users.foo.uid });- assert.strictEqual(- rooms[0].chatWithMessage,- `Chat with <a href="${nconf.get('relative_path')}/uid/${uid}"><svg/onload=alert(document.location);</a>`- );+ const { response, body } = await request.get(`${nconf.get('url')}/chats/${rooms[0].roomId}`, {+ jar: mocks.users.foo.jar,+ });++ assert(body.includes(`Chat with <a href="${nconf.get('relative_path')}/uid/${uid}"><svg/onload=alert(document.location);</a>`));meta.config.showFullnameAsDisplayName = oldValue;});@@ -822,7 +843,7 @@ describe('Messaging Library', () => {const { body } = await callv3API('get', `/chats/${roomId}`, {}, 'herp');const { messages } = body.response;messages.forEach((msg) => {- assert(!msg.deleted || msg.content === '<p>[[modules:chat.message-deleted]]</p>', msg.content);+ assert(!msg.deleted || msg.content === '[[modules:chat.message-deleted]]', msg.content);});});@@ -830,7 +851,7 @@ describe('Messaging Library', () => {const { body } = await callv3API('get', `/chats/${roomId}/messages/${mid}`, {}, 'herp');const message = body.response;assert.strictEqual(message.deleted, 1);- assert.strictEqual(message.content, '<p>[[modules:chat.message-deleted]]</p>');+ assert.strictEqual(message.content, '[[modules:chat.message-deleted]]');});it('should error out if a message is deleted again', async () => {@@ -863,7 +884,7 @@ describe('Messaging Library', () => {it('should error out for regular users', async () => {const { response, body } = await callv3API('delete', `/chats/${roomId}/messages/${mid2}`, {}, 'baz');assert.strictEqual(response.statusCode, 400);- assert.strictEqual(body.status.message, 'chat-message-editing-disabled');+ assert.strictEqual(body.status.message, 'Chat messaging editing is disabled.');});it('should succeed for administrators', async () => {diff --git a/test/mocks/databasemock.js b/test/mocks/databasemock.jsindex d1076b1217..097a753c35 100644--- a/test/mocks/databasemock.js+++ b/test/mocks/databasemock.js@@ -142,8 +142,8 @@ before(async function () {this.timeout(30000);nconf.set('core_templates_path', path.join(__dirname, '../../src/views'));- nconf.set('base_templates_path', path.join(nconf.get('themes_path'), 'nodebb-theme-persona/templates'));- nconf.set('theme_config', path.join(nconf.get('themes_path'), 'nodebb-theme-persona', 'theme.json'));+ nconf.set('base_templates_path', path.join(nconf.get('themes_path'), 'nodebb-theme-harmony/templates'));+ nconf.set('theme_config', path.join(nconf.get('themes_path'), 'nodebb-theme-harmony', 'theme.json'));nconf.set('bcrypt_rounds', 1);nconf.set('socket.io:origins', '*:*');nconf.set('version', packageInfo.version);@@ -210,7 +210,7 @@ async function setupMockDefaults() {await meta.themes.set({type: 'local',- id: 'nodebb-theme-persona',+ id: 'nodebb-theme-harmony',});const fs = require('fs');diff --git a/test/navigation.js b/test/navigation.jsindex 78e2b4447c..f977e26732 100644--- a/test/navigation.js+++ b/test/navigation.js@@ -14,11 +14,11 @@ describe('Navigation', () => {it('should toggle /world route when ap is toggled', async () => {let nav = await navAdmin.get();- let world = nav.find(item => item.route === '/world');+ let world = nav.find(item => item.route === '/world');assert.strictEqual(!!world.enabled, true);await meta.configs.setMultiple({ activitypubEnabled: 0 });nav = await navAdmin.get();- world = nav.find(item => item.route === '/world');+ world = nav.find(item => item.route === '/world');assert.strictEqual(!!world.enabled, false);});});diff --git a/test/posts.js b/test/posts.jsindex 85d7a62fdf..555c25f0ef 100644--- a/test/posts.js+++ b/test/posts.js@@ -1081,7 +1081,6 @@ describe('Post\'s', () => {it('should not translate queued topic title & content', async () => {const text = '[[global:403.login, javascript:alert(document.domain)]]';- const textEscaped = translator.escape(text);const result = await apiTopics.create({ uid: uid }, {cid: cid,title: text,diff --git a/test/socket.io.js b/test/socket.io.jsindex add66afe2e..d7c82dc19f 100644--- a/test/socket.io.js+++ b/test/socket.io.js@@ -415,15 +415,13 @@ describe('socket.io', () => {});});- it('should set theme to local persona', (done) => {- socketAdmin.themes.set({ uid: adminUid }, { type: 'local', id: 'nodebb-theme-persona' }, (err) => {- assert.ifError(err);- meta.configs.get('theme:id', (err, id) => {- assert.ifError(err);- assert.equal(id, 'nodebb-theme-persona');- done();- });- });+ it('should set theme to local persona', async () => {+ const currentThemeId = await meta.configs.get('theme:id');+ assert.strictEqual(currentThemeId, 'nodebb-theme-harmony');+ await socketAdmin.themes.set({ uid: adminUid }, { type: 'local', id: 'nodebb-theme-persona' });+ const newId = await meta.configs.get('theme:id');+ assert.equal(newId, 'nodebb-theme-persona');+ await socketAdmin.themes.set({ uid: adminUid }, { type: 'local', id: currentThemeId });});it('should toggle plugin active', (done) => {@@ -504,7 +502,7 @@ describe('socket.io', () => {it('should order active plugins', (done) => {const data = [- { name: 'nodebb-theme-persona', order: 0 },+ { name: 'nodebb-theme-harmony', order: 0 },{ name: 'nodebb-plugin-dbsearch', order: 1 },{ name: 'nodebb-plugin-markdown', order: 2 },{ ignoreme: 'wrong data' },diff --git a/test/template-helpers.js b/test/template-helpers.jsindex 0e05103ad8..2a1bc0a126 100644--- a/test/template-helpers.js+++ b/test/template-helpers.js@@ -69,9 +69,9 @@ describe('helpers', () => {done();});- it('should escape html', (done) => {- const str = helpers.escape('gdkfhgk < some > and &');- assert.equal(str, 'gdkfhgk < some > and &');+ it('should escape html and translation tokens', (done) => {+ const str = helpers.escape('gdkfhgk < some > and & [[global:posts]] foo');+ assert.equal(str, 'gdkfhgk < some > and & [[global:posts]] foo');done();});@@ -83,7 +83,7 @@ describe('helpers', () => {backgroundImage: '/assets/uploads/image.png',imageClass: 'auto',}, 16, 'rounded-circle'),- '<span class="icon d-inline-flex justify-content-center align-items-center align-middle rounded-circle" style="background-color: #ff0000; border-color: #ff0000!important; color: #00ff00; background-image: url(/assets/uploads/image.png); background-size: auto; width:16; height: 16; font-size: 8px;"></span>'+ '<span class="icon d-inline-flex justify-content-center align-items-center align-middle rounded-circle" style="background-color: #ff0000; border-color: #ff0000 !important; color: #00ff00; background-image: url(/assets/uploads/image.png); background-size: auto; width:16; height: 16; font-size: 8px;"></span>');assert.strictEqual(helpers.buildCategoryIcon({@@ -93,7 +93,7 @@ describe('helpers', () => {imageClass: 'auto',icon: 'fa-book',}, 16, 'rounded-circle'),- '<span class="icon d-inline-flex justify-content-center align-items-center align-middle rounded-circle" style="background-color: #ff0000; border-color: #ff0000!important; color: #00ff00; background-image: url(/assets/uploads/image.png); background-size: auto; width:16; height: 16; font-size: 8px;"><i class="fa fa-fw fa-book"></i></span>'+ '<span class="icon d-inline-flex justify-content-center align-items-center align-middle rounded-circle" style="background-color: #ff0000; border-color: #ff0000 !important; color: #00ff00; background-image: url(/assets/uploads/image.png); background-size: auto; width:16; height: 16; font-size: 8px;"><i class="fa fa-fw fa-book"></i></span>');done();});@@ -106,8 +106,9 @@ describe('helpers', () => {backgroundImage: '/assets/uploads/image.png',imageClass: 'auto',name: 'Category 1',+ slug: 'category-1',}, 'a', ''),- `<a component="topic/category" href="${nconf.get('relative_path')}/category/undefined" class="badge px-1 text-truncate text-decoration-none " style="color: #00ff00;background-color: #ff0000;border-color: #ff0000!important; max-width: 70vw;">\n\t\t\t\n\t\t\tCategory 1\n\t\t</a>`+ `<a component="topic/category" href="${nconf.get('relative_path')}/category/category-1" class="badge px-1 text-truncate text-decoration-none " style="color: #00ff00;background-color: #ff0000;border-color: #ff0000!important; max-width: 70vw;">\n\t\t\t\n\t\t\tCategory 1\n\t\t</a>`);assert.strictEqual(helpers.buildCategoryLabel({@@ -138,7 +139,7 @@ describe('helpers', () => {imageClass: 'auto',};const bg = helpers.generateCategoryBackground(category);- assert.equal(bg, 'background-color: #ff0000; border-color: #ff0000!important; color: #00ff00; background-image: url(/assets/uploads/image.png); background-size: auto;');+ assert.equal(bg, 'background-color: #ff0000; border-color: #ff0000 !important; color: #00ff00; background-image: url(/assets/uploads/image.png); background-size: auto;');done();});@@ -159,11 +160,13 @@ describe('helpers', () => {bgColor: '#ff0000',color: '#00ff00',name: 'children',+ slug: 'children',+ icon: 'fa-users',},],};const html = helpers.generateChildrenCategories(category);- assert.equal(html, `<span class="category-children"><span class="category-children-item float-start"><div role="presentation" class="icon float-start" style="background-color: #ff0000; border-color: #ff0000!important; color: #00ff00;"><i class="fa fa-fw undefined"></i></div><a href="${nconf.get('relative_path')}/category/undefined"><small>children</small></a></span></span>`);+ assert.equal(html, `<span class="category-children"><span class="category-children-item"><div role="presentation" class="icon" style="background-color: #ff0000; border-color: #ff0000 !important; color: #00ff00;"><i class="fa fa-fw fa-users"></i></div><a href="${nconf.get('relative_path')}/category/children"><small>children</small></a></span></span>`);done();});@@ -239,7 +242,7 @@ describe('helpers', () => {it('should render digest avatar', (done) => {const block = { teaser: { user: { username: 'baris', 'icon:text': 'B', 'icon:bgColor': '#ff000' } } };const html = helpers.renderDigestAvatar(block);- assert.equal(html, `<div style="vertical-align: middle; width: 32px; height: 32px; line-height: 32px; font-size: 16px; background-color: ${block.teaser.user['icon:bgColor']}; color: white; text-align: center; display: inline-block; border-radius: 50%;">${block.teaser.user['icon:text']}</div>`);+ assert.equal(html, `<div style="vertical-align: middle; width: 32px; height: 32px; line-height: 32px; font-size: 16px; color: white; text-align: center; display: inline-block; border-radius: 50%; background-color: ${block.teaser.user['icon:bgColor']};">${block.teaser.user['icon:text']}</div>`);done();});@@ -253,7 +256,7 @@ describe('helpers', () => {it('should render digest avatar', (done) => {const block = { user: { username: 'baris', 'icon:text': 'B', 'icon:bgColor': '#ff000' } };const html = helpers.renderDigestAvatar(block);- assert.equal(html, `<div style="vertical-align: middle; width: 32px; height: 32px; line-height: 32px; font-size: 16px; background-color: ${block.user['icon:bgColor']}; color: white; text-align: center; display: inline-block; border-radius: 50%;">${block.user['icon:text']}</div>`);+ assert.equal(html, `<div style="vertical-align: middle; width: 32px; height: 32px; line-height: 32px; font-size: 16px; color: white; text-align: center; display: inline-block; border-radius: 50%; background-color: ${block.user['icon:bgColor']};">${block.user['icon:text']}</div>`);done();});@@ -303,19 +306,30 @@ describe('helpers', () => {const now = Date.now();const iso = new Date().toISOString();let post = { pid: 2, toPid: 1, timestamp: now, timestampISO: iso, parent: { displayname: 'baris' } };- let str = helpers.generateWroteReplied(post, 1);- assert.strictEqual(str, `[[topic:replied-to-user-ago, 1, ${nconf.get('relative_path')}/post/1, baris, ${nconf.get('relative_path')}/post/2, ${iso}]]`);+ const txContext = {+ _i18n: {+ topic: {+ 'wrote-ago': 'wrote <a href="%1" class="timeago text-muted" title="%2"></a>',+ 'wrote-on': 'wrote on <a href="%1" class="timeago text-muted" title="%2"></a>',+ 'replied-to-user-ago': 'replied to <a component="post/parent" data-topid="%1" href="%2">%3</a> <a href="%4" class="timeago text-muted" title="%5"></a>',+ 'replied-to-user-on': 'replied to <a component="post/parent" data-topid="%1" href="%2">%3</a> on <a href="%4" class="timeago text-muted" title="%5"></a>',+ },+ },+ };+ const relative_path = nconf.get('relative_path');+ let str = helpers.generateWroteReplied.call(txContext, post, 1);+ assert.strictEqual(str, `replied to <a component="post/parent" data-topid="1" href="${relative_path}/post/1">baris</a> <a href="${relative_path}/post/2" class="timeago text-muted" title="${iso}"></a>`);post = { pid: 2, toPid: 1, timestamp: now, timestampISO: iso, parent: { displayname: 'baris' } };- str = helpers.generateWroteReplied(post, -1);- assert.strictEqual(str, `[[topic:replied-to-user-on, 1, ${nconf.get('relative_path')}/post/1, baris, ${nconf.get('relative_path')}/post/2, ${iso}]]`);+ str = helpers.generateWroteReplied.call(txContext, post, -1);+ assert.strictEqual(str, `replied to <a component="post/parent" data-topid="1" href="${relative_path}/post/1">baris</a> on <a href="${relative_path}/post/2" class="timeago text-muted" title="${iso}"></a>`);post = { pid: 2, timestamp: now, timestampISO: iso, parent: { displayname: 'baris' } };- str = helpers.generateWroteReplied(post, 1);- assert.strictEqual(str, `[[topic:wrote-ago, ${nconf.get('relative_path')}/post/2, ${iso}]]`);+ str = helpers.generateWroteReplied.call(txContext, post, 1);+ assert.strictEqual(str, `wrote <a href="${relative_path}/post/2" class="timeago text-muted" title="${iso}"></a>`);- str = helpers.generateWroteReplied(post, -1);- assert.strictEqual(str, `[[topic:wrote-on, ${nconf.get('relative_path')}/post/2, ${iso}]]`);+ str = helpers.generateWroteReplied.call(txContext, post, -1);+ assert.strictEqual(str, `wrote on <a href="${relative_path}/post/2" class="timeago text-muted" title="${iso}"></a>`);done();});diff --git a/test/topics.js b/test/topics.jsindex 2e67c48bf0..65421b7c37 100644--- a/test/topics.js+++ b/test/topics.js@@ -588,22 +588,6 @@ describe('Topic\'s', () => {});});- describe('Title escaping', () => {- it('should properly escape topic title', (done) => {- const title = '"<script>alert(\'ok1\');</script> new topic test';- const titleEscaped = validator.escape(title);- topics.post({ uid: topic.userId, title: title, content: topic.content, cid: topic.categoryId }, (err, result) => {- assert.ifError(err);- topics.getTopicData(result.topicData.tid, (err, topicData) => {- assert.ifError(err);- assert.strictEqual(topicData.titleRaw, title);- assert.strictEqual(topicData.title, titleEscaped);- done();- });- });- });- });-describe('tools/delete/restore/purge', () => {let newTopic;let followerUid;@@ -1174,6 +1158,25 @@ describe('Topic\'s', () => {pageCount: 1,});});++ it('should not translate the title of a topic in meta tags even if it is a translation key', async () => {+ const { topicData } = await topics.post({+ uid: topic.userId,+ title: '[[topic:deleted]]',+ content: 'topic content',+ cid: topic.categoryId,+ });++ const { response, body } = await request.get(`${nconf.get('url')}/api/topic/${topicData.slug}`);+ assert.equal(response.statusCode, 200);+ assert.strictEqual(body._header.tags.meta.find(t => t.name === 'title').content, '[[topic:deleted]]');+ assert.strictEqual(body._header.tags.meta.find(t => t.property === 'og:title').content, '[[topic:deleted]]');++ const { body: body2 } = await request.get(`${nconf.get('url')}/topic/${topicData.slug}`);+ const debug = body2.slice(0, 1000);+ assert(body2.includes('<meta property="og:title" content="[[topic:deleted]]" />'), debug);+ assert(body2.includes('<meta name="title" content="[[topic:deleted]]" />'), debug);+ });});@@ -1504,11 +1507,11 @@ describe('Topic\'s', () => {assert.equal(data.matchCount, 5);assert.equal(data.pageCount, 1);const tagData = [- { value: 'nodebb', valueEscaped: 'nodebb', valueEncoded: 'nodebb', score: 3, class: 'nodebb' },- { value: 'node & c++', valueEscaped: 'node & c++', valueEncoded: 'node%20%26%20c%2B%2B', score: 1, class: 'node-&-c++' },- { value: 'node icon', valueEscaped: 'node icon', valueEncoded: 'node%20icon', score: 1, class: 'node-icon' },- { value: 'nodejs', valueEscaped: 'nodejs', valueEncoded: 'nodejs', score: 1, class: 'nodejs' },- { value: 'nosql', valueEscaped: 'nosql', valueEncoded: 'nosql', score: 1, class: 'nosql' },+ { value: 'nodebb', valueEncoded: 'nodebb', score: 3, class: 'nodebb' },+ { value: 'node & c++', valueEncoded: 'node%20%26%20c%2B%2B', score: 1, class: 'node-&-c++' },+ { value: 'node icon', valueEncoded: 'node%20icon', score: 1, class: 'node-icon' },+ { value: 'nodejs', valueEncoded: 'nodejs', score: 1, class: 'nodejs' },+ { value: 'nosql', valueEncoded: 'nosql', score: 1, class: 'nosql' },];assert.deepEqual(data.tags, tagData);@@ -1761,17 +1764,17 @@ describe('Topic\'s', () => {await topics.post({ uid: adminUid, tags: ['cattag1'], title: title, content: 'topic 1 content', cid: cid });let result = await topics.getCategoryTagsData(cid, 0, -1);assert.deepStrictEqual(result, [- { value: 'cattag1', score: 3, valueEscaped: 'cattag1', valueEncoded: 'cattag1', class: 'cattag1' },- { value: 'cattag2', score: 2, valueEscaped: 'cattag2', valueEncoded: 'cattag2', class: 'cattag2' },- { value: 'cattag3', score: 1, valueEscaped: 'cattag3', valueEncoded: 'cattag3', class: 'cattag3' },+ { value: 'cattag1', score: 3, valueEncoded: 'cattag1', class: 'cattag1' },+ { value: 'cattag2', score: 2, valueEncoded: 'cattag2', class: 'cattag2' },+ { value: 'cattag3', score: 1, valueEncoded: 'cattag3', class: 'cattag3' },]);// after purging values should update properlyawait topics.purge(postResult.topicData.tid, adminUid);result = await topics.getCategoryTagsData(cid, 0, -1);assert.deepStrictEqual(result, [- { value: 'cattag1', score: 2, valueEscaped: 'cattag1', valueEncoded: 'cattag1', class: 'cattag1' },- { value: 'cattag2', score: 1, valueEscaped: 'cattag2', valueEncoded: 'cattag2', class: 'cattag2' },+ { value: 'cattag1', score: 2, valueEncoded: 'cattag1', class: 'cattag1' },+ { value: 'cattag2', score: 1, valueEncoded: 'cattag2', class: 'cattag2' },]);});@@ -1790,11 +1793,11 @@ describe('Topic\'s', () => {let result1 = await topics.getCategoryTagsData(cid1, 0, -1);let result2 = await topics.getCategoryTagsData(cid2, 0, -1);assert.deepStrictEqual(result1, [- { value: 'movedtag1', score: 2, valueEscaped: 'movedtag1', valueEncoded: 'movedtag1', class: 'movedtag1' },- { value: 'movedtag2', score: 1, valueEscaped: 'movedtag2', valueEncoded: 'movedtag2', class: 'movedtag2' },+ { value: 'movedtag1', score: 2, valueEncoded: 'movedtag1', class: 'movedtag1' },+ { value: 'movedtag2', score: 1, valueEncoded: 'movedtag2', class: 'movedtag2' },]);assert.deepStrictEqual(result2, [- { value: 'movedtag2', score: 1, valueEscaped: 'movedtag2', valueEncoded: 'movedtag2', class: 'movedtag2' },+ { value: 'movedtag2', score: 1, valueEncoded: 'movedtag2', class: 'movedtag2' },]);// after moving values should update properly@@ -1803,11 +1806,11 @@ describe('Topic\'s', () => {result1 = await topics.getCategoryTagsData(cid1, 0, -1);result2 = await topics.getCategoryTagsData(cid2, 0, -1);assert.deepStrictEqual(result1, [- { value: 'movedtag1', score: 1, valueEscaped: 'movedtag1', valueEncoded: 'movedtag1', class: 'movedtag1' },+ { value: 'movedtag1', score: 1, valueEncoded: 'movedtag1', class: 'movedtag1' },]);assert.deepStrictEqual(result2, [- { value: 'movedtag2', score: 2, valueEscaped: 'movedtag2', valueEncoded: 'movedtag2', class: 'movedtag2' },- { value: 'movedtag1', score: 1, valueEscaped: 'movedtag1', valueEncoded: 'movedtag1', class: 'movedtag1' },+ { value: 'movedtag2', score: 2, valueEncoded: 'movedtag2', class: 'movedtag2' },+ { value: 'movedtag1', score: 1, valueEncoded: 'movedtag1', class: 'movedtag1' },]);});diff --git a/test/topics/events.js b/test/topics/events.jsindex 8a35400587..5fb12e7a24 100644--- a/test/topics/events.js+++ b/test/topics/events.js@@ -1,9 +1,11 @@'use strict';const assert = require('assert');+const nconf = require('nconf');const db = require('../mocks/databasemock');+const meta = require('../../src/meta');const plugins = require('../../src/plugins');const categories = require('../../src/categories');const topics = require('../../src/topics');@@ -102,4 +104,31 @@ describe('Topic Events', () => {assert(exists.every(exists => !exists));});});++ it('should properly escape topic events with HTML and tx tokens in their arguments', async () => {+ const oldVlaueShowFullnameAsDisplayName = meta.config.showFullnameAsDisplayName;+ meta.config.showFullnameAsDisplayName = 1;+ const { topicData } = await topics.post({+ title: 'topic events testing',+ content: 'foobar one two three',+ uid: fooUid,+ cid: 1,+ });+ const uid = await user.create({ username: 'bar', fullname: '"><script>alert("xss")</script> [[global:posts]]' });+ await user.setSetting(uid, 'showfullname', 1);++ const now = Date.now();+ await topics.events.log(topicData.tid, {+ uid: uid,+ type: 'fork',+ href: `/topic/${topicData.tid}`,+ timestamp: now,+ });++ const events = await topics.events.get(topicData.tid, uid);++ assert.deepStrictEqual(events[0].text, `<span title=""><script>alert("xss")</script> [[global:posts]]" data-uid="${uid}" class="avatar avatar-rounded" component="avatar/icon" style="--avatar-size: 16px; background-color: #827717">B</span> <a href="${nconf.get('relative_path')}/user/bar">"><script>alert("xss")</script> [[global:posts]]</a> <a href="${nconf.get('relative_path')}/topic/${topicData.tid}">forked</a> this topic <span class="timeago timeline-text" title="${new Date(now).toISOString()}"></span>`);++ meta.config.showFullnameAsDisplayName = oldVlaueShowFullnameAsDisplayName;+ });});diff --git a/test/translator.js b/test/translator.jsindex f26787900a..4e31ff8aeb 100644--- a/test/translator.js+++ b/test/translator.js@@ -10,26 +10,25 @@ const shim = require('../src/translator');const { Translator } = shim;const db = require('./mocks/databasemock');const helpers = require('../src/helpers');+const languages = require('../src/languages');describe('Translator shim', () => {describe('tx helper', () => {- const context = {- _i18n: {- topic: {- 'moved-from': 'Moved from %1',- 'merged-message': 'This topic has been merged into <a href="%1/topic/%2">%3</a>',- 'argument-test': 'Test arguments like %1 and %2, in them: %3',- 'no-arguments': 'no arguments here',- },- },- };++ const context = { };++ before(async () => {+ context._i18n = await languages.getFull('en-GB');+ context._i18n.topic['argument-test'] = 'Test arguments like %1 and %2, in them: %3';+ context._i18n.topic['no-arguments'] = 'no arguments here';+ });shim.addTranslation('en-GB', 'topic', {'argument-test': 'Test arguments like %1 and %2, in them: %3',});- it('should return translated string with interpolation when has _i18n', (done) => {+ it('should return translated string with interpolation', (done) => {const str = helpers.tx.call(context, 'topic:moved-from', 'general discussion');assert.strictEqual(str, 'Moved from general discussion');done();@@ -47,7 +46,7 @@ describe('Translator shim', () => {done();});- it('should work with handle % and , in arguments syntax', async () => {+ it('should work with % and , in arguments syntax', async () => {const compiled = shim.compile('topic:argument-test', 'ar%1g1', 'arg,2', 'arg3');const shimStr = await shim.translate(compiled);const str = helpers.tx.call(context, '[[topic:argument-test, ar%1g1, arg,2, arg3]]');@@ -56,14 +55,26 @@ describe('Translator shim', () => {assert.strictEqual(str, shimStr);});- it('should escape html escape arguments', (done) => {+ it('should html escape the token if it is not found in _i18n', (done) => {+ const str = helpers.tx.call(context, '<script>alert("xss")</script>');+ assert.strictEqual(str, '<script>alert("xss")</script>');+ done();+ });++ it('should html escape arguments', (done) => {const str = helpers.tx.call(context, 'topic:moved-from', '<script>alert("xss")</script>');assert.strictEqual(str, 'Moved from <script>alert("xss")</script>');done();});+ it('should escape html and tx, if everything is passed as first string and its not a valid token', (done) => {+ const str = helpers.tx.call(context, '[[<script>alert("xss")</script>, <script>alert("xss")</script>]]');+ assert.strictEqual(str, '[[<script>alert("xss")</script>, <script>alert("xss")</script>]]');+ done();+ });+it('should validate href arguments', (done) => {- const str = helpers.tx.call(context, 'topic:merged-message', 'javascript:alert(origin)', 'foo', 'baz');+ const str = helpers.tx.call(context, 'topic:merged-message', 'javascript:alert(origin)', 'baz');assert.strictEqual(str, 'This topic has been merged into <a href="">baz</a>');done();});@@ -80,9 +91,14 @@ describe('Translator shim', () => {done();});- it('should escape html escape arguments but keep it if it\'s coming from tx file', (done) => {- const str = helpers.tx.call(context, 'topic:merged-message', '/forum', '<script>alert("xss")</script>', 'topic name');- assert.strictEqual(str, 'This topic has been merged into <a href="/forum/topic/<script>alert("xss")</script>">topic name</a>');+ it('should translate nested keys with arguments', async () => {+ const translated = helpers.tx.call(context, '[[notifications:new-message-in, [[modules:chat.room-id, 8]]]]');+ assert.strictEqual(translated, 'New message in <strong>Room 8</strong>');+ });++ it('should html escape arguments but keep it if it\'s coming from tx file', (done) => {+ const str = helpers.tx.call(context, 'topic:merged-message', '/forum/<script>alert("xss")</script>', 'topic name');+ assert.strictEqual(str, 'This topic has been merged into <a href="/forum/<script>alert("xss")</script>">topic name</a>');done();});@@ -106,6 +122,26 @@ describe('Translator shim', () => {});});+ describe('.normalizeToken', () => {+ it('should normalize a token into its key and arguments', (done) => {+ assert.deepStrictEqual(+ shim.normalizeToken('[[notifications:new-message-in, [[modules:chat.room-id, 8]]]]'),+ ['notifications:new-message-in', ['[[modules:chat.room-id, 8]]']]+ );++ assert.deepStrictEqual(+ shim.normalizeToken('[[notifications:new-message-in, arg1, arg]]'),+ ['notifications:new-message-in', ['arg1', 'arg']]+ );++ assert.deepStrictEqual(+ shim.normalizeToken('[[notifications:new-message-in, [[modules:chat.room-id, 8]], arg]]'),+ ['notifications:new-message-in', ['[[modules:chat.room-id, 8]]', 'arg']]+ );+ done();+ });+ });+describe('.translate()', () => {it('should translate correctly', (done) => {@@ -136,7 +172,11 @@ describe('Translator shim', () => {it('should not allow path traversal', async () => {const t = await shim.translate('[[../../../../config:secret]]');- assert.strictEqual(t, 'secret');+ assert.strictEqual(t, '[[../../../../config:secret]]');+ await assert.rejects(+ languages.get('en-GB', '../../../../config'),+ { message: '[[error:invalid-path]]' }+ );});});@@ -147,22 +187,27 @@ describe('Translator shim', () => {it('should translate a single key with no arguments', async () => {const translated = await shim.translateKey('global:search', [], 'en-GB');- assert.deepStrictEqual(translated, 'Search');+ assert.strictEqual(translated, 'Search');});it('should translate a single key with arguments', async () => {const translated = await shim.translateKey('topic:moved-from', ['general discussion']);- assert.deepStrictEqual(translated, 'Moved from general discussion');+ assert.strictEqual(translated, 'Moved from general discussion');});it('should translate a single key with brackets arguments', async () => {const translated = await shim.translateKey('[[topic:moved-from]]', ['general discussion']);- assert.deepStrictEqual(translated, 'Moved from general discussion');+ assert.strictEqual(translated, 'Moved from general discussion');});it('should translate nested keys', async () => {const translated = await shim.translateKey('[[topic:moved-from, [[topic:merged-message]]]]');- assert.deepStrictEqual(translated, 'Moved from This topic has been merged into <a href="">%2</a>');+ assert.strictEqual(translated, 'Moved from This topic has been merged into <a href="">%2</a>');+ });++ it('should translate nested keys with arguments', async () => {+ const translated = await shim.translateKey('[[notifications:new-message-in, [[modules:chat.room-id, 8]]]]');+ assert.strictEqual(translated, 'New message in <strong>Room 8</strong>');});it('should translate arguments if they are tokens themselves', async () => {@@ -171,19 +216,19 @@ describe('Translator shim', () => {});it('should return string untouched if it\'s not a tx string', async () => {- assert.deepStrictEqual(+ assert.strictEqual(await shim.translateKey('nodebb forum', [], 'en-GB'),'nodebb forum',);- assert.deepStrictEqual(+ assert.strictEqual(await shim.translateKey('this is a [[foo:baz]] regular string %1 test', [], 'en-GB'),'this is a [[foo:baz]] regular string %1 test',);- assert.deepStrictEqual(- await shim.translateKey('[[this is a [[foo:baz, "foo"]], regular string %1 test]]', [], 'en-GB'),- '[[this is a [[foo:baz, "foo"]], regular string %1 test]]'+ assert.strictEqual(+ await shim.translateKey('[[this is a [[foo:baz, "foo"]] regular string %1 test]]', [], 'en-GB'),+ '[[this is a [[foo:baz, "foo"]] regular string %1 test]]');});@@ -499,22 +544,28 @@ describe('new Translator(language)', () => {it('should use key for unknown keys without arguments', () => {const translator = Translator.create('en-GB');return translator.translate('[[unknown:key.without.args]]').then((translated) => {- assert.strictEqual(translated, 'key.without.args');+ assert.strictEqual(translated, '[[unknown:key.without.args]]');});});it('should use backup for unknown keys with arguments', () => {const translator = Translator.create('en-GB');return translator.translate('[[unknown:key.with.args, arguments are here, derpity, derp]]').then((translated) => {- assert.strictEqual(translated, 'unknown:key.with.args, arguments are here, derpity, derp');+ assert.strictEqual(translated, '[[unknown:key.with.args, arguments are here, derpity, derp]]');});});- it('should ignore unclosed tokens', () => {+ it('should ignore unclosed tokens', async () => {const translator = Translator.create('en-GB');- return translator.translate('here is some stuff and other things [[abc:xyz, other random stuff should be fine here [[global:home]] and more things [[pages:users/latest]]').then((translated) => {- assert.strictEqual(translated, 'here is some stuff and other things abc:xyz, other random stuff should be fine here Home and more things Latest Users');- });+ assert.strictEqual(+ await translator.translate('here is some stuff and other things [[abc:xyz, other random stuff should be fine here [[global:home]] and more things [[pages:users/latest]]'),+ 'here is some stuff and other things [[abc:xyz, other random stuff should be fine here Home and more things Latest Users'+ );++ assert.strictEqual(+ await translator.translate('mine]] [[topic:merged-message, foo, best'),+ 'mine]] [[topic:merged-message, foo, best'+ );});});});diff --git a/test/uploads.js b/test/uploads.jsindex f8d080a4c9..788d6cc506 100644--- a/test/uploads.js+++ b/test/uploads.js@@ -429,9 +429,15 @@ describe('Upload Controllers', () => {});it('should fail to upload invalid file type', async () => {- const { response, body } = await helpers.uploadFile(`${nconf.get('url')}/api/admin/category/uploadpicture`, path.join(__dirname, '../test/files/503.html'), { params: JSON.stringify({ cid: cid }) }, jar, csrf_token);+ const { response, body } = await helpers.uploadFile(+ `${nconf.get('url')}/api/admin/category/uploadpicture`,+ path.join(__dirname, '../test/files/503.html'),+ { params: JSON.stringify({ cid: cid }) },+ jar,+ csrf_token+ );assert.strictEqual(response.statusCode, 500);- assert.equal(body.error, '[[error:invalid-image-type, image/png&#44; image/jpeg&#44; image/pjpeg&#44; image/jpg&#44; image/gif&#44; image/svg+xml]]');+ assert.equal(body.error, '[[error:invalid-image-type, image/png, image/jpeg, image/pjpeg, image/jpg, image/gif, image/svg+xml]]');});it('should fail to upload category image with invalid json params', async () => {diff --git a/test/user.js b/test/user.jsindex 0f25c68163..e8e825ee68 100644--- a/test/user.js+++ b/test/user.js@@ -791,7 +791,7 @@ describe('User', () => {...data, password: '123456', invalid: 'field',});const storedUsername = await db.getObjectField(`user:${uid}`, 'username');- assert.equal(result.username, 'ex'ample_user');+ assert.equal(result.username, 'ex\'ample_user');assert.equal(storedUsername, 'ex\'ample_user');assert.equal(result.userslug, 'ex-ample_user');});@@ -1743,8 +1743,11 @@ describe('User', () => {});it('should properly escape homePageRoute', async () => {+ const username = utils.generateUUID().slice(0, 6);+ const uid = await User.create({ username, password: '123456' });+ const { jar } = await helpers.loginUser(username, '123456');const data = {- uid: testUid,+ uid: uid,settings: {bootswatchSkin: 'default',homePageRoute: 'category/6/testing-ground',@@ -1762,15 +1765,20 @@ describe('User', () => {followTopicsOnReply: 1,},};- await apiUser.updateSettings({ uid: testUid }, data);- const userSettings = await User.getSettings(testUid);+ await apiUser.updateSettings({ uid }, data);+ const userSettings = await User.getSettings(uid);assert.strictEqual(userSettings.homePageRoute, 'category/6/testing-ground');data.settings.homePageRoute = '<script>alert(1);</script>';- await apiUser.updateSettings({ uid: testUid }, data);- const updatedSettings = await User.getSettings(testUid);- assert.strictEqual(updatedSettings.homePageRoute, '<script>alert(1);</script>');+ await apiUser.updateSettings({ uid }, data);+ const updatedSettings = await User.getSettings(uid);+ // not escaped in api+ assert.strictEqual(updatedSettings.homePageRoute, '<script>alert(1);</script>');++ // escaped in html+ const { body } = await request.get(`${nconf.get('url')}/user/${username}/settings`, { jar });+ assert(body.includes('value="<script>alert(1);</script>"'));});@@ -1913,7 +1921,12 @@ describe('User', () => {const { jar } = await helpers.loginUser('admin', '123456');const { body: { users } } = await request.get(`${nconf.get('url')}/api/admin/manage/registration`, { jar });assert.equal(users[0].username, 'rejectme');- assert.equal(users[0].email, '<script>alert("ok")<script>[email protected]');+ // not escaped in api+ assert.equal(users[0].email, '<script>alert("ok")<script>[email protected]');++ // escaped in html+ const { body } = await request.get(`${nconf.get('url')}/admin/manage/registration`, { jar });+ assert(body.includes('<script>alert("ok")<script>[email protected]'));});it('should fail to add user to queue if username is taken', async () => {@@ -2130,7 +2143,12 @@ describe('User', () => {it('should escape email', async () => {await helpers.invite({ emails: '<script>alert("ok");</script>', groupsToJoin: [] }, adminUid, jar, csrf_token);const data = await User.getInvites(adminUid);- assert.strictEqual(data[0], '<script>alert("ok");</script>');+ // not escaped in api+ assert.strictEqual(data[0], '<script>alert("ok");</script>');++ // escaped in html+ const { body } = await request.get(`${nconf.get('url')}/admin/manage/registration`, { jar });+ assert(body.includes('<script>alert("ok");</script>'));await User.deleteInvitationKey('<script>alert("ok");</script>');});diff --git a/test/utils.js b/test/utils.jsindex 64c7342ab0..36e17705ca 100644--- a/test/utils.js+++ b/test/utils.js@@ -618,14 +618,6 @@ describe('Utility Methods', () => {const { Translator } = shim;- it('should translate in place', async () => {- const translator = Translator.create('en-GB');- const el = $(`<div><span id="search" title="[[global:search]]"></span><span id="text">[[global:home]]</span></div>`);- await translator.translateInPlace(el.get(0));- assert.strictEqual(el.find('#text').text(), 'Home');- assert.strictEqual(el.find('#search').attr('title'), 'Search');- });-it('should not error', (done) => {shim.flush();shim.flushNamespace();