Merge branch 'master' into develop

NodeBB · May 3, 2024 · db76b81 · db76b81
2 parents ffd6d56 + febeede
commit db76b81
Show file tree

Hide file tree

Showing 4 changed files with 140 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,139 @@
+#### v3.7.5 (2024-05-03)
+
+##### Chores
+
+*  incrementing version number - v3.7.4 (6678744c)
+*  update changelog for v3.7.4 (8a1b281b)
+*  incrementing version number - v3.7.3 (2d62b6f6)
+*  incrementing version number - v3.7.2 (cc257e7e)
+*  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
+
+*  #12543, use PATCH (420c8999)
+
+#### v3.7.4 (2024-04-17)
+
+##### Chores
+
+*  up harmony (18990795)
+*  up harmony (c2465a16)
+*  up themes (ba86740a)
+*  up themes (5d8a5571)
+*  incrementing version number - v3.7.3 (2d62b6f6)
+*  update changelog for v3.7.3 (8d450eea)
+*  incrementing version number - v3.7.2 (cc257e7e)
+*  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)
+
+##### New Features
+
+*  #12495, add unblock button to users on /blocks (afe597a2)
+
+##### Bug Fixes
+
+*  zipObject (110ce66a)
+*  index should be cid (8410cec7)
+*  uniqCids (de0176ef)
+*  if votes are not public, dont show upvoter names in tooltip (5af69dbc)
+*  add canView check to /api/v3/users/:uid (5bee324c)
+*  is user doesnt have view:users privilege (14f5774f)
+*  copy dropdown closing on copy ip/text/link (48281f96)
+*  align teaser avatar (5fcd1a8a)
+*  if you have chat:privileged the chat icons should show up (ca07e517)
+*  #12485, resolve flags on a topics posts on topic delete (d7256796)
+*  #12471, remove readable strings (0b1f2546)
+
+##### Refactors
+
+*  add new hooks for notifications/websockets (d2e042d1)
+*  move parseInt to filter (52e71522)
+*  better label for show to groups (cfd29db0)
+
+##### Tests
+
+*  update spec (6816e39b)
+*  fix tests and use action (acab46e6)
+
 #### v3.7.3 (2024-04-03)
 
 ##### Chores

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

diff --git a/public/src/modules/api.js b/public/src/modules/api.js
@@ -113,7 +113,7 @@ export function post(route, data, onSuccess) {
 export function patch(route, data, onSuccess) {
 	return call({
 		url: route,
-		method: 'patch',
+		method: 'PATCH',
 		data,
 		headers: {
 			'x-csrf-token': config.csrf_token,

diff --git a/src/socket.io/posts/votes.js b/src/socket.io/posts/votes.js
@@ -89,9 +89,9 @@ 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[index] && !!meta.config.votesArePublic)
+			(cid, index) => isAdmin || isMod[index] || (cidToAllowed[cid] && !!meta.config.votesArePublic)
 		);
 		return isArray ? checks : checks[0];
 	}