nodebb-plugin-dbsearch 5.0.0 → 5.0.4

package/lib/postgres.js

@@ -40,7 +40,7 @@ exports.createIndices = async function (language) {
 	}
 };
 
-exports.changeIndexLanguge = async function (language) {
+exports.changeIndexLanguage = async function (language) {
 	searchLanguage = language;
 	pubsub.publish('dbsearch-language-changed', language);
 	await db.pool.query('DROP INDEX "idx__searchtopic__content"');

package/lib/redis.js

@@ -26,7 +26,7 @@ exports.searchIndex = async function (key, data, ids) {
 };
 
 exports.search = async function (key, data, limit) {
-	const queryMethod = key === 'post' ? db.postSearch.query : db.topicSearch.query;
+	const queryMethod = key === 'post' ? db.postSearch : db.topicSearch;
 
 	const query = {
 		matchWords: data.matchWords,
@@ -37,7 +37,7 @@ exports.search = async function (key, data, limit) {
 		},
 	};
 
-	return await queryMethod(query, 0, limit - 1);
+	return await queryMethod.query(query, 0, limit - 1);
 };
 
 exports.searchRemove = async function (key, ids) {
@@ -46,5 +46,7 @@ exports.searchRemove = async function (key, ids) {
 	}
 	var method = key === 'post' ? db.postSearch : db.topicSearch;
 
-	await async.eachLimit(ids, 500, method.remove);
+	await async.eachLimit(ids, 500, async function (ids) {
+		await method.remove(ids);
+	});
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-dbsearch",
-  "version": "5.0.0",
+  "version": "5.0.4",
   "description": "A Plugin that lets users search posts and topics",
   "main": "index.js",
   "repository": {
@@ -18,7 +18,7 @@
   "author": "Baris Usakli <baris@designcreateplay.com>",
   "license": "BSD-2-Clause",
   "dependencies": {
-    "lodash": "4.17.19",
+    "lodash": "4.17.21",
     "redisearch": "^1.0.0"
   },
   "devDependencies": {

package/upgrades/dbsearch_change_mongodb_schema.js

@@ -1,49 +1,28 @@
 'use strict';
 
 
-const async = require.main.require('async');
 const winston = require.main.require('winston');
 const db = module.parent.require('./database');
 
 module.exports = {
 	name: 'Changing dbsearch mongodb search schema to use _id',
 	timestamp: Date.UTC(2018, 10, 26),
-	method: function (callback) {
+	method: async function () {
 		const nconf = require.main.require('nconf');
 		const isMongo = nconf.get('database') === 'mongo';
 		if (!isMongo) {
-			return callback();
+			return;
 		}
 
 		const plugin = require('../lib/dbsearch');
-		const client = db.client;
-
-		async.series([
-			function (next) {
-				client.collection('searchtopic').removeMany({}, next);
-			},
-			function (next) {
-				client.collection('searchpost').removeMany({}, next);
-			},
-			function (next) {
-				client.collection('searchtopic').dropIndex({ id: 1 }, function (err) {
-					if (err) {
-						winston.error(err);
-					}
-					next();
-				});
-			},
-			function (next) {
-				client.collection('searchpost').dropIndex({ id: 1 }, function (err) {
-					if (err) {
-						winston.error(err);
-					}
-					next();
-				});
-			},
-			async function () {
-				await plugin.reindex();
-			},
-		], callback);
+		await db.client.collection('searchtopic').deleteMany({});
+		await db.client.collection('searchpost').deleteMany({});
+		try {
+			await db.client.collection('searchtopic').dropIndex({ id: 1 });
+			await db.client.collection('searchpost').dropIndex({ id: 1 });
+		} catch (err) {
+			winston.error(err.stack);
+		}
+		await plugin.reindex();
 	},
 };