Skip to content

Node.js based forum software built for the modern web

refactor: remove unnecessary txEscapes for 4.15.0

Barış Soner Uşaklı7a8cc07733ff
diff --git a/src/socket.io/admin/digest.js b/src/socket.io/admin/digest.js
index 491b639d93..a66b45bece 100644
--- a/src/socket.io/admin/digest.js
+++ b/src/socket.io/admin/digest.js
@@ -7,7 +7,9 @@ const Digest = module.exports;
Digest.resend = async (socket, data) => {
const { uid } = data;
- const interval = data.action.startsWith('resend-') ? data.action.slice(7) : await userDigest.getUsersInterval(uid);
+ const interval = data.action.startsWith('resend-') ?
+ data.action.slice(7) :
+ await userDigest.getUsersInterval(uid);
if (!interval && meta.config.dailyDigestFreq === 'off') {
throw new Error('[[error:digest-not-enabled]]');
diff --git a/src/views/admin/manage/users/custom-reasons.tpl b/src/views/admin/manage/users/custom-reasons.tpl
index 78a298af23..aa7bafa9c9 100644
--- a/src/views/admin/manage/users/custom-reasons.tpl
+++ b/src/views/admin/manage/users/custom-reasons.tpl
@@ -34,7 +34,7 @@
</td>
<td class="text-nowrap">{./title}</td>
<td class="text-nowrap">{{{ if ./type }}}{tx(./translatedType)}{{{ else }}}{{tx("admin/manage/custom-reasons:reason-all")}}{{{ end }}}</td>
- <td class="">{{txEscape(./parsedBody)}}</td>
+ <td class="">{{./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">{{tx("admin/admin:edit")}}</button>
diff --git a/src/views/flags/detail.tpl b/src/views/flags/detail.tpl
index 4353e3fc85..e5a5375d19 100644
--- a/src/views/flags/detail.tpl
+++ b/src/views/flags/detail.tpl
@@ -119,7 +119,7 @@
<a href="{config.relative_path}/user/{target.user.userslug}">{target.user.username}</a>
<span class="timeago text-muted" title="{target.timestampISO}"></span>
</div>
- <blockquote>{{txEscape(target.content)}}</blockquote>
+ <blockquote>{{target.content}}</blockquote>
{{{ end }}}
{{{ if type_bool.user }}}
diff --git a/src/views/groups/details.tpl b/src/views/groups/details.tpl
index cd48a5f291..500c8ef996 100644
--- a/src/views/groups/details.tpl
+++ b/src/views/groups/details.tpl
@@ -23,7 +23,7 @@
</div>
</div>
<div>
- {{txEscape(group.descriptionParsed)}}
+ {{group.descriptionParsed}}
</div>
</div>
<div class="d-flex gap-2 align-items-start">
diff --git a/src/views/partials/chats/parent.tpl b/src/views/partials/chats/parent.tpl
index 7ee6a6381e..cfd22d20a2 100644
--- a/src/views/partials/chats/parent.tpl
+++ b/src/views/partials/chats/parent.tpl
@@ -7,6 +7,6 @@
</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">{{{ if (messages.parent.txContent || messages.parent.system) }}}{{tx(messages.parent.content)}}{{{ else }}}{{txEscape(messages.parent.content)}}{{{ end }}}</div>
+ <div component="chat/message/parent/content" class="text-muted line-clamp-1 text-break w-100">{{{ if messages.parent.txContent }}}{{tx(messages.parent.content)}}{{{ else }}}{{messages.parent.content}}{{{ end }}}</div>
</div>
</div>
\ No newline at end of file
diff --git a/src/views/partials/chats/pinned-messages-list.tpl b/src/views/partials/chats/pinned-messages-list.tpl
index f41adc7d16..d3a82dcbc0 100644
--- a/src/views/partials/chats/pinned-messages-list.tpl
+++ b/src/views/partials/chats/pinned-messages-list.tpl
@@ -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">
- {{{ if (messages.txContent || messages.system) }}}{{tx(messages.content)}}{{{ else }}}{{txEscape(messages.content)}}{{{ end }}}
+ {{{ if messages.txContent }}}{{tx(messages.content)}}{{{ else }}}{{messages.content}}{{{ end }}}
</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/groups/list.tpl b/src/views/partials/groups/list.tpl
index c430512b25..c45b76d4ec 100644
--- a/src/views/partials/groups/list.tpl
+++ b/src/views/partials/groups/list.tpl
@@ -8,7 +8,7 @@
<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>
+ <div class="text-sm line-clamp-3 mb-last-0">{{./descriptionParsed}}</div>
<span class="timeago text-xs text-secondary mt-auto" title="{./createtimeISO}"></span>
</div>
</a>
diff --git a/src/views/partials/topic/post-parent.tpl b/src/views/partials/topic/post-parent.tpl
index ca7577cd5f..ba11263f61 100644
--- a/src/views/partials/topic/post-parent.tpl
+++ b/src/views/partials/topic/post-parent.tpl
@@ -7,5 +7,5 @@
<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">{{{ if ./parent.txContent }}}{{tx(./parent.content)}}{{{ else }}}{{txEscape(./parent.content)}}{{{ end }}}</div>
+ <div component="post/parent/content" class="text-muted line-clamp-1 text-break w-100">{{{ if ./parent.txContent }}}{{tx(./parent.content)}}{{{ else }}}{{./parent.content}}{{{ end }}}</div>
</div>