nodebb-plugin-dbsearch 6.3.5 → 6.4.1

package/lib/dbsearch.js

@@ -142,8 +142,24 @@ search.actionTopicDelete = async function (data) {
 	]);
 };
 
-search.actionTopicPurge = function (data) {
-	search.actionTopicDelete(data);
+search.actionTopicsPurge = async function (data) {
+	if (!data || !data.topics) {
+		return;
+	}
+	async function removeTidsPids() {
+		await Promise.all(data.topics.map(async (t) => {
+			batch.processSortedSet(`tid:${t.tid}:posts`, async (pids) => {
+				await searchRemove('post', pids);
+			}, {
+				batch: batchSize,
+			});
+		}));
+	}
+	await Promise.all([
+		searchRemove('topic', data.topics.map(t => t.tid)),
+		searchRemove('post', data.topics.map(t => t.mainPid)),
+		removeTidsPids(),
+	]);
 };
 
 search.actionTopicMove = function (data) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-dbsearch",
-  "version": "6.3.5",
+  "version": "6.4.1",
   "description": "A Plugin that lets users search posts and topics",
   "main": "index.js",
   "repository": {
@@ -19,15 +19,14 @@
   "author": "Baris Usakli <baris@designcreateplay.com>",
   "license": "BSD-2-Clause",
   "dependencies": {
-    "lodash": "4.17.21",
+    "lodash": "4.17.23",
     "redisearch": "^2.0.1"
   },
   "devDependencies": {
-    "eslint": "^9.25.1",
-    "eslint-config-nodebb": "^1.1.4",
-    "eslint-plugin-import": "^2.31.0"
+    "eslint": "^10.0.3",
+    "eslint-config-nodebb": "^2.0.1"
   },
   "nbbpm": {
-    "compatibility": "^4.5.0"
+    "compatibility": "^4.9.0"
   }
 }

package/plugin.json

@@ -26,7 +26,7 @@
         { "hook": "action:topic.restore", "method": "actionTopicRestore" },
         { "hook": "action:topic.edit", "method": "actionTopicEdit" },
         { "hook": "action:topic.delete", "method": "actionTopicDelete" },
-        { "hook": "action:topic.purge", "method": "actionTopicPurge" },
+        { "hook": "action:topics.purge", "method": "actionTopicsPurge" },
         { "hook": "action:topic.move", "method": "actionTopicMove" },
         { "hook": "action:topic.changeOwner", "method": "actionTopicChangeOwner" },
 

package/public/admin.js

@@ -3,8 +3,8 @@
 define('admin/plugins/dbsearch', [
 	'alerts', 'admin/settings',
 ], function (alerts, settings) {
-	var dbsearch = {};
-	var intervalId = 0;
+	const dbsearch = {};
+	let intervalId = 0;
 
 	$(window).on('action:ajaxify.end', function (ev, data) {
 		if (data.url === 'admin/plugins/dbsearch' && ajaxify.data.working) {
@@ -66,7 +66,7 @@ define('admin/plugins/dbsearch', [
 		});
 
 		$('#changeLanguage').on('click', function () {
-			var lang = $('#indexLanguage').val();
+			const lang = $('#indexLanguage').val();
 			alerts.success('Changing index language to "' + lang + '".');
 			socket.emit('admin.plugins.dbsearch.changeLanguage', lang, function (err) {
 				if (err) {
@@ -106,7 +106,7 @@ define('admin/plugins/dbsearch', [
 			$('.post-progress').css('width', progress.postsPercent + '%').text(progress.postsPercent + '%');
 			$('.message-progress').css('width', progress.messagesPercent + '%').text(progress.messagesPercent + '%');
 
-			var working = parseInt(progress.working, 10);
+			const working = parseInt(progress.working, 10);
 			if (!working) {
 				clearInterval(intervalId);
 				$('#reindex').removeAttr('disabled');