From ab95b606970e6f2b05b183b2969d345a870af59f Mon Sep 17 00:00:00 2001
From: Misty Release Bot <deploy@nodebb.org>
Date: Wed, 3 Apr 2024 13:59:29 +0000
Subject: [PATCH 01/25] chore: incrementing version number - v3.7.3

---
 install/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/package.json b/install/package.json
index ff40e5decb..eedae6903e 100644
--- a/install/package.json
+++ b/install/package.json
@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "3.7.2",
+    "version": "3.7.3",
     "homepage": "https://www.nodebb.org",
     "repository": {
         "type": "git",

From 8d450eea6ab8d1e248d90de09d52f6d2727133b4 Mon Sep 17 00:00:00 2001
From: Misty Release Bot <deploy@nodebb.org>
Date: Wed, 3 Apr 2024 13:59:29 +0000
Subject: [PATCH 02/25] chore: update changelog for v3.7.3

---
 CHANGELOG.md | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e41c2eec9e..9dde4f436a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,57 @@
+#### v3.7.3 (2024-04-03)
+
+##### Chores
+
+*  up ntfy (0058ca68)
+*  incrementing version number - v3.7.2 (cc257e7e)
+*  update changelog for v3.7.2 (277e1787)
+*  incrementing version number - v3.7.1 (712365a5)
+*  incrementing version number - v3.7.0 (9a6153d7)
+*  incrementing version number - v3.6.7 (86a17e38)
+*  incrementing version number - v3.6.6 (6604bf37)
+*  incrementing version number - v3.6.5 (6c653625)
+*  incrementing version number - v3.6.4 (83d131b4)
+*  incrementing version number - v3.6.3 (fc7d2bfd)
+*  incrementing version number - v3.6.2 (0f577a57)
+*  incrementing version number - v3.6.1 (f1a69468)
+*  incrementing version number - v3.6.0 (4cdf85f8)
+*  incrementing version number - v3.5.3 (ed0e8783)
+*  incrementing version number - v3.5.2 (52fbb2da)
+*  incrementing version number - v3.5.1 (4c543488)
+*  incrementing version number - v3.5.0 (d06fb4f0)
+*  incrementing version number - v3.4.3 (5c984250)
+*  incrementing version number - v3.4.2 (3f0dac38)
+*  incrementing version number - v3.4.1 (01e69574)
+*  incrementing version number - v3.4.0 (fd9247c5)
+*  incrementing version number - v3.3.9 (5805e770)
+*  incrementing version number - v3.3.8 (a5603565)
+*  incrementing version number - v3.3.7 (b26f1744)
+*  incrementing version number - v3.3.6 (7fb38792)
+*  incrementing version number - v3.3.4 (a67f84ea)
+*  incrementing version number - v3.3.3 (f94d239b)
+*  incrementing version number - v3.3.2 (ec9dac97)
+*  incrementing version number - v3.3.1 (151cc68f)
+*  incrementing version number - v3.3.0 (fc1ad70f)
+*  incrementing version number - v3.2.3 (b06d3e63)
+*  incrementing version number - v3.2.2 (758ecfcd)
+*  incrementing version number - v3.2.1 (20145074)
+*  incrementing version number - v3.2.0 (9ecac38e)
+*  incrementing version number - v3.1.7 (0b4e81ab)
+*  incrementing version number - v3.1.6 (b3a3b130)
+*  incrementing version number - v3.1.5 (ec19343a)
+*  incrementing version number - v3.1.4 (2452783c)
+*  incrementing version number - v3.1.3 (3b4e9d3f)
+*  incrementing version number - v3.1.2 (40fa3489)
+*  incrementing version number - v3.1.1 (40250733)
+*  incrementing version number - v3.1.0 (0cb386bd)
+*  incrementing version number - v3.0.1 (26f6ea49)
+*  incrementing version number - v3.0.0 (224e08cd)
+
+##### Bug Fixes
+
+*  change digest to use posts sorting first (3aae9234)
+*  #12452, fix admin/mod image change (c206ccdd)
+
 #### v3.7.2 (2024-03-27)
 
 ##### Chores

From 5d8a557199de6a607b4b9fbee27441657a69cbb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Wed, 3 Apr 2024 14:11:38 -0400
Subject: [PATCH 03/25] chore: up themes

---
 install/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/package.json b/install/package.json
index eedae6903e..28e20ebb0a 100644
--- a/install/package.json
+++ b/install/package.json
@@ -103,10 +103,10 @@
         "nodebb-plugin-ntfy": "1.7.4",
         "nodebb-plugin-spam-be-gone": "2.2.1",
         "nodebb-rewards-essentials": "1.0.0",
-        "nodebb-theme-harmony": "1.2.44",
+        "nodebb-theme-harmony": "1.2.45",
         "nodebb-theme-lavender": "7.1.8",
         "nodebb-theme-peace": "2.2.4",
-        "nodebb-theme-persona": "13.3.11",
+        "nodebb-theme-persona": "13.3.12",
         "nodebb-widget-essentials": "7.0.15",
         "nodemailer": "6.9.11",
         "nprogress": "0.2.0",

From 0b1f2546c84da19596981897f4b29348686bdf67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Sun, 7 Apr 2024 11:10:15 -0400
Subject: [PATCH 04/25] fix: #12471, remove readable strings

they are not localized properly
---
 public/openapi/components/schemas/UserObject.yaml | 4 +---
 public/openapi/read/user/userslug/info.yaml       | 2 --
 src/user/info.js                                  | 4 +---
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/public/openapi/components/schemas/UserObject.yaml b/public/openapi/components/schemas/UserObject.yaml
index bdd52bc2d1..9b217cee8b 100644
--- a/public/openapi/components/schemas/UserObject.yaml
+++ b/public/openapi/components/schemas/UserObject.yaml
@@ -743,9 +743,7 @@ BanMuteArray:
             example: "#f44336"
       until:
         type: number
-      untilReadable:
-        type: string
-      timestampReadable:
+      untilISO:
         type: string
       timestampISO:
         type: string
diff --git a/public/openapi/read/user/userslug/info.yaml b/public/openapi/read/user/userslug/info.yaml
index afec9bc2bd..110e252be5 100644
--- a/public/openapi/read/user/userslug/info.yaml
+++ b/public/openapi/read/user/userslug/info.yaml
@@ -35,8 +35,6 @@ get:
                             timestampISO:
                               type: string
                               description: An ISO 8601 formatted date string (complementing `timestamp`)
-                            timestampReadable:
-                              type: string
                           additionalProperties:
                             description: Contextual data is added to this object (such as topic data, etc.)
                       bans:
diff --git a/src/user/info.js b/src/user/info.js
index 3abd580d02..d4667bd83f 100644
--- a/src/user/info.js
+++ b/src/user/info.js
@@ -86,7 +86,6 @@ module.exports = function (User) {
 			flagObj.pid = flagObj.value;
 			flagObj.timestamp = flagObj.score;
 			flagObj.timestampISO = new Date(flagObj.score).toISOString();
-			flagObj.timestampReadable = new Date(flagObj.score).toString();
 
 			delete flagObj.value;
 			delete flagObj.score;
@@ -105,8 +104,7 @@ module.exports = function (User) {
 		return data.map((banObj, index) => {
 			banObj.user = usersData[index];
 			banObj.until = parseInt(banObj.expire, 10);
-			banObj.untilReadable = new Date(banObj.until).toString();
-			banObj.timestampReadable = new Date(parseInt(banObj.timestamp, 10)).toString();
+			banObj.untilISO = utils.toISOString(banObj.until);
 			banObj.timestampISO = utils.toISOString(banObj.timestamp);
 			banObj.reason = validator.escape(String(banObj.reason || '')) || noReasonLangKey;
 			return banObj;

From ba86740a6a40d6f7cc884222f70c6812b94e3304 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Sun, 7 Apr 2024 11:12:10 -0400
Subject: [PATCH 05/25] chore: up themes

---
 install/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/package.json b/install/package.json
index 28e20ebb0a..b5ad0febe5 100644
--- a/install/package.json
+++ b/install/package.json
@@ -103,10 +103,10 @@
         "nodebb-plugin-ntfy": "1.7.4",
         "nodebb-plugin-spam-be-gone": "2.2.1",
         "nodebb-rewards-essentials": "1.0.0",
-        "nodebb-theme-harmony": "1.2.45",
+        "nodebb-theme-harmony": "1.2.46",
         "nodebb-theme-lavender": "7.1.8",
         "nodebb-theme-peace": "2.2.4",
-        "nodebb-theme-persona": "13.3.12",
+        "nodebb-theme-persona": "13.3.13",
         "nodebb-widget-essentials": "7.0.15",
         "nodemailer": "6.9.11",
         "nprogress": "0.2.0",

From d72567964818274a1f511332b8fde32dcf661b56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Tue, 9 Apr 2024 10:54:45 -0400
Subject: [PATCH 06/25] fix: #12485, resolve flags on a topics posts on topic
 delete

---
 src/posts/delete.js  |  2 +-
 src/topics/delete.js | 33 +++++++++++++++++++++++----------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/posts/delete.js b/src/posts/delete.js
index 66c8269334..94f73cf494 100644
--- a/src/posts/delete.js
+++ b/src/posts/delete.js
@@ -236,7 +236,7 @@ module.exports = function (Posts) {
 	}
 
 	async function resolveFlags(postData, uid) {
-		const flaggedPosts = postData.filter(p => parseInt(p.flagId, 10));
+		const flaggedPosts = postData.filter(p => p && parseInt(p.flagId, 10));
 		await Promise.all(flaggedPosts.map(p => flags.update(p.flagId, uid, { state: 'resolved' })));
 	}
 };
diff --git a/src/topics/delete.js b/src/topics/delete.js
index 5190afd1ff..4e7f5d1400 100644
--- a/src/topics/delete.js
+++ b/src/topics/delete.js
@@ -5,25 +5,38 @@ const db = require('../database');
 const user = require('../user');
 const posts = require('../posts');
 const categories = require('../categories');
+const flags = require('../flags');
 const plugins = require('../plugins');
 const batch = require('../batch');
 
 
 module.exports = function (Topics) {
 	Topics.delete = async function (tid, uid) {
-		const cid = await Topics.getTopicField(tid, 'cid');
-		await removeTopicPidsFromCid(tid, cid);
-		await Topics.setTopicFields(tid, {
-			deleted: 1,
-			deleterUid: uid,
-			deletedTimestamp: Date.now(),
-		});
+		const [cid, pids] = await Promise.all([
+			Topics.getTopicField(tid, 'cid'),
+			Topics.getPids(tid),
+		]);
+		await Promise.all([
+			db.sortedSetRemove(`cid:${cid}:pids`, pids),
+			resolveTopicPostFlags(pids, uid),
+			Topics.setTopicFields(tid, {
+				deleted: 1,
+				deleterUid: uid,
+				deletedTimestamp: Date.now(),
+			}),
+		]);
+
 		await categories.updateRecentTidForCid(cid);
 	};
 
-	async function removeTopicPidsFromCid(tid, cid) {
-		const pids = await Topics.getPids(tid);
-		await db.sortedSetRemove(`cid:${cid}:pids`, pids);
+	async function resolveTopicPostFlags(pids, uid) {
+		await batch.processArray(pids, async (pids) => {
+			const postData = await posts.getPostsFields(pids, ['pid', 'flagId']);
+			const flaggedPosts = postData.filter(p => p && parseInt(p.flagId, 10));
+			await Promise.all(flaggedPosts.map(p => flags.update(p.flagId, uid, { state: 'resolved' })));
+		}, {
+			batch: 500,
+		});
 	}
 
 	async function addTopicPidsToCid(tid, cid) {

From c2465a16921d86e3c338990d437baca0f8afefaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Tue, 9 Apr 2024 11:19:20 -0400
Subject: [PATCH 07/25] chore: up harmony

---
 install/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/package.json b/install/package.json
index b5ad0febe5..efce2d924e 100644
--- a/install/package.json
+++ b/install/package.json
@@ -103,7 +103,7 @@
         "nodebb-plugin-ntfy": "1.7.4",
         "nodebb-plugin-spam-be-gone": "2.2.1",
         "nodebb-rewards-essentials": "1.0.0",
-        "nodebb-theme-harmony": "1.2.46",
+        "nodebb-theme-harmony": "1.2.47",
         "nodebb-theme-lavender": "7.1.8",
         "nodebb-theme-peace": "2.2.4",
         "nodebb-theme-persona": "13.3.13",

From cfd29db061baf6ada7a98338bbf2a38b34164a4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Wed, 10 Apr 2024 09:38:01 -0400
Subject: [PATCH 08/25] refactor: better label for show to groups

---
 public/language/en-GB/admin/settings/navigation.json | 2 +-
 src/views/admin/settings/navigation.tpl              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/language/en-GB/admin/settings/navigation.json b/public/language/en-GB/admin/settings/navigation.json
index 931ac5f4ba..3a71061ecf 100644
--- a/public/language/en-GB/admin/settings/navigation.json
+++ b/public/language/en-GB/admin/settings/navigation.json
@@ -10,7 +10,7 @@
 	"id": "ID: <small>optional</small>",
 
 	"properties": "Properties:",
-	"groups": "Groups:",
+	"show-to-groups": "Show to Groups:",
 	"open-new-window": "Open in a new window",
 	"dropdown": "Dropdown",
 	"dropdown-placeholder": "Place your dropdown menu items below, ie: <br/>&lt;li&gt;&lt;a class=&quot;dropdown-item&quot; href&#x3D;&quot;https://myforum.com&quot;&gt;Link 1&lt;/a&gt;&lt;/li&gt;",
diff --git a/src/views/admin/settings/navigation.tpl b/src/views/admin/settings/navigation.tpl
index 431b052361..6af7e60511 100644
--- a/src/views/admin/settings/navigation.tpl
+++ b/src/views/admin/settings/navigation.tpl
@@ -75,7 +75,7 @@
 
 						<div class="row mb-3">
 							<div class="col-12">
-								<label class="form-label">[[admin/settings/navigation:groups]]</label>
+								<label class="form-label">[[admin/settings/navigation:show-to-groups]]</label>
 
 								<select name="groups" class="form-select" size="10" multiple>
 									{{{ each enabled.groups }}}

From ca07e517301ab745bf000f2887c06db13145309e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Thu, 11 Apr 2024 09:55:57 -0400
Subject: [PATCH 09/25] fix: if you have chat:privileged the chat icons should
 show up

---
 src/middleware/render.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/middleware/render.js b/src/middleware/render.js
index 6b1181d3af..21ff25170d 100644
--- a/src/middleware/render.js
+++ b/src/middleware/render.js
@@ -214,7 +214,7 @@ module.exports = function (middleware) {
 		templateValues.isAdmin = results.user.isAdmin;
 		templateValues.isGlobalMod = results.user.isGlobalMod;
 		templateValues.showModMenu = results.user.isAdmin || results.user.isGlobalMod || results.user.isMod;
-		templateValues.canChat = results.privileges.chat && meta.config.disableChat !== 1;
+		templateValues.canChat = (results.privileges.chat || results.privileges['chat:privileged']) && meta.config.disableChat !== 1;
 		templateValues.user = results.user;
 		templateValues.userJSON = jsesc(JSON.stringify(results.user), { isScriptContext: true });
 		templateValues.useCustomCSS = meta.config.useCustomCSS && meta.config.customCSS;

From 5fcd1a8ad6ac506bb78b1746ff4d6d46ccf3d9f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Thu, 11 Apr 2024 10:00:50 -0400
Subject: [PATCH 10/25] fix: align teaser avatar

get rid of left over href
---
 src/views/partials/chats/recent_room.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/partials/chats/recent_room.tpl b/src/views/partials/chats/recent_room.tpl
index ea904ace6a..57caf57301 100644
--- a/src/views/partials/chats/recent_room.tpl
+++ b/src/views/partials/chats/recent_room.tpl
@@ -34,7 +34,7 @@
 
 				{{{ if ./teaser }}}
 				<div class="teaser-content text-sm line-clamp-3 text-break">
-					<span href="#" class="text-decoration-none">{buildAvatar(./teaser.user, "14px", true)}</span>
+					{buildAvatar(./teaser.user, "14px", true, "align-middle")}
 					<strong class="text-xs fw-semibold teaser-username">{./teaser.user.username}:</strong>
 					{./teaser.content}
 				</div>

From 48281f96b3b50a197b164b929695f4108a92ed97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Thu, 11 Apr 2024 10:25:57 -0400
Subject: [PATCH 11/25] fix: copy dropdown closing on copy ip/text/link

---
 public/src/client/chats.js           | 19 +++++++++++++------
 src/views/partials/chats/message.tpl |  5 ++++-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/public/src/client/chats.js b/public/src/client/chats.js
index a5cb58caf0..abaae9f818 100644
--- a/public/src/client/chats.js
+++ b/public/src/client/chats.js
@@ -225,18 +225,23 @@ define('forum/chats', [
 
 	Chats.addIPHandler = function (container) {
 		container.off('click', '.chat-ip-button')
-			.on('click', '.chat-ip-button', async function () {
+			.on('click', '.chat-ip-button', async function (ev) {
+				ev.stopPropagation();
 				const ipEl = $(this);
+				const ipCopyText = ipEl.find('.copy .copy-ip-text');
 				let ip = ipEl.attr('data-ip');
 				if (ip) {
 					navigator.clipboard.writeText(ip);
-					ipEl.translateText('[[global:copied]]');
-					setTimeout(() => ipEl.text(ip), 2000);
+					ipCopyText.translateText('[[global:copied]]');
+					setTimeout(() => ipCopyText.text(ip), 2000);
 					return;
 				}
 				const mid = ipEl.parents('[data-mid]').attr('data-mid');
 				({ ip } = await api.get(`/chats/${ajaxify.data.roomId}/messages/${mid}/ip`));
-				ipEl.text(ip).attr('data-ip', ip);
+				ipEl.attr('data-ip', ip);
+				ipEl.find('.show').addClass('hidden');
+				ipEl.find('.copy').removeClass('hidden');
+				ipCopyText.text(ip);
 			});
 	};
 
@@ -248,7 +253,8 @@ define('forum/chats', [
 		}
 
 		container.off('click', '[data-action="copy-link"]')
-			.on('click', '[data-action="copy-link"]', function () {
+			.on('click', '[data-action="copy-link"]', function (ev) {
+				ev.stopPropagation();
 				const copyEl = $(this);
 				const mid = copyEl.attr('data-mid');
 				if (mid) {
@@ -257,7 +263,8 @@ define('forum/chats', [
 			});
 
 		container.off('click', '[data-action="copy-text"]')
-			.on('click', '[data-action="copy-text"]', function () {
+			.on('click', '[data-action="copy-text"]', function (ev) {
+				ev.stopPropagation();
 				const copyEl = $(this);
 				const messageEl = copyEl.parents('[data-mid]');
 				if (messageEl.length) {
diff --git a/src/views/partials/chats/message.tpl b/src/views/partials/chats/message.tpl
index 04a2cc09d3..527a055f17 100644
--- a/src/views/partials/chats/message.tpl
+++ b/src/views/partials/chats/message.tpl
@@ -54,7 +54,10 @@
 
 						{{{ if isAdminOrGlobalMod }}}
 						<li>
-							<a href="#" class="dropdown-item rounded-1 chat-ip-button" role="menuitem"><span class="d-inline-flex align-items-center gap-2"><i class="fa fa-fw fa-info-circle text-muted"></i> [[modules:chat.show-ip]]</span></a>
+							<a href="#" class="dropdown-item rounded-1 chat-ip-button" role="menuitem">
+								<span class="d-inline-flex align-items-center gap-2 show"><i class="fa fa-fw fa-info-circle text-muted"></i> [[modules:chat.show-ip]]</span>
+								<span class="d-inline-flex align-items-center gap-2 copy hidden"><i class="fa fa-fw fa-copy text-muted"></i> <span class="copy-ip-text"></span></span>
+							</a>
 						</li>
 						{{{ end }}}
 

From 52e71522069fc08ad3becacf1d53e58726ce5e9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Thu, 11 Apr 2024 13:24:50 -0400
Subject: [PATCH 12/25] refactor: move parseInt to filter

---
 src/flags.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/flags.js b/src/flags.js
index 833bb7edd8..e3932f3bd8 100644
--- a/src/flags.js
+++ b/src/flags.js
@@ -795,12 +795,10 @@ Flags.resolveUserPostFlags = async function (uid, callerUid) {
 	if (meta.config['flags:autoResolveOnBan']) {
 		await batch.processSortedSet(`uid:${uid}:posts`, async (pids) => {
 			let postData = await posts.getPostsFields(pids, ['pid', 'flagId']);
-			postData = postData.filter(p => p && p.flagId);
+			postData = postData.filter(p => p && p.flagId && parseInt(p.flagId, 10));
 			for (const postObj of postData) {
-				if (parseInt(postObj.flagId, 10)) {
-					// eslint-disable-next-line no-await-in-loop
-					await Flags.update(postObj.flagId, callerUid, { state: 'resolved' });
-				}
+				// eslint-disable-next-line no-await-in-loop
+				await Flags.update(postObj.flagId, callerUid, { state: 'resolved' });
 			}
 		}, {
 			batch: 500,

From afe597a27581171d34966ecf79426e9241dd376c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Thu, 11 Apr 2024 16:18:42 -0400
Subject: [PATCH 13/25] feat: #12495, add unblock button to users on /blocks

---
 public/src/client/account/blocks.js | 48 ++++++++++++++++++++---------
 src/api/users.js                    |  1 +
 src/controllers/users.js            |  2 +-
 src/socket.io/user/profile.js       | 12 ++++++--
 src/user/search.js                  | 14 ++++++++-
 5 files changed, 59 insertions(+), 18 deletions(-)

diff --git a/public/src/client/account/blocks.js b/public/src/client/account/blocks.js
index 921065fd37..91b0745a19 100644
--- a/public/src/client/account/blocks.js
+++ b/public/src/client/account/blocks.js
@@ -11,12 +11,19 @@ define('forum/account/blocks', [
 	Blocks.init = function () {
 		header.init();
 		const blockListEl = $('[component="blocks/search/list"]');
+		const startTypingEl = blockListEl.find('[component="blocks/start-typing"]');
+		const noUsersEl = blockListEl.find('[component="blocks/no-users"]');
 
-		$('#user-search').on('keyup', function () {
+		$('#user-search').on('keyup', utils.debounce(function () {
 			const username = this.value;
+
 			if (!username) {
-				return blockListEl.translateHtml('<li><a href="#" class="dropdown-item" role="menuitem">[[admin/menu:search.start-typing]]</a></li>');
+				blockListEl.find('[component="blocks/search/match"]').remove();
+				startTypingEl.removeClass('hidden');
+				noUsersEl.addClass('hidden');
+				return;
 			}
+			startTypingEl.addClass('hidden');
 			api.get('/api/users', {
 				query: username,
 				searchBy: 'username',
@@ -26,8 +33,10 @@ define('forum/account/blocks', [
 					return alerts.error(err);
 				}
 				if (!data.users.length) {
-					return blockListEl.translateHtml('<li><a href="#" class="dropdown-item" role="menuitem">[[users:no-users-found]]</a></li>');
+					noUsersEl.removeClass('hidden');
+					return;
 				}
+				noUsersEl.addClass('hidden');
 				// Only show first 10 matches
 				if (data.matchCount > 10) {
 					data.users.length = 10;
@@ -36,25 +45,36 @@ define('forum/account/blocks', [
 				app.parseAndTranslate('account/blocks', 'edit', {
 					edit: data.users,
 				}, function (html) {
-					$('.block-edit').html(html);
+					blockListEl.find('[component="blocks/search/match"]').remove();
+					html.insertAfter(noUsersEl);
 				});
 			});
+		}, 200));
+
+		$('.block-edit').on('click', '[data-action="block"], [data-action="unblock"]', async function () {
+			const uid = parseInt(this.getAttribute('data-uid'), 10);
+			const action = $(this).attr('data-action');
+			const currentBtn = $(this);
+			await performBlock(uid, action);
+			currentBtn.addClass('hidden').siblings('[data-action]').removeClass('hidden');
+			Blocks.refreshList();
 		});
 
-		$('.block-edit').on('click', '[data-action="toggle"]', function () {
-			const uid = parseInt(this.getAttribute('data-uid'), 10);
-			socket.emit('user.toggleBlock', {
-				blockeeUid: uid,
-				blockerUid: ajaxify.data.uid,
-			}, Blocks.refreshList);
+		$('#users-container').on('click', '[data-action="unblock"]', async function () {
+			await performBlock($(this).attr('data-uid'), $(this).attr('data-action'));
+			Blocks.refreshList();
 		});
 	};
 
-	Blocks.refreshList = function (err) {
-		if (err) {
-			return alerts.error(err);
-		}
+	async function performBlock(uid, action) {
+		return socket.emit('user.toggleBlock', {
+			blockeeUid: uid,
+			blockerUid: ajaxify.data.uid,
+			action: action,
+		}).catch(alerts.error);
+	}
 
+	Blocks.refreshList = function () {
 		$.get(config.relative_path + '/api/' + ajaxify.currentPage)
 			.done(function (payload) {
 				app.parseAndTranslate('account/blocks', 'users', payload, function (html) {
diff --git a/src/api/users.js b/src/api/users.js
index febcf290e6..7c8a725019 100644
--- a/src/api/users.js
+++ b/src/api/users.js
@@ -601,6 +601,7 @@ usersAPI.search = async function (caller, data) {
 		throw new Error('[[error:no-privileges]]');
 	}
 	return await user.search({
+		uid: caller.uid,
 		query: data.query,
 		searchBy: data.searchBy || 'username',
 		page: data.page || 1,
diff --git a/src/controllers/users.js b/src/controllers/users.js
index f55296bdb9..41194e6c82 100644
--- a/src/controllers/users.js
+++ b/src/controllers/users.js
@@ -25,7 +25,7 @@ usersController.index = async function (req, res, next) {
 
 	if (req.query.query) {
 		await usersController.search(req, res, next);
-	} else if (sectionToController[section]) {
+	} else if (sectionToController.hasOwnProperty(section) && sectionToController[section]) {
 		await sectionToController[section](req, res, next);
 	} else {
 		await usersController.getUsersSortedByJoinDate(req, res, next);
diff --git a/src/socket.io/user/profile.js b/src/socket.io/user/profile.js
index 5d4c4624f3..277b75ccc4 100644
--- a/src/socket.io/user/profile.js
+++ b/src/socket.io/user/profile.js
@@ -41,8 +41,16 @@ module.exports = function (SocketUser) {
 
 	SocketUser.toggleBlock = async function (socket, data) {
 		const isBlocked = await user.blocks.is(data.blockeeUid, data.blockerUid);
-		await user.blocks.can(socket.uid, data.blockerUid, data.blockeeUid, isBlocked ? 'unblock' : 'block');
-		await user.blocks[isBlocked ? 'remove' : 'add'](data.blockeeUid, data.blockerUid);
+		const { action, blockerUid, blockeeUid } = data;
+		if (action !== 'block' && action !== 'unblock') {
+			throw new Error('[[error:unknow-block-action]]');
+		}
+		await user.blocks.can(socket.uid, blockerUid, blockeeUid, action);
+		if (data.action === 'block') {
+			await user.blocks.add(blockeeUid, blockerUid);
+		} else if (data.action === 'unblock') {
+			await user.blocks.remove(blockeeUid, blockerUid);
+		}
 		return !isBlocked;
 	};
 };
diff --git a/src/user/search.js b/src/user/search.js
index 2713b3a8dd..ec0b81d025 100644
--- a/src/user/search.js
+++ b/src/user/search.js
@@ -60,7 +60,19 @@ module.exports = function (User) {
 			uids = uids.slice(start, stop);
 		}
 
-		const userData = await User.getUsers(uids, uid);
+		const [userData, blocks] = await Promise.all([
+			User.getUsers(uids, uid),
+			User.blocks.list(uid),
+		]);
+
+		if (blocks.length) {
+			userData.forEach((user) => {
+				if (user) {
+					user.isBlocked = blocks.includes(user.uid);
+				}
+			});
+		}
+
 		searchResult.timing = (process.elapsedTimeSince(startTime) / 1000).toFixed(2);
 		searchResult.users = userData.filter(user => user && user.uid > 0);
 		return searchResult;

From acab46e656bea5e8bc1fc8961353e42b958ae66b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Thu, 11 Apr 2024 16:33:50 -0400
Subject: [PATCH 14/25] test: fix tests and use action

---
 install/package.json                | 4 ++--
 public/src/client/account/header.js | 7 ++++---
 test/user.js                        | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/install/package.json b/install/package.json
index efce2d924e..e5f676dc87 100644
--- a/install/package.json
+++ b/install/package.json
@@ -103,10 +103,10 @@
         "nodebb-plugin-ntfy": "1.7.4",
         "nodebb-plugin-spam-be-gone": "2.2.1",
         "nodebb-rewards-essentials": "1.0.0",
-        "nodebb-theme-harmony": "1.2.47",
+        "nodebb-theme-harmony": "1.2.48",
         "nodebb-theme-lavender": "7.1.8",
         "nodebb-theme-peace": "2.2.4",
-        "nodebb-theme-persona": "13.3.13",
+        "nodebb-theme-persona": "13.3.14",
         "nodebb-widget-essentials": "7.0.15",
         "nodemailer": "6.9.11",
         "nprogress": "0.2.0",
diff --git a/public/src/client/account/header.js b/public/src/client/account/header.js
index 9aae8d6a8f..dfa888120b 100644
--- a/public/src/client/account/header.js
+++ b/public/src/client/account/header.js
@@ -56,8 +56,8 @@ define('forum/account/header', [
 		components.get('account/delete-content').on('click', () => AccountsDelete.content(ajaxify.data.theirid));
 		components.get('account/delete-all').on('click', () => AccountsDelete.purge(ajaxify.data.theirid));
 		components.get('account/flag').on('click', flagAccount);
-		components.get('account/block').on('click', toggleBlockAccount);
-		components.get('account/unblock').on('click', toggleBlockAccount);
+		components.get('account/block').on('click', () => toggleBlockAccount('block'));
+		components.get('account/unblock').on('click', () => toggleBlockAccount('unblock'));
 	};
 
 	function selectActivePill() {
@@ -129,10 +129,11 @@ define('forum/account/header', [
 		});
 	}
 
-	function toggleBlockAccount() {
+	function toggleBlockAccount(action) {
 		socket.emit('user.toggleBlock', {
 			blockeeUid: ajaxify.data.uid,
 			blockerUid: app.user.uid,
+			action,
 		}, function (err, blocked) {
 			if (err) {
 				return alerts.error(err);
diff --git a/test/user.js b/test/user.js
index 421a8c2cf4..4d65ffaa64 100644
--- a/test/user.js
+++ b/test/user.js
@@ -2457,7 +2457,7 @@ describe('User', () => {
 
 		describe('.toggle()', () => {
 			it('should toggle block', (done) => {
-				socketUser.toggleBlock({ uid: 1 }, { blockerUid: 1, blockeeUid: blockeeUid }, (err) => {
+				socketUser.toggleBlock({ uid: 1 }, { blockerUid: 1, blockeeUid: blockeeUid, action: 'block' }, (err) => {
 					assert.ifError(err);
 					User.blocks.is(blockeeUid, 1, (err, blocked) => {
 						assert.ifError(err);
@@ -2468,7 +2468,7 @@ describe('User', () => {
 			});
 
 			it('should toggle block', (done) => {
-				socketUser.toggleBlock({ uid: 1 }, { blockerUid: 1, blockeeUid: blockeeUid }, (err) => {
+				socketUser.toggleBlock({ uid: 1 }, { blockerUid: 1, blockeeUid: blockeeUid, action: 'unblock' }, (err) => {
 					assert.ifError(err);
 					User.blocks.is(blockeeUid, 1, (err, blocked) => {
 						assert.ifError(err);

From 18990795eca53c6ab2776ba9a98c406dee88b410 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Thu, 11 Apr 2024 17:01:51 -0400
Subject: [PATCH 15/25] chore: up harmony

---
 install/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/package.json b/install/package.json
index e5f676dc87..50dc673850 100644
--- a/install/package.json
+++ b/install/package.json
@@ -103,7 +103,7 @@
         "nodebb-plugin-ntfy": "1.7.4",
         "nodebb-plugin-spam-be-gone": "2.2.1",
         "nodebb-rewards-essentials": "1.0.0",
-        "nodebb-theme-harmony": "1.2.48",
+        "nodebb-theme-harmony": "1.2.49",
         "nodebb-theme-lavender": "7.1.8",
         "nodebb-theme-peace": "2.2.4",
         "nodebb-theme-persona": "13.3.14",

From 7218a9d8cb9665938e5be9f4c8ddd843993f12d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Fri, 12 Apr 2024 11:44:00 -0400
Subject: [PATCH 16/25] add tid/uid to teaser

---
 src/categories/recentreplies.js | 5 +++--
 src/controllers/helpers.js      | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/categories/recentreplies.js b/src/categories/recentreplies.js
index 7b04974659..cb7056bfbb 100644
--- a/src/categories/recentreplies.js
+++ b/src/categories/recentreplies.js
@@ -116,9 +116,10 @@ module.exports = function (Categories) {
 			if (teaser) {
 				teaser.cid = topicData[index].cid;
 				teaser.parentCids = cidToRoot[teaser.cid];
-				teaser.tid = undefined;
-				teaser.uid = undefined;
+				teaser.tid = topicData[index].tid;
+				teaser.uid = topicData[index].uid;
 				teaser.topic = {
+					tid: topicData[index].tid,
 					slug: topicData[index].slug,
 					title: topicData[index].title,
 				};
diff --git a/src/controllers/helpers.js b/src/controllers/helpers.js
index a4a2287160..c17e701b79 100644
--- a/src/controllers/helpers.js
+++ b/src/controllers/helpers.js
@@ -396,6 +396,7 @@ helpers.setCategoryTeaser = function (category) {
 			url: `${nconf.get('relative_path')}/post/${post.pid}`,
 			timestampISO: post.timestampISO,
 			pid: post.pid,
+			tid: post.tid,
 			index: post.index,
 			topic: post.topic,
 			user: post.user,

From 6816e39bd8825449522c0636d8a133ae89d5f121 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Fri, 12 Apr 2024 12:02:57 -0400
Subject: [PATCH 17/25] test: update spec

---
 public/openapi/read/categories.yaml | 8 ++++++++
 public/openapi/read/index.yaml      | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/public/openapi/read/categories.yaml b/public/openapi/read/categories.yaml
index bc8b254049..f1126e9dfb 100644
--- a/public/openapi/read/categories.yaml
+++ b/public/openapi/read/categories.yaml
@@ -136,6 +136,8 @@ get:
                                 properties:
                                   pid:
                                     type: number
+                                  tid:
+                                    type: number
                                   timestamp:
                                     type: number
                                   content:
@@ -182,6 +184,8 @@ get:
                                   topic:
                                     type: object
                                     properties:
+                                      tid:
+                                        type: number
                                       slug:
                                         type: string
                                       title:
@@ -196,12 +200,16 @@ get:
                                   description: An ISO 8601 formatted date string (complementing `timestamp`)
                                 pid:
                                   type: number
+                                tid:
+                                  type: number
                                 index:
                                   type: number
                                   description: The index of the post
                                 topic:
                                   type: object
                                   properties:
+                                    tid:
+                                      type: number
                                     slug:
                                       type: string
                                     title:
diff --git a/public/openapi/read/index.yaml b/public/openapi/read/index.yaml
index f980d2eff4..a984fb35dc 100644
--- a/public/openapi/read/index.yaml
+++ b/public/openapi/read/index.yaml
@@ -138,6 +138,8 @@ get:
                                 properties:
                                   pid:
                                     type: number
+                                  tid:
+                                    type: number
                                   timestamp:
                                     type: number
                                   content:
@@ -184,6 +186,8 @@ get:
                                   topic:
                                     type: object
                                     properties:
+                                      tid:
+                                        type: number
                                       slug:
                                         type: string
                                       title:
@@ -198,12 +202,16 @@ get:
                                   description: An ISO 8601 formatted date string (complementing `timestamp`)
                                 pid:
                                   type: number
+                                tid:
+                                  type: number
                                 index:
                                   type: number
                                   description: The index of the post
                                 topic:
                                   type: object
                                   properties:
+                                    tid:
+                                      type: number
                                     slug:
                                       type: string
                                     title:

From 14f5774f6aa4ad40210e40bf743928768869e487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Fri, 12 Apr 2024 12:50:51 -0400
Subject: [PATCH 18/25] fix: is user doesnt have view:users privilege

dont redirect uid/1 to userslug
---
 src/middleware/user.js | 8 ++++++--
 src/routes/user.js     | 6 +++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/middleware/user.js b/src/middleware/user.js
index a9573e397c..342730c507 100644
--- a/src/middleware/user.js
+++ b/src/middleware/user.js
@@ -203,8 +203,12 @@ module.exports = function (middleware) {
 		if (uid <= 0) {
 			return next();
 		}
-		const userslug = await user.getUserField(uid, 'userslug');
-		if (!userslug) {
+		const [canView, userslug] = await Promise.all([
+			privileges.global.can('view:users', req.uid),
+			user.getUserField(uid, 'userslug'),
+		]);
+
+		if (!userslug || (!canView && req.uid !== uid)) {
 			return next();
 		}
 		const path = req.url.replace(/^\/api/, '')
diff --git a/src/routes/user.js b/src/routes/user.js
index 49f551dc59..040f6cb063 100644
--- a/src/routes/user.js
+++ b/src/routes/user.js
@@ -5,7 +5,11 @@ const helpers = require('./helpers');
 const { setupPageRoute } = helpers;
 
 module.exports = function (app, name, middleware, controllers) {
-	const middlewares = [middleware.exposeUid, middleware.canViewUsers, middleware.buildAccountData];
+	const middlewares = [
+		middleware.exposeUid,
+		middleware.canViewUsers,
+		middleware.buildAccountData,
+	];
 	const accountMiddlewares = [
 		...middlewares,
 		middleware.ensureLoggedIn,

From 5bee324c6a2e6e5a2ba4693f5603c8f1918152d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Fri, 12 Apr 2024 16:25:24 -0400
Subject: [PATCH 19/25] fix: add canView check to /api/v3/users/:uid

---
 src/api/users.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/api/users.js b/src/api/users.js
index 7c8a725019..2bd4779409 100644
--- a/src/api/users.js
+++ b/src/api/users.js
@@ -41,6 +41,10 @@ usersAPI.create = async function (caller, data) {
 };
 
 usersAPI.get = async (caller, { uid }) => {
+	const canView = await privileges.global.can('view:users', caller.uid);
+	if (!canView) {
+		throw new Error('[[error:no-privileges]]');
+	}
 	const userData = await user.getUserData(uid);
 	return await user.hidePrivateData(userData, caller.uid);
 };

From 8f317c01bb90537884c4cdabaa1357974354945b Mon Sep 17 00:00:00 2001
From: Marek Dorda <marek.dorda@gmail.com>
Date: Mon, 15 Apr 2024 15:04:53 +0200
Subject: [PATCH 20/25] Add action:topic.updateTags hook (#12513)

Fix https://github.com/NodeBB/NodeBB/issues/12512
---
 src/topics/tags.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/topics/tags.js b/src/topics/tags.js
index 6cbe54b646..daab4e5f77 100644
--- a/src/topics/tags.js
+++ b/src/topics/tags.js
@@ -416,6 +416,7 @@ module.exports = function (Topics) {
 
 		tags = await Topics.filterTags(tags, cid);
 		await Topics.addTags(tags, [tid]);
+		plugins.hooks.fire('action:topic.updateTags', { tags, tid });
 	};
 
 	Topics.deleteTopicTags = async function (tid) {

From d2e042d15b8b13a0ea3b651e05f5c8d97c7ff49f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Mon, 15 Apr 2024 11:31:27 -0400
Subject: [PATCH 21/25] refactor: add new hooks for notifications/websockets

filter:sockets.sendNewNotificationToUid - fires before emitting "event:new_notification"

filter:sockets.sendNewPostToUid - fires before emitting "event:new_post"

filter:sockets.sendNewTopicToUid - fires before emitting "event:new_topic"

filter:user.toggleFollow- fires before follow/unfollow
---
 src/notifications.js      | 13 ++++++++++---
 src/socket.io/helpers.js  | 31 ++++++++++++++++++++++---------
 src/user/follow.js        | 30 ++++++++++++++++++------------
 src/user/notifications.js |  2 +-
 4 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/src/notifications.js b/src/notifications.js
index 612c67d95f..fdb9998248 100644
--- a/src/notifications.js
+++ b/src/notifications.js
@@ -197,9 +197,13 @@ async function pushToUids(uids, notification) {
 		await db.sortedSetsRemoveRangeByScore(unreadKeys.concat(readKeys), '-inf', cutoff);
 		const websockets = require('./socket.io');
 		if (websockets.server) {
-			uids.forEach((uid) => {
+			await Promise.all(uids.map(async (uid) => {
+				await plugins.hooks.fire('filter:sockets.sendNewNoticationToUid', {
+					uid,
+					notification,
+				});
 				websockets.in(`uid_${uid}`).emit('event:new_notification', notification);
-			});
+			}));
 		}
 	}
 
@@ -223,7 +227,10 @@ async function pushToUids(uids, notification) {
 
 	// Remove uid from recipients list if they have blocked the user triggering the notification
 	uids = await User.blocks.filterUids(notification.from, uids);
-	const data = await plugins.hooks.fire('filter:notification.push', { notification: notification, uids: uids });
+	const data = await plugins.hooks.fire('filter:notification.push', {
+		notification,
+		uids,
+	});
 	if (!data || !data.notification || !data.uids || !data.uids.length) {
 		return;
 	}
diff --git a/src/socket.io/helpers.js b/src/socket.io/helpers.js
index 36b3384d24..7286b79e8e 100644
--- a/src/socket.io/helpers.js
+++ b/src/socket.io/helpers.js
@@ -28,8 +28,7 @@ SocketHelpers.notifyNew = async function (uid, type, result) {
 
 async function notifyUids(uid, uids, type, result) {
 	const post = result.posts[0];
-	const { tid } = post.topic;
-	const { cid } = post.topic;
+	const { tid, cid } = post.topic;
 	uids = await privileges.topics.filterUids('topics:read', tid, uids);
 	const watchStateUids = uids;
 
@@ -49,14 +48,28 @@ async function notifyUids(uid, uids, type, result) {
 
 	post.ip = undefined;
 
-	data.uidsTo.forEach((toUid) => {
-		post.categoryWatchState = categoryWatchStates[toUid];
-		post.topic.isFollowing = topicFollowState[toUid];
-		websockets.in(`uid_${toUid}`).emit('event:new_post', result);
-		if (result.topic && type === 'newTopic') {
-			websockets.in(`uid_${toUid}`).emit('event:new_topic', result.topic);
+	await Promise.all(data.uidsTo.map(async (toUid) => {
+		const copyResult = _.cloneDeep(result);
+		const postToUid = copyResult.posts[0];
+		postToUid.categoryWatchState = categoryWatchStates[toUid];
+		postToUid.topic.isFollowing = topicFollowState[toUid];
+
+		await plugins.hooks.fire('filter:sockets.sendNewPostToUid', {
+			uid: toUid,
+			uidFrom: uid,
+			post: postToUid,
+		});
+
+		websockets.in(`uid_${toUid}`).emit('event:new_post', copyResult);
+		if (copyResult.topic && type === 'newTopic') {
+			await plugins.hooks.fire('filter:sockets.sendNewTopicToUid', {
+				uid: toUid,
+				uidFrom: uid,
+				topic: copyResult.topic,
+			});
+			websockets.in(`uid_${toUid}`).emit('event:new_topic', copyResult.topic);
 		}
-	});
+	}));
 }
 
 async function getWatchStates(uids, tid, cid) {
diff --git a/src/user/follow.js b/src/user/follow.js
index f3b031a582..2fc74f1424 100644
--- a/src/user/follow.js
+++ b/src/user/follow.js
@@ -21,31 +21,37 @@ module.exports = function (User) {
 		if (parseInt(uid, 10) === parseInt(theiruid, 10)) {
 			throw new Error('[[error:you-cant-follow-yourself]]');
 		}
-		const exists = await User.exists(theiruid);
+		const [exists, isFollowing] = await Promise.all([
+			User.exists(theiruid),
+			User.isFollowing(uid, theiruid),
+		]);
 		if (!exists) {
 			throw new Error('[[error:no-user]]');
 		}
-		const isFollowing = await User.isFollowing(uid, theiruid);
+
+		await plugins.hooks.fire('filter:user.toggleFollow', {
+			type,
+			uid,
+			theiruid,
+			isFollowing,
+		});
+
 		if (type === 'follow') {
 			if (isFollowing) {
 				throw new Error('[[error:already-following]]');
 			}
 			const now = Date.now();
-			await Promise.all([
-				db.sortedSetAddBulk([
-					[`following:${uid}`, now, theiruid],
-					[`followers:${theiruid}`, now, uid],
-				]),
+			await db.sortedSetAddBulk([
+				[`following:${uid}`, now, theiruid],
+				[`followers:${theiruid}`, now, uid],
 			]);
 		} else {
 			if (!isFollowing) {
 				throw new Error('[[error:not-following]]');
 			}
-			await Promise.all([
-				db.sortedSetRemoveBulk([
-					[`following:${uid}`, theiruid],
-					[`followers:${theiruid}`, uid],
-				]),
+			await db.sortedSetRemoveBulk([
+				[`following:${uid}`, theiruid],
+				[`followers:${theiruid}`, uid],
 			]);
 		}
 
diff --git a/src/user/notifications.js b/src/user/notifications.js
index d35ba3ed26..1da0bd63cb 100644
--- a/src/user/notifications.js
+++ b/src/user/notifications.js
@@ -214,7 +214,7 @@ UserNotifications.sendTopicNotificationToFollowers = async function (uid, topicD
 
 		const notifObj = await notifications.create({
 			type: 'new-topic',
-			bodyShort: `[[notifications:user-posted-topic, ${postData.user.displayname}, ${title}]]`,
+			bodyShort: translator.compile('notifications:user-posted-topic', postData.user.displayname, title),
 			bodyLong: postData.content,
 			pid: postData.pid,
 			path: `/post/${postData.pid}`,

From 5af69dbcef43d7fa499741fa405203f1a1975c6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Mon, 15 Apr 2024 12:02:08 -0400
Subject: [PATCH 22/25] fix: if votes are not public, dont show upvoter names
 in tooltip

---
 public/src/client/topic/votes.js |  5 +++-
 src/socket.io/posts/votes.js     | 44 ++++++++++++++++++++------------
 2 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/public/src/client/topic/votes.js b/public/src/client/topic/votes.js
index 2ead12f804..b4365697ed 100644
--- a/public/src/client/topic/votes.js
+++ b/public/src/client/topic/votes.js
@@ -37,6 +37,9 @@ define('forum/topic/votes', [
 
 		socket.emit('posts.getUpvoters', [pid], function (err, data) {
 			if (err) {
+				if (err.message === '[[error:no-privileges]]') {
+					return;
+				}
 				return alerts.error(err);
 			}
 			if (_showTooltip[pid] && data.length) {
@@ -98,7 +101,7 @@ define('forum/topic/votes', [
 	};
 
 	Votes.showVotes = function (pid) {
-		socket.emit('posts.getVoters', { pid: pid, cid: ajaxify.data.cid }, function (err, data) {
+		socket.emit('posts.getVoters', { pid: pid }, function (err, data) {
 			if (err) {
 				if (err.message === '[[error:no-privileges]]') {
 					return;
diff --git a/src/socket.io/posts/votes.js b/src/socket.io/posts/votes.js
index 4c971efd82..3e1be2b5e3 100644
--- a/src/socket.io/posts/votes.js
+++ b/src/socket.io/posts/votes.js
@@ -10,14 +10,14 @@ const meta = require('../../meta');
 
 module.exports = function (SocketPosts) {
 	SocketPosts.getVoters = async function (socket, data) {
-		if (!data || !data.pid || !data.cid) {
+		if (!data || !data.pid) {
 			throw new Error('[[error:invalid-data]]');
 		}
-		const showDownvotes = !meta.config['downvote:disabled'];
-		const canSeeVotes = meta.config.votesArePublic || await privileges.categories.isAdminOrMod(data.cid, socket.uid);
-		if (!canSeeVotes) {
+		const cid = await posts.getCidByPid(data.pid);
+		if (!await canSeeVotes(socket.uid, cid)) {
 			throw new Error('[[error:no-privileges]]');
 		}
+		const showDownvotes = !meta.config['downvote:disabled'];
 		const [upvoteUids, downvoteUids] = await Promise.all([
 			db.getSetMembers(`pid:${data.pid}:upvote`),
 			showDownvotes ? db.getSetMembers(`pid:${data.pid}:downvote`) : [],
@@ -42,21 +42,12 @@ module.exports = function (SocketPosts) {
 			throw new Error('[[error:invalid-data]]');
 		}
 
-		const [cids, data, isAdmin] = await Promise.all([
-			posts.getCidsByPids(pids),
-			posts.getUpvotedUidsByPids(pids),
-			privileges.users.isAdministrator(socket.uid),
-		]);
-
-		if (!isAdmin) {
-			const isAllowed = await privileges.categories.isUserAllowedTo(
-				'topics:read', _.uniq(cids), socket.uid
-			);
-			if (isAllowed.includes(false)) {
-				throw new Error('[[error:no-privileges]]');
-			}
+		const cids = await posts.getCidsByPids(pids);
+		if ((await canSeeVotes(socket.uid, cids)).includes(false)) {
+			throw new Error('[[error:no-privileges]]');
 		}
 
+		const data = await posts.getUpvotedUidsByPids(pids);
 		if (!data.length) {
 			return [];
 		}
@@ -84,4 +75,23 @@ module.exports = function (SocketPosts) {
 		);
 		return result;
 	};
+
+	async function canSeeVotes(uid, cids) {
+		const isArray = Array.isArray(cids);
+		if (!isArray) {
+			cids = [cids];
+		}
+		const [canRead, isAdmin, isMod] = await Promise.all([
+			privileges.categories.isUserAllowedTo(
+				'topics:read', _.uniq(cids), uid
+			),
+			privileges.users.isAdministrator(uid),
+			privileges.users.isModerator(uid, cids),
+		]);
+
+		const checks = cids.map(
+			(cid, index) => isAdmin || isMod[index] || (canRead[index] && !!meta.config.votesArePublic)
+		);
+		return isArray ? checks : checks[0];
+	}
 };

From de0176ef8a4fdb68c0f52272cdf938516a4685be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Mon, 15 Apr 2024 12:10:36 -0400
Subject: [PATCH 23/25] fix: uniqCids

---
 src/socket.io/posts/votes.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/socket.io/posts/votes.js b/src/socket.io/posts/votes.js
index 3e1be2b5e3..968da304c3 100644
--- a/src/socket.io/posts/votes.js
+++ b/src/socket.io/posts/votes.js
@@ -81,16 +81,17 @@ module.exports = function (SocketPosts) {
 		if (!isArray) {
 			cids = [cids];
 		}
+		const uniqCids = _.uniq(cids);
 		const [canRead, isAdmin, isMod] = await Promise.all([
 			privileges.categories.isUserAllowedTo(
-				'topics:read', _.uniq(cids), uid
+				'topics:read', uniqCids, uid
 			),
 			privileges.users.isAdministrator(uid),
 			privileges.users.isModerator(uid, cids),
 		]);
-
+		const cidToAllowed = _.zip(uniqCids, canRead);
 		const checks = cids.map(
-			(cid, index) => isAdmin || isMod[index] || (canRead[index] && !!meta.config.votesArePublic)
+			(cid, index) => isAdmin || isMod[index] || (cidToAllowed[index] && !!meta.config.votesArePublic)
 		);
 		return isArray ? checks : checks[0];
 	}

From 8410cec797a5126a002097783b446c099de2febb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Wed, 17 Apr 2024 09:15:35 -0400
Subject: [PATCH 24/25] fix: index should be cid

---
 src/socket.io/posts/votes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/socket.io/posts/votes.js b/src/socket.io/posts/votes.js
index 968da304c3..10af3a284e 100644
--- a/src/socket.io/posts/votes.js
+++ b/src/socket.io/posts/votes.js
@@ -91,7 +91,7 @@ module.exports = function (SocketPosts) {
 		]);
 		const cidToAllowed = _.zip(uniqCids, canRead);
 		const checks = cids.map(
-			(cid, index) => isAdmin || isMod[index] || (cidToAllowed[index] && !!meta.config.votesArePublic)
+			(cid, index) => isAdmin || isMod[index] || (cidToAllowed[cid] && !!meta.config.votesArePublic)
 		);
 		return isArray ? checks : checks[0];
 	}

From 110ce66ac7dcc99c44c1b9417ed0b78015ce85f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Wed, 17 Apr 2024 09:21:30 -0400
Subject: [PATCH 25/25] fix: zipObject

---
 src/socket.io/posts/votes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/socket.io/posts/votes.js b/src/socket.io/posts/votes.js
index 10af3a284e..05e2ce5198 100644
--- a/src/socket.io/posts/votes.js
+++ b/src/socket.io/posts/votes.js
@@ -89,7 +89,7 @@ module.exports = function (SocketPosts) {
 			privileges.users.isAdministrator(uid),
 			privileges.users.isModerator(uid, cids),
 		]);
-		const cidToAllowed = _.zip(uniqCids, canRead);
+		const cidToAllowed = _.zipObject(uniqCids, canRead);
 		const checks = cids.map(
 			(cid, index) => isAdmin || isMod[index] || (cidToAllowed[cid] && !!meta.config.votesArePublic)
 		);