nodebb-theme-harmony 2.2.69 → 2.2.71

package/lib/controllers.js

@@ -2,8 +2,8 @@
 
 const Controllers = module.exports;
 
-const accountHelpers = require.main.require('./src/controllers/accounts/helpers');
-const helpers = require.main.require('./src/controllers/helpers');
+const accountHelpers = nodebb.require('./src/controllers/accounts/helpers');
+const helpers = nodebb.require('./src/controllers/helpers');
 
 Controllers.renderAdminPage = (req, res) => {
 	res.render('admin/plugins/harmony', {

package/library.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const nconf = require.main.require('nconf');
-const meta = require.main.require('./src/meta');
-const _ = require.main.require('lodash');
-const user = require.main.require('./src/user');
+const nconf = nodebb.require('nconf');
+const meta = nodebb.require('./src/meta');
+const _ = nodebb.require('lodash');
+const user = nodebb.require('./src/user');
 
 const controllers = require('./lib/controllers');
 
@@ -24,7 +24,7 @@ const defaults = {
 
 library.init = async function (params) {
 	const { router, middleware } = params;
-	const routeHelpers = require.main.require('./src/routes/helpers');
+	const routeHelpers = nodebb.require('./src/routes/helpers');
 
 	routeHelpers.setupAdminPageRoute(router, '/admin/plugins/harmony', [], controllers.renderAdminPage);
 
@@ -42,13 +42,13 @@ library.init = async function (params) {
 
 async function buildSkins() {
 	try {
-		const plugins = require.main.require('./src/plugins');
+		const plugins = nodebb.require('./src/plugins');
 		await plugins.prepareForBuild(['client side styles']);
 		for (const skin of meta.css.supportedSkins) {
 			// eslint-disable-next-line no-await-in-loop
 			await meta.css.buildBundle(`client-${skin}`, true);
 		}
-		require.main.require('./src/meta/minifier').killAll();
+		nodebb.require('./src/meta/minifier').killAll();
 	} catch (err) {
 		console.error(err.stack);
 	}

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "nodebb-theme-harmony",
-  "version": "2.2.69",
+  "version": "2.2.71",
   "nbbpm": {
-    "compatibility": "^4.0.0"
+    "compatibility": "^4.12.0"
   },
   "description": "Harmony theme for NodeBB",
   "main": "library.js",
@@ -45,7 +45,7 @@
     "@fontsource/poppins": "5.2.7"
   },
   "devDependencies": {
-    "eslint": "10.4.0",
-    "eslint-config-nodebb": "^2.0.0"
+    "eslint": "10.4.1",
+    "eslint-config-nodebb": "^2.0.2"
   }
 }

package/public/admin.js

@@ -1,7 +1,7 @@
 'use strict';
 
 define('admin/plugins/harmony', ['settings'], function (Settings) {
-	var ACP = {};
+	const ACP = {};
 
 	ACP.init = function () {
 		Settings.load('harmony', $('.harmony-settings'));

package/templates/category.tpl

@@ -36,7 +36,7 @@
 	{{{ end }}}
 	{{{ if ./handleFull }}}
 	<p class="text-secondary text-sm fst-italic mb-0 {{{ if config.theme.centerHeaderElements }}}text-center{{{ end }}}">
-		[[category:handle.description, {handleFull}]]
+		[[category:handle.description, {txEscape(handleFull)}]]
 		<a href="#" class="link-secondary" data-action="copy" data-clipboard-text="{handleFull}"><i class="fa fa-fw fa-copy" aria-hidden="true"></i></a>
 	</p>
 	{{{ end }}}

package/templates/partials/groups/list.tpl

@@ -1,7 +1,7 @@
 {{{ 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="[[aria:group-page-link-for, {./displayName}]]"></a>
+		<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="[[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">

package/templates/partials/search-results.tpl

@@ -1,5 +1,6 @@
 {{{ if matchCount }}}
-<div class="card card-header text-xs px-2 py-1 fw-semibold border-0 align-self-start">[[search:results-matching, {matchCount}, {search_query}, {time}]] </div>
+<div class="card card-header text-xs px-2 py-1 fw-semibold border-0 align-self-start">[[search:results-matching, {matchCount}, {txEscape(search_query)}, {time}]]
+</div>
 {{{ else }}}
 {{{ if search_query }}}
 <div class="badge text-bg-warning align-self-start">[[search:no-matches]]</div>

package/templates/partials/sidebar/drafts.tpl

@@ -35,11 +35,11 @@
 							{{{ end }}}
 
 							{{{ if (./action == "posts.reply") }}}
-							<div class="text text-xs fw-semibold line-clamp-2 text-break">[[topic:composer.replying-to, "{./title}"]]</div>
+							<div class="text text-xs fw-semibold line-clamp-2 text-break">[[topic:composer.replying-to, "{txEscape(./title)}"]]</div>
 							{{{ end }}}
 
 							{{{ if (./action == "posts.edit") }}}
-							<div class="text text-xs fw-semibold line-clamp-2">[[topic:composer.editing-in, "{./title}"]]</div>
+							<div class="text text-xs fw-semibold line-clamp-2">[[topic:composer.editing-in, "{txEscape(./title)}"]]</div>
 							{{{ end }}}
 
 							{{{ if ./text }}}