nodebb-plugin-dbsearch 6.5.0 → 7.0.0

package/lib/dbsearch.js

@@ -2,19 +2,19 @@
 
 const _ = require('lodash');
 
-const winston = require.main.require('winston');
-const nconf = require.main.require('nconf');
-
-const db = require.main.require('./src/database');
-const topics = require.main.require('./src/topics');
-const posts = require.main.require('./src/posts');
-const messaging = require.main.require('./src/messaging');
-const utils = require.main.require('./src/utils');
-const socketAdmin = require.main.require('./src/socket.io/admin');
-const batch = require.main.require('./src/batch');
-const plugins = require.main.require('./src/plugins');
-const categories = require.main.require('./src/categories');
-const pubsub = require.main.require('./src/pubsub');
+const winston = nodebb.require('winston');
+const nconf = nodebb.require('nconf');
+
+const db = nodebb.require('./src/database');
+const topics = nodebb.require('./src/topics');
+const posts = nodebb.require('./src/posts');
+const messaging = nodebb.require('./src/messaging');
+const utils = nodebb.require('./src/utils');
+const socketAdmin = nodebb.require('./src/socket.io/admin');
+const batch = nodebb.require('./src/batch');
+const plugins = nodebb.require('./src/plugins');
+const categories = nodebb.require('./src/categories');
+const pubsub = nodebb.require('./src/pubsub');
 
 const searchModule = require(`./${nconf.get('database')}`);
 
