nodebb-theme-persona 15.1.8 → 15.2.0

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "15.1.8",
+  "version": "15.2.0",
   "nbbpm": {
-    "compatibility": "^4.14.0"
+    "compatibility": "^4.15.0"
   },
   "description": "Persona theme for NodeBB",
   "main": "library.js",

package/public/modules/taskbar.js

@@ -35,8 +35,8 @@ define('persona/taskbar', [
 		});
 
 		function createChatIcon(data) {
-			$.getJSON(config.relative_path + '/api/user/' + app.user.userslug + '/chats/' + data.options.roomId, function (chatObj) {
-				const el = $('#taskbar [data-uuid="' + data.uuid + '"] a');
+			$.getJSON(`${config.relative_path}/api/user/${app.user.userslug}/chats/${data.options.roomId}`, function (chatObj) {
+				const el = $(`#taskbar [data-uuid="${data.uuid}"] a`);
 				el.parent('[data-uuid]').attr('data-roomId', data.options.roomId);
 
 				if (chatObj.users.length === 2) {

package/templates/account/info.tpl

@@ -224,7 +224,7 @@
 	</div>
 
 	<div class="col-sm-6 mb-3">
-		{{{ if isAdminOrGlobalModerator }}}
+		{{{ if isAdminOrGlobalModeratorOrModerator }}}
 		<div class="card">
 			<h5 class="card-header">
 				{{tx("user:info.moderation-note")}}
@@ -236,10 +236,8 @@
 				<br/>
 				<div component="account/moderation-note/list">
 					{{{ each moderationNotes }}}
-					<hr/>
-
-					<div data-id="{./id}">
-						<div class="d-flex align-items-baseline gap-1 mb-1">
+					<div data-id="{./id}" class="border-bottom pb-3 mb-3">
+						<div class="d-flex align-items-baseline gap-2 mb-1">
 							<a href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}">{{buildAvatar(./user, "24px", true)}}</a>
 
 							<a href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}" class="fw-bold" itemprop="author" data-username="{./user.username}" data-uid="{./user.uid}">{./user.username}</a>
@@ -252,7 +250,12 @@
 							<div class="content text-secondary">
 								{./note}
 							</div>
-							<button component="account/moderation-note/edit" class="btn btn-sm btn-link align-self-end">{{tx("topic:edit")}}</button>
+							{{{ if isAdmin }}}
+							<div class="d-flex gap-1 justify-content-end">
+								<button component="account/moderation-note/delete" class="btn btn-sm btn-link text-danger align-self-end">{{tx("topic:delete")}}</button>
+								<button component="account/moderation-note/edit" class="btn btn-sm btn-link align-self-end">{{tx("topic:edit")}}</button>
+							</div>
+							{{{ end }}}
 						</div>
 
 						<div component="account/moderation-note/edit-area" class="d-flex flex-column gap-2 hidden">

package/templates/account/profile.tpl

@@ -36,7 +36,7 @@
 	{{{ end }}}
 
 	<!-- IF aboutme -->
-	<div component="aboutme" class="text-center aboutme text-secondary w-75 mx-auto text-center">{{txEscape(aboutmeParsed)}}</div>
+	<div component="aboutme" class="text-center aboutme text-secondary w-75 mx-auto text-center">{{aboutmeParsed}}</div>
 	<!-- ENDIF aboutme -->
 
 	<div class="account-stats fs-1 text-center mb-3">

package/templates/partials/categories/lastpost.tpl

@@ -3,12 +3,12 @@
 	{{{ if @first }}}
 	<div component="category/posts" class="ps-2 text-xs d-flex flex-column h-100 gap-1">
 		<div class="text-nowrap text-truncate">
-			<a class="text-decoration-none avatar-tooltip" title="{./user.displayname}" href="{config.relative_path}/user/{./user.userslug}">{{buildAvatar(posts.user, "18px", true)}}</a>
+			<a class="text-decoration-none avatar-tooltip" title="{{txDisplayname(./user)}}" href="{config.relative_path}/user/{./user.userslug}">{{buildAvatar(posts.user, "18px", true)}}</a>
 			<a class="permalink text-muted timeago text-xs" href="{config.relative_path}/topic/{./topic.slug}{{{ if ./index }}}/{./index}{{{ end }}}" title="{./timestampISO}" aria-label="{{tx("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 ./index }}}/{./index}{{{ end }}}" aria-label="{{tx("global:lastpost")}}"></a>
-			{{txEscape(./content)}}
+			{{./content}}
 		</div>
 	</div>
 	{{{ end }}}

package/templates/partials/posts_list_item.tpl

@@ -5,7 +5,7 @@
         </a>
 
         <div component="post/content" class="content mb-3 text-break">
-            {{{ if ./txContent }}}{{tx(./content)}}{{{ else }}}{{txEscape(./content)}}{{{ end }}}
+            {{{ if ./txContent }}}{{tx(./content)}}{{{ else }}}{{./content}}{{{ end }}}
         </div>
 
         <div class="mb-3">
@@ -26,7 +26,7 @@
             <a href="{config.relative_path}/user/{./user.userslug}">{{buildAvatar(./user, "28px", true, "user-img not-responsive")}}</a>
 
             <div class="post-author text-secondary text-uppercase">
-                <a class="text-reset" href="{config.relative_path}/user/{./user.userslug}">{./user.displayname}</a><br />
+                <a class="text-reset" href="{config.relative_path}/user/{./user.userslug}">{{txDisplayname(./user)}}</a><br />
                 <span class="timeago" title="{./timestampISO}"></span>
             </div>
         </div>

package/templates/partials/search/results.tpl

@@ -17,7 +17,7 @@
 
 			{{{ if showAsPosts }}}
 			<div component="post/content" class="content">
-				{{txEscape(./content)}}
+				{{./content}}
 			</div>
 			{{{ end }}}
 

package/templates/partials/topic/navigation-post.tpl

@@ -9,4 +9,4 @@
 	</small>
 </div>
 
-<div>{{{ if post.txContent }}}{{tx(posts.content)}}{{{ else }}}{{txEscape(post.content)}}{{{ end }}}</div>
+<div>{{{ if post.txContent }}}{{tx(post.content)}}{{{ else }}}{{post.content}}{{{ end }}}</div>

package/templates/partials/topic/post.tpl

@@ -26,7 +26,7 @@
 			<strong class="text-nowrap" itemprop="author" itemscope itemtype="https://schema.org/Person">
 				<meta itemprop="name" content="{./user.username}">
 				{{{ if ./user.userslug }}}<meta itemprop="url" content="{config.relative_path}/user/{./user.userslug}">{{{ end }}}
-				<a href="<!-- IF posts.user.userslug -->{config.relative_path}/user/{posts.user.userslug}<!-- ELSE -->#<!-- ENDIF posts.user.userslug -->" data-username="{posts.user.username}" data-uid="{posts.user.uid}">{posts.user.displayname}</a>
+				<a href="<!-- IF posts.user.userslug -->{config.relative_path}/user/{posts.user.userslug}<!-- ELSE -->#<!-- ENDIF posts.user.userslug -->" data-username="{posts.user.username}" data-uid="{posts.user.uid}">{{txDisplayname(posts.user)}}</a>
 			</strong>
 
 			{{{ each posts.user.selectedGroups }}}
@@ -72,12 +72,12 @@
 <br />
 
 <div class="content" component="post/content" itemprop="text">
-	{{{ if posts.txContent }}}{{tx(posts.content)}}{{{ else }}}{{txEscape(posts.content)}}{{{ end }}}
+	{{{ if posts.txContent }}}{{tx(posts.content)}}{{{ else }}}{{posts.content}}{{{ end }}}
 </div>
 
 <div class="post-footer">
 	{{{ if posts.user.signature }}}
-	<div component="post/signature" data-uid="{posts.user.uid}" class="post-signature">{{txEscape(posts.user.signature)}}</div>
+	<div component="post/signature" data-uid="{posts.user.uid}" class="post-signature">{{posts.user.signature}}</div>
 	{{{ end }}}
 
 	<div class="clearfix">

package/templates/partials/topics_list.tpl

@@ -10,7 +10,7 @@
 
 		<div class="d-flex p-0 col-12 col-lg-7 gap-2 gap-lg-3 pe-1 align-items-start {{{ if config.theme.mobileTopicTeasers }}}mb-2 mb-lg-0{{{ end }}}">
 			<div class="flex-shrink-0 position-relative">
-				<a class="d-inline-block text-decoration-none avatar-tooltip" title="{./user.displayname}" href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}">
+				<a class="d-inline-block text-decoration-none avatar-tooltip" title="{{txDisplayname(./user)}}" href="{{{ if ./user.userslug }}}{config.relative_path}/user/{./user.userslug}{{{ else }}}#{{{ end }}}">
 					{{buildAvatar(./user, "40px", true)}}
 				</a>
 				{{{ if showSelect }}}
@@ -116,12 +116,12 @@
 					{{{ else }}}
 					{{{ if ./teaser.pid }}}
 					<div class="ps-2">
-						<a href="{{{ if ./teaser.user.userslug }}}{config.relative_path}/user/{./teaser.user.userslug}{{{ else }}}#{{{ end }}}" class="text-decoration-none avatar-tooltip" title="{./teaser.user.displayname}">{{buildAvatar(./teaser.user, "18px", true)}}</a>
+						<a href="{{{ if ./teaser.user.userslug }}}{config.relative_path}/user/{./teaser.user.userslug}{{{ else }}}#{{{ end }}}" class="text-decoration-none avatar-tooltip" title="{{txDisplayname(./teaser.user)}}">{{buildAvatar(./teaser.user, "18px", true)}}</a>
 						<a class="permalink text-muted timeago text-xs" href="{config.relative_path}/topic/{./slug}/{./teaser.index}" title="{./teaser.timestampISO}" aria-label="{{tx("global:lastpost")}}"></a>
 					</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="{{tx("global:lastpost")}}"></a>
-						{{txEscape(./teaser.content)}}
+						{{./teaser.content}}
 					</div>
 					{{{ end }}}
 					{{{ end }}}