Merge commit '120b184e58497ddcf0434792db322e9d330bc58c' into v3.x

CHANGELOG.md

@@ -1,3 +1,71 @@
+#### v3.10.1 (2024-10-09)
+
+##### Chores
+
+*  up composer (a5f3d097)
+*  incrementing version number - v3.10.0 (b60a9b4e)
+*  update changelog for v3.10.0 (a9da495d)
+*  incrementing version number - v3.9.1 (f120c91c)
+*  incrementing version number - v3.9.0 (4880f32d)
+*  incrementing version number - v3.8.4 (4833f9a6)
+*  incrementing version number - v3.8.3 (97ce2c44)
+*  incrementing version number - v3.8.2 (72d91251)
+*  incrementing version number - v3.8.1 (527326f7)
+*  incrementing version number - v3.8.0 (e228a6eb)
+*  incrementing version number - v3.7.5 (6882894d)
+*  incrementing version number - v3.7.4 (6678744c)
+*  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
+
+* **deps:**  bump 2factor (712767f6)
+
+##### Refactors
+
+*  don't block ./nodebb upgrade if suggested modules are not loaded (39f57f9e)
+
 #### v3.10.0 (2024-09-25)
 
 ##### Chores

public/src/admin/manage/category.js

@@ -131,14 +131,14 @@ define('admin/manage/category', [
 								}, 1000);
 
 								api.del('/categories/' + ajaxify.data.category.cid).then(() => {
+									if (intervalId) {
+										clearInterval(intervalId);
+									}
+									modal.modal('hide');
+									alerts.success('[[admin/manage/categories:alert.purge-success]]');
 									setTimeout(() => {
-										if (intervalId) {
-											clearInterval(intervalId);
-										}
-										modal.modal('hide');
-										alerts.success('[[admin/manage/categories:alert.purge-success]]');
 										ajaxify.go('admin/manage/categories');
-									}, 5000);
+									}, 2500);
 								}).catch(alerts.error);
 
 								return false;

src/topics/create.js

@@ -165,8 +165,7 @@ module.exports = function (Topics) {
 
 	Topics.reply = async function (data) {
 		data = await plugins.hooks.fire('filter:topic.reply', data);
-		const { tid } = data;
-		const { uid } = data;
+		const { tid, uid } = data;
 
 		const [topicData, isAdmin] = await Promise.all([
 			Topics.getTopicData(tid),

src/topics/unread.js

@@ -198,7 +198,7 @@ module.exports = function (Topics) {
 		}
 		const cids = params.cid || await getWatchedTrackedCids(params.uid);
 		const keys = cids.map(cid => `cid:${cid}:tids:lastposttime`);
-		return await db.getSortedSetRevRangeByScoreWithScores(keys, 0, -1, '+inf', params.cutoff);
+		return await db.getSortedSetRevRangeByScoreWithScores(keys, 0, 200, '+inf', params.cutoff);
 	}
 
 	async function getWatchedTrackedCids(uid) {
@@ -217,7 +217,7 @@ module.exports = function (Topics) {
 			params.cid.map(cid => `cid:${cid}:tids:lastposttime`) :
 			'topics:recent';
 
-		const recentTopicData = await db.getSortedSetRevRangeByScoreWithScores(keys, 0, -1, '+inf', params.cutoff);
+		const recentTopicData = await db.getSortedSetRevRangeByScoreWithScores(keys, 0, 200, '+inf', params.cutoff);
 		const isFollowed = await db.isSortedSetMembers(`uid:${params.uid}:followed_tids`, recentTopicData.map(t => t.tid));
 		return recentTopicData.filter((t, i) => isFollowed[i]);
 	}

src/views/admin/manage/category.tpl

@@ -196,7 +196,7 @@
 					{{{ end }}}
 				</button>
 
-				<button class="btn btn-ghost btn-sm d-flex gap-2 align-items-center">
+				<button class="btn btn-ghost btn-sm d-flex gap-2 align-items-center purge">
 					<i class="fa fa-fw fa-trash text-danger"></i> [[admin/manage/categories:purge]]
 				</button>