nodebb-theme-persona 15.0.0-beta.2 → 15.0.0

package/lib/controllers.js

@@ -1,7 +1,7 @@
 'use strict';
 
-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');
 
 const Controllers = module.exports;
 

package/library.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const meta = require.main.require('./src/meta');
+const meta = nodebb.require('./src/meta');
 
 const controllers = require('./lib/controllers');
 
@@ -8,7 +8,7 @@ const library = module.exports;
 
 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/persona', [], controllers.renderAdminPage);
 
 	routeHelpers.setupPageRoute(router, '/user/:userslug/theme', [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "15.0.0-beta.2",
+  "version": "15.0.0",
   "nbbpm": {
     "compatibility": "^4.14.0"
   },
@@ -45,8 +45,7 @@
     "pulling": "^2.0.0"
   },
   "devDependencies": {
-    "eslint": "9.25.1",
-    "eslint-config-nodebb": "^1.1.4",
-    "eslint-plugin-import": "^2.31.0"
+    "eslint": "10.5.0",
+    "eslint-config-nodebb": "^2.0.3"
   }
 }

package/public/admin.js

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

package/public/persona.js

@@ -23,7 +23,7 @@ $(document).ready(function () {
 		document.documentElement.style.setProperty('--panel-offset', `${offset}px`);
 	}
 
-	var lastBSEnv = '';
+	let lastBSEnv = '';
 	function configureNavbarHiding() {
 		if (!$.fn.autoHidingNavbar) {
 			return;
@@ -37,13 +37,13 @@ $(document).ready(function () {
 			} catch (e) {
 				console.warn('[persona/settings] Unable to parse value for navbar autohiding');
 			}
-			var env = utils.findBootstrapEnvironment();
+			const env = utils.findBootstrapEnvironment();
 			// if env didn't change don't destroy and recreate
 			if (env === lastBSEnv) {
 				return;
 			}
 			lastBSEnv = env;
-			var navbarEl = $('[component="navbar"]');
+			const navbarEl = $('[component="navbar"]');
 			navbarEl.autoHidingNavbar('destroy').removeData('plugin_autoHidingNavbar');
 			navbarEl.css('top', '');
 
@@ -69,7 +69,7 @@ $(document).ready(function () {
 					if (ajaxify.data.template.topic) {
 						$('.topic .topic-header').css({ top: topValue });
 					} else {
-						var topicListHeader = $('.topic-list-header');
+						const topicListHeader = $('.topic-list-header');
 						if (topicListHeader.length) {
 							topicListHeader.css({ top: topValue });
 						}
@@ -119,24 +119,22 @@ $(document).ready(function () {
 	function setupEditedByIcon() {
 		function activateEditedTooltips() {
 			$('[data-pid] [component="post/editor"]').each(function () {
-				var el = $(this);
-				var icon;
-
+				const el = $(this);
 				if (!el.attr('data-editor')) {
 					return;
 				}
 
-				icon = el.closest('[data-pid]').find('.edit-icon').first();
+				const icon = el.closest('[data-pid]').find('.edit-icon').first();
 				icon.prop('title', el.text()).tooltip().removeClass('hidden');
 			});
 		}
 
 		$(window).on('action:posts.edited', function (ev, data) {
-			var parent = $('[data-pid="' + data.post.pid + '"]');
-			var icon = parent.find('.edit-icon').filter(function (index, el) {
+			const parent = $('[data-pid="' + data.post.pid + '"]');
+			const icon = parent.find('.edit-icon').filter(function (index, el) {
 				return parseInt($(el).closest('[data-pid]').attr('data-pid'), 10) === parseInt(data.post.pid, 10);
 			});
-			var el = parent.find('[component="post/editor"]').first();
+			const el = parent.find('[component="post/editor"]').first();
 			icon.prop('title', el.text()).tooltip().removeClass('hidden');
 		});
 
@@ -157,15 +155,15 @@ $(document).ready(function () {
 		});
 
 		$(window).on('action:posts.loading', function (ev, data) {
-			for (var i = 0, ii = data.posts.length; i < ii; i++) {
+			for (let i = 0, ii = data.posts.length; i < ii; i++) {
 				(ajaxify.data.topics || ajaxify.data.posts)[data.posts[i].index] = data.posts[i];
 			}
 		});
 	}
 
 	function generateUserCard(ev) {
-		var avatar = $(this);
-		var uid = avatar.parents('[data-uid]').attr('data-uid');
+		const avatar = $(this);
+		const uid = avatar.parents('[data-uid]').attr('data-uid');
 		const topicOrPost = (ajaxify.data.topics || ajaxify.data.posts || []).find(d => String(d.uid) === String(uid));
 		if (!topicOrPost) return;
 		const user = topicOrPost.user;
@@ -182,7 +180,7 @@ $(document).ready(function () {
 			}
 
 			app.parseAndTranslate('modules/usercard', user, function (html) {
-				var card = $(html);
+				const card = $(html);
 				avatar.parents('a').after(card.hide());
 
 				if (String(app.user.uid) === String(user.uid) || !app.user.uid) {
@@ -229,8 +227,8 @@ $(document).ready(function () {
 	function setupFavouriteMorph(parent, uid, username) {
 		require(['api', 'alerts'], function (api, alerts) {
 			parent.find('.btn-morph').click(function (ev) {
-				var type = $(this).hasClass('plus') ? 'follow' : 'unfollow';
-				var method = $(this).hasClass('plus') ? 'put' : 'del';
+				const type = $(this).hasClass('plus') ? 'follow' : 'unfollow';
+				const method = $(this).hasClass('plus') ? 'put' : 'del';
 
 				api[method]('/users/' + uid + '/follow').then(() => {
 					alerts.success('[[global:alert.' + type + ', ' + username + ']]');
@@ -243,9 +241,9 @@ $(document).ready(function () {
 					$(this).prepend('<b class="drop"></b>');
 				}
 
-				var drop = $(this).find('b.drop').removeClass('animate');
-				var x = ev.pageX - (drop.width() / 2) - $(this).offset().left;
-				var y = ev.pageY - (drop.height() / 2) - $(this).offset().top;
+				const drop = $(this).find('b.drop').removeClass('animate');
+				const x = ev.pageX - (drop.width() / 2) - $(this).offset().left;
+				const y = ev.pageY - (drop.height() / 2) - $(this).offset().top;
 
 				drop.css({ top: y + 'px', left: x + 'px' }).addClass('animate');
 			});

package/templates/account/info.tpl

@@ -151,7 +151,7 @@
 							{{{ end }}}
 						</div>
 						<p class="mb-1">
-							<span class="reason">[[user:info.banned-reason-label]]: <strong>{./reason}</strong></span>
+							<span class="reason">[[user:info.banned-reason-label]]: <strong>{tx(./reason)}</strong></span>
 						</p>
 						<p>
 							{{{ if ./until }}}
@@ -205,7 +205,7 @@
 							{{{ end }}}
 						</div>
 						<p class="mb-1">
-							<span class="reason">[[user:info.banned-reason-label]]: <strong>{./reason}</strong></span>
+							<span class="reason">[[user:info.banned-reason-label]]: <strong>{tx(./reason)}</strong></span>
 						</p>
 						<p>
 							{{{ if ./until }}}

package/templates/account/posts.tpl

@@ -21,7 +21,7 @@
 </div>
 
 <!-- IF !posts.length -->
-	<div class="alert alert-warning text-center">{noItemsFoundKey}</div>
+	<div class="alert alert-warning text-center">{tx(noItemsFoundKey)}</div>
 <!-- ENDIF !posts.length -->
 
 <div class="col-12">

package/templates/account/topics.tpl

@@ -32,7 +32,7 @@
 
 
 {{{ if !topics.length }}}
-<div class="alert alert-warning text-center">{noItemsFoundKey}</div>
+<div class="alert alert-warning text-center">{tx(noItemsFoundKey)}</div>
 {{{ end }}}
 
 <div class="category">

package/templates/partials/categories/lastpost.tpl

@@ -8,7 +8,7 @@
 		</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 ./index }}}/{./index}{{{ end }}}" aria-label="[[global:lastpost]]"></a>
-			{{./content}}
+			{{txEscape(./content)}}
 		</div>
 	</div>
 	{{{ end }}}

package/templates/partials/category/tags.tpl

@@ -1,3 +1,3 @@
 {{{ each tags }}}
-<a href="{config.relative_path}/tags/{./valueEncoded}"><span class="tag tag-item fw-bold tag-class-{./class}" data-tag="{./value}">{./valueEscaped}</span></a>
+<a href="{config.relative_path}/tags/{./valueEncoded}"><span class="tag tag-item fw-bold tag-class-{./class}" data-tag="{./value}">{./value}</span></a>
 {{{ end }}}

package/templates/partials/posts_list_item.tpl

@@ -5,7 +5,7 @@
         </a>
 
         <div component="post/content" class="content mb-3">
-            {{../content}}
+            {{txEscape(../content)}}
         </div>
 
         <div class="mb-3">
@@ -15,7 +15,7 @@
             {{{ if ../topic.tags.length }}}
             <span class="tag-list">
                 {{{ each ../topic.tags }}}
-                <a href="{config.relative_path}/tags/{topic.tags.valueEncoded}"><span class="tag tag-item tag-class-{topic.tags.class}">{topic.tags.valueEscaped}</span></a>
+                <a href="{config.relative_path}/tags/{topic.tags.valueEncoded}"><span class="tag tag-item tag-class-{topic.tags.class}">{topic.tags.value}</span></a>
                 {{{ end }}}
             </span>
             {{{ end }}}

package/templates/partials/search-filters.tpl

@@ -3,7 +3,7 @@
 	<div class="post-search-item">
 		<div component="category/filter" class="dropdown" data-filter-name="category">
 			<a component="category/filter/button" class="filter-btn btn btn-light btn-sm border {{{ if filters.categories.active }}}active-filter{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-haspopup="true" aria-expanded="false">
-				<span class="filter-label">{{{ if filters.categories.active }}}{filters.categories.label}{{{ else }}}[[search:categories]]{{{ end }}}</span>
+				<span class="filter-label">{{{ if filters.categories.active }}}{tx(filters.categories.label)}{{{ else }}}[[search:categories]]{{{ end }}}</span>
 				<span class="caret text-primary opacity-75"></span>
 			</a>
 
@@ -29,7 +29,7 @@
 	<div class="post-search-item">
 		<div component="tag/filter" class="dropdown" data-filter-name="tag">
 			<a component="tag/filter/button" class="filter-btn btn btn-light btn-sm border {{{ if filters.tags.active }}}active-filter{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-haspopup="true" aria-expanded="false">
-				<span class="filter-label">{{{ if filters.tags.active }}}{filters.tags.label}{{{ else }}}[[search:tags]]{{{ end }}}</span>
+				<span class="filter-label">{{{ if filters.tags.active }}}{tx(filters.tags.label)}{{{ else }}}[[search:tags]]{{{ end }}}</span>
 				<span class="caret text-primary opacity-75"></span>
 			</a>
 
@@ -39,15 +39,15 @@
 					<div component="tag/filter/selected" class="d-flex flex-wrap gap-2">
 						{{{ each tagFilterSelected }}}
 						<div class="d-flex px-2 py-1 rounded-1 text-bg-primary gap-2 align-items-center text-sm">
-							<div>{./valueEscaped}</div>
-							<button component="tag/filter/delete" data-tag="{./valueEscaped}" class="btn btn-primary btn-sm py-0"><i class="fa fa-times fa-xs"></i></button>
+							<div>{./value}</div>
+							<button component="tag/filter/delete" data-tag="{./value}" class="btn btn-primary btn-sm py-0"><i class="fa fa-times fa-xs"></i></button>
 						</div>
 						{{{ end }}}
 					</div>
 					<hr class="my-2"/>
 					<div component="tag/filter/results" class="d-flex flex-wrap gap-2">
 						{{{ each tagFilterResults }}}
-						<button class="btn btn-light btn-sm border" data-tag="{./valueEscaped}">{./valueEscaped}</button>
+						<button class="btn btn-light btn-sm border" data-tag="{./value}">{./value}</button>
 						{{{ end }}}
 					</div>
 				</li>
@@ -59,7 +59,7 @@
 	<div class="post-search-item">
 		<div component="user/filter" class="dropdown" data-filter-name="user">
 			<a component="user/filter/button" class="filter-btn btn btn-light btn-sm border {{{ if filters.users.active }}}active-filter{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-haspopup="true" aria-expanded="false">
-				<span class="filter-label">{{{ if filters.users.active }}}{filters.users.label}{{{ else }}}[[search:posted-by]]{{{ end }}}</span>
+				<span class="filter-label">{{{ if filters.users.active }}}{tx(filters.users.label)}{{{ else }}}[[search:posted-by]]{{{ end }}}</span>
 				<span class="caret text-primary opacity-75"></span>
 			</a>
 
@@ -90,7 +90,7 @@
 	<div class="post-search-item">
 		<div class="dropdown" data-filter-name="replies">
 			<a id="reply-count-button" class="filter-btn btn btn-light btn-sm border {{{ if filters.replies.active }}}active-filter{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-				<span class="filter-label">{{{ if filters.replies.active }}}{filters.replies.label}{{{ else }}}[[search:replies]]{{{ end }}}</span>
+				<span class="filter-label">{{{ if filters.replies.active }}}{tx(filters.replies.label)}{{{ else }}}[[search:replies]]{{{ end }}}</span>
 				<span class="caret text-primary opacity-75"></span>
 			</a>
 
@@ -110,7 +110,7 @@
 	<div class="post-search-item">
 		<div class="dropdown" data-filter-name="time">
 			<a id="post-time-button" class="filter-btn btn btn-light btn-sm border {{{ if filters.time.active }}}active-filter{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-				<span class="filter-label">{{{ if filters.time.active }}}{filters.time.label}{{{ else }}}[[search:time]]{{{ end }}}</span>
+				<span class="filter-label">{{{ if filters.time.active }}}{tx(filters.time.label)}{{{ else }}}[[search:time]]{{{ end }}}</span>
 				<span class="caret text-primary opacity-75"></span>
 			</a>
 
@@ -139,7 +139,7 @@
 	<div class="post-search-item">
 		<div class="dropdown" data-filter-name="sort">
 			<a id="sort-by-button" class="filter-btn btn btn-light btn-sm border {{{ if filters.sort.active }}}active-filter{{{ end }}} dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-				<span class="filter-label">{{{ if filters.sort.active }}}{filters.sort.label}{{{ else }}}[[search:sort]]{{{ end }}}</span>
+				<span class="filter-label">{{{ if filters.sort.active }}}{tx(filters.sort.label)}{{{ else }}}[[search:sort]]{{{ end }}}</span>
 				<span class="caret text-primary opacity-75"></span>
 			</a>
 

package/templates/partials/topic/icon.tpl

@@ -0,0 +1,4 @@
+<span class="badge border {./classes}">
+	{{{ if ./icon }}}<i class="fa {./icon}"></i>{{{ end }}}
+	{{{ if ./label }}}<span> {tx(./label)}</span>{{{ end }}}
+</span>

package/templates/partials/topic/post.tpl

@@ -92,7 +92,7 @@
 			{{{ end }}}
 		</span>
 
-		<span class="replies-count small" component="post/reply-count/text" data-replies="{posts.replies.count}">{posts.replies.text}</span>
+		<span class="replies-count small" component="post/reply-count/text" data-replies="{posts.replies.count}">{tx(posts.replies.text)}</span>
 		<span class="replies-last hidden-xs small">[[topic:last-reply-time]] <span class="timeago" title="{posts.replies.timestampISO}"></span></span>
 
 		<i class="fa fa-fw fa-chevron-down" component="post/replies/open"></i>

package/templates/partials/topic/tag.tpl

@@ -1 +1 @@
-<a href="{config.relative_path}/tags/{./valueEncoded}"><span class="badge border border-gray-300 fw-normal tag tag-class-{./class}" data-tag="{./value}">{./valueEscaped}</span></a>
+<a href="{config.relative_path}/tags/{./valueEncoded}"><span class="badge border border-gray-300 fw-normal tag tag-class-{./class}" data-tag="{./value}">{./value}</span></a>

package/templates/partials/topics_list.tpl

@@ -48,7 +48,7 @@
 						<i class="fa fa-arrow-circle-right"></i>
 						<span>[[topic:moved]]</span>
 					</span>
-					{{{each ./icons}}}<span class="lh-1">{@value}</span>{{{end}}}
+					{{{ each ./icons }}}<!-- IMPORT partials/topic/icon.tpl -->{{{ end }}}
 
 					{{{ if (!template.category || (cid != ./cid)) }}}
 					{{buildCategoryLabel(./category, "a", "border")}}
@@ -56,7 +56,7 @@
 
 					<span data-tid="{./tid}" component="topic/tags" class="lh-1 tag-list d-flex flex-wrap gap-1 {{{ if !./tags.length }}}hidden{{{ end }}}">
 						{{{ each ./tags }}}
-						<a href="{config.relative_path}/tags/{./valueEncoded}"><span class="badge border border-gray-300 fw-normal tag tag-class-{./class}" data-tag="{./value}">{./valueEscaped}</span></a>
+						<a href="{config.relative_path}/tags/{./valueEncoded}"><span class="badge border border-gray-300 fw-normal tag tag-class-{./class}" data-tag="{./value}">{./value}</span></a>
 						{{{ end }}}
 					</span>
 
@@ -119,7 +119,7 @@
 					</div>
 					<div class="post-content text-xs ps-2 line-clamp-sm-2 lh-sm text-break position-relative flex-fill">
 						<a class="stretched-link" tabindex="-1" href="{config.relative_path}/topic/{./slug}/{./teaser.index}" aria-label="[[global:lastpost]]"></a>
-						{{./teaser.content}}
+						{{txEscape(./teaser.content)}}
 					</div>
 					{{{ end }}}
 					{{{ end }}}

package/templates/topic.tpl

@@ -30,7 +30,7 @@
 							<a component="topic/moved" href="{config.relative_path}/category/{oldCid}" class="badge badge border border-gray-300 text-body text-decoration-none {{{ if !oldCid }}}hidden{{{ end }}}">
 								<i class="fa fa-arrow-circle-right"></i> {{{ if privileges.isAdminOrMod }}}[[topic:moved-from, {oldCategory.name}]]{{{ else }}}[[topic:moved]]{{{ end }}}
 							</a>
-							{{{each icons}}}<span class="lh-1">{@value}</span>{{{end}}}
+							{{{ each ./icons }}}<!-- IMPORT partials/topic/icon.tpl -->{{{ end }}}
 						</span>
 						{{buildCategoryLabel(category, "a", "border")}}
 						<div data-tid="{./tid}" component="topic/tags" class="lh-1 tags tag-list d-flex flex-wrap hidden-xs hidden-empty gap-2"><!-- IMPORT partials/topic/tags.tpl --></div>