@@ -70,7 +70,7 @@ function convertLanguageName(name) {
 
 search.init = async function (params) {
 	const { router } = params;
-	const routeHelpers = require.main.require('./src/routes/helpers');
+	const routeHelpers = nodebb.require('./src/routes/helpers');
 	routeHelpers.setupAdminPageRoute(router, '/admin/plugins/dbsearch', renderAdmin);
 
 	router.post('/api/admin/plugins/dbsearch/save', params.middleware.applyCSRF, save);

package/lib/mongo.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const nconf = require.main.require('nconf');
+const nconf = nodebb.require('nconf');
 
-const db = require.main.require('./src/database');
+const db = nodebb.require('./src/database');
 
 const VALID_READ_PREFERENCES = [
 	'primary',

package/lib/postgres.js

@@ -1,10 +1,10 @@
 'use strict';
 
-const winston = require.main.require('winston');
-const nconf = require.main.require('nconf');
+const winston = nodebb.require('winston');
+const nconf = nodebb.require('nconf');
 
-const db = require.main.require('./src/database');
-const pubsub = require.main.require('./src/pubsub');
+const db = nodebb.require('./src/database');
+const pubsub = nodebb.require('./src/pubsub');
 
 let searchLanguage = 'english';
 

package/lib/redis.js

@@ -2,9 +2,9 @@
 
 const redisSearch = require('redisearch');
 
-const async = require.main.require('async');
+const async = nodebb.require('async');
 
-const db = require.main.require('./src/database');
+const db = nodebb.require('./src/database');
 
 exports.createIndices = async function () {
 	db.postSearch = redisSearch.createSearch('nodebbpostsearch', db.client);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-dbsearch",
-  "version": "6.5.0",
+  "version": "7.0.0",
   "description": "A Plugin that lets users search posts and topics",
   "main": "index.js",
   "repository": {
@@ -23,10 +23,10 @@
     "redisearch": "^2.0.1"
   },
   "devDependencies": {
-    "eslint": "^10.0.3",
-    "eslint-config-nodebb": "^2.0.1"
+    "eslint": "^10.4.1",
+    "eslint-config-nodebb": "^2.0.2"
   },
   "nbbpm": {
-    "compatibility": "^4.9.0"
+    "compatibility": "^4.14.0"
   }
 }

package/public/admin.js

@@ -1,8 +1,8 @@
 'use strict';
 
 define('admin/plugins/dbsearch', [
-	'alerts', 'admin/settings',
-], function (alerts, settings) {
+	'alerts', 'admin/settings', 'modals',
+], function (alerts, settings, modals) {
 	const dbsearch = {};
 	let intervalId = 0;
 
@@ -32,7 +32,7 @@ define('admin/plugins/dbsearch', [
 		});
 
 		$('#reindex').on('click', function () {
-			bootbox.confirm('Are you sure you want to reindex all content? This might take a while depending on the amount of content. During the operation the forum might slow down.', function (confirm) {
+			modals.confirm('Are you sure you want to reindex all content? This might take a while depending on the amount of content. During the operation the forum might slow down.', function (confirm) {
 				if (!confirm) {
 					return;
 				}
@@ -50,7 +50,7 @@ define('admin/plugins/dbsearch', [
 		});
 
 		$('#clear-index').on('click', function () {
-			bootbox.confirm('Are you sure you want to clear all indices? This might take a while depending on the amount of content. During the operation the forum might slow down.', function (confirm) {
+			modals.confirm('Are you sure you want to clear all indices? This might take a while depending on the amount of content. During the operation the forum might slow down.', function (confirm) {
 				if (!confirm) {
 					return;
 				}

package/templates/admin/plugins/dbsearch.tpl

@@ -57,11 +57,11 @@
 
 						<div class="mb-3">
 							<label class="form-label">Topic Limit</label>
-							<input id="topicLimit" type="text" class="form-control" placeholder="Number of topics to return" value="{topicLimit}">
+							<input id="topicLimit" type="number" class="form-control" placeholder="Number of topics to return" value="{topicLimit}">
 						</div>
 						<div class="mb-3">
 							<label class="form-label">Post Limit</label>
-							<input id="postLimit" type="text" class="form-control" placeholder="Number of posts to return" value="{postLimit}">
+							<input id="postLimit" type="number" class="form-control" placeholder="Number of posts to return" value="{postLimit}">
 						</div>
 
 						<!-- IF mongoBackend -->

package/upgrades/dbsearch_change_integer_index.js

@@ -8,13 +8,13 @@ module.exports = {
 	timestamp: Date.UTC(2025, 0, 27),
 	method: async function () {
 		const { progress } = this;
-		const nconf = require.main.require('nconf');
+		const nconf = nodebb.require('nconf');
 		const mainDB = nconf.get('database');
 		if (mainDB === 'redis') {
 			// redis is not affected, since everything is string already
 			return;
 		}
-		const batch = require.main.require('./src/batch');
+		const batch = nodebb.require('./src/batch');
 		async function convertIdToString(collection, docs) {
 			await batch.processArray(docs, async (docs) => {
 				await db.client.collection(collection).deleteMany({

package/upgrades/dbsearch_change_mongodb_schema.js

@@ -1,14 +1,14 @@
 'use strict';
 
 
-const winston = require.main.require('winston');
+const winston = nodebb.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: async function () {
-		const nconf = require.main.require('nconf');
+		const nconf = nodebb.require('nconf');
 		const isMongo = nconf.get('database') === 'mongo';
 		if (!isMongo) {
 			return;

package/upgrades/dbsearch_mongodb_ts_index.js

@@ -8,8 +8,8 @@ module.exports = {
 	timestamp: Date.UTC(2025, 1, 18),
 	method: async function () {
 		const { progress } = this;
-		const nconf = require.main.require('nconf');
-		const batch = require.main.require('./src/batch');
+		const nconf = nodebb.require('nconf');
+		const batch = nodebb.require('./src/batch');
 		const isMongo = nconf.get('database') === 'mongo';
 		if (!isMongo) {
 			return;

package/upgrades/dbsearch_psql_cid_text_index.js

@@ -7,7 +7,7 @@ module.exports = {
 	name: 'Changing integer cid index to text for psql',
 	timestamp: Date.UTC(2025, 6, 8),
 	method: async function () {
-		const nconf = require.main.require('nconf');
+		const nconf = nodebb.require('nconf');
 		const mainDB = nconf.get('database');
 		if (mainDB !== 'postgres') {
 			return;