nodebb-plugin-dbsearch 6.2.9 → 6.2.11

package/lib/dbsearch.js

@@ -264,7 +264,7 @@ search.reindex = async function () {
 
 async function reIndexTopics() {
 	await batch.processSortedSet('topics:tid', async (tids) => {
-		const topicData = await topics.getTopicsFields(tids, ['tid', 'title', 'uid', 'cid', 'deleted']);
+		const topicData = await topics.getTopicsFields(tids, ['tid', 'title', 'uid', 'cid', 'deleted', 'timestamp']);
 		await topicsSave(topicData);
 	}, {
 		batch: batchSize,
@@ -288,6 +288,9 @@ async function topicsSave(topics) {
 		if (topicData.uid) {
 			indexData.uid = topicData.uid;
 		}
+		if (topicData.timestamp) {
+			indexData.timestamp = topicData.timestamp;
+		}
 		if (!Object.keys(indexData).length) {
 			return null;
 		}
@@ -307,7 +310,7 @@ async function topicsSave(topics) {
 
 async function reIndexPosts() {
 	await batch.processSortedSet('posts:pid', async (pids) => {
-		let postData = await posts.getPostsFields(pids, ['pid', 'content', 'uid', 'tid', 'deleted']);
+		let postData = await posts.getPostsFields(pids, ['pid', 'content', 'uid', 'tid', 'deleted', 'timestamp']);
 		postData = postData.filter(p => p && p.deleted !== 1);
 		const tids = _.uniq(postData.map(p => p.tid));
 		const topicData = await topics.getTopicsFields(tids, ['deleted', 'cid']);
@@ -341,6 +344,9 @@ async function postsSave(posts) {
 		if (postData.uid) {
 			indexData.uid = postData.uid;
 		}
+		if (postData.timestamp) {
+			indexData.timestamp = postData.timestamp;
+		}
 		if (!Object.keys(indexData).length) {
 			return null;
 		}
@@ -369,7 +375,7 @@ async function reIndexMessages() {
 }
 
 async function messagesSave(msgs) {
-	msgs = msgs.filter(m => m && m.mid && parseInt(m.deleted, 10) !== 1 && parseInt(m.system, 10) !== 1);
+	msgs = msgs.filter(m => m && utils.isNumber(m.mid) && parseInt(m.deleted, 10) !== 1 && parseInt(m.system, 10) !== 1);
 
 	let data = msgs.map((msgData) => {
 		const indexData = {};
@@ -400,6 +406,7 @@ async function messagesSave(msgs) {
 }
 
 async function searchRemove(key, ids) {
+	ids = ids.filter(id => id && utils.isNumber(id));
 	await db.searchRemove(key, ids);
 	if (key === 'topic') {
 		await db.incrObjectFieldBy('nodebb-plugin-dbsearch', 'topicsIndexed', -ids.length);
@@ -415,7 +422,7 @@ async function reIndexTids(tids) {
 		return;
 	}
 
-	let topicData = await topics.getTopicsFields(tids, ['tid', 'title', 'uid', 'cid', 'deleted', 'mainPid']);
+	let topicData = await topics.getTopicsFields(tids, ['tid', 'title', 'uid', 'cid', 'deleted', 'mainPid', 'timestamp']);
 	topicData = topicData.filter(t => t.tid && t.deleted !== 1);
 	if (!topicData.length) {
 		return;
@@ -448,7 +455,7 @@ async function reIndexPids(pids, topic) {
 	if (parseInt(topic.deleted, 10) === 1) {
 		return;
 	}
-	const postData = await posts.getPostsFields(pids, ['pid', 'content', 'uid', 'tid', 'deleted']);
+	const postData = await posts.getPostsFields(pids, ['pid', 'content', 'uid', 'tid', 'deleted', 'timestamp']);
 	postData.forEach((post) => {
 		if (post && topic) {
 			post.cid = topic.cid;

package/lib/mongo.js

@@ -12,7 +12,9 @@ exports.createIndices = async function (language) {
 
 	if (nconf.get('isPrimary') && !nconf.get('jobsDisabled')) {
 		await db.client.collection('searchtopic').createIndex({ content: 'text', uid: 1, cid: 1 }, options);
+		await db.client.collection('searchtopic').createIndex({ ts: 1 }, options);
 		await db.client.collection('searchpost').createIndex({ content: 'text', uid: 1, cid: 1 }, options);
+		await db.client.collection('searchpost').createIndex({ ts: 1 }, options);
 		await db.client.collection('searchchat').createIndex({ content: 'text', roomId: 1, uid: 1 }, options);
 	}
 };
@@ -41,7 +43,11 @@ exports.searchIndex = async function (key, data, ids) {
 		const setData = {};
 		Object.keys(data[index]).forEach((field) => {
 			if (data[index].hasOwnProperty(field) && data[index][field]) {
-				setData[field] = data[index][field].toString();
+				if (field === 'timestamp') {
+					setData.ts = parseInt(data[index][field], 10);
+				} else {
+					setData[field] = data[index][field].toString();
+				}
 			}
 		});
 
@@ -73,15 +79,25 @@ exports.search = async function (key, data, limit) {
 		}
 	}
 
+	if (data.searchData.timeFilter && data.searchData.timeRange) {
+		const timeRange = parseInt(data.searchData.timeRange, 10) * 1000;
+		if (timeRange) {
+			const ts = Date.now() - timeRange;
+			searchQuery.ts = data.searchData.timeFilter === 'newer' ?
+				{ $gte: ts } :
+				{ $lte: ts };
+		}
+	}
+
 	const aggregate = [{ $match: searchQuery }];
 	if (searchQuery.$text) {
 		const sortQuery = { score: { $meta: 'textScore' } };
 		if (data.searchData.sortBy === 'timestamp' || data.searchData.sortBy === 'topic.timestamp') {
-			sortQuery._id = data.searchData.sortDirection === 'asc' ? 1 : -1;
+			sortQuery.ts = data.searchData.sortDirection === 'asc' ? 1 : -1;
 		}
 		aggregate.push({ $sort: sortQuery });
 	} else {
-		aggregate.push({ $sort: { _id: data.searchData.sortDirection === 'asc' ? 1 : -1 } });
+		aggregate.push({ $sort: { ts: data.searchData.sortDirection === 'asc' ? 1 : -1 } });
 	}
 	aggregate.push({ $limit: parseInt(limit, 10) });
 	aggregate.push({ $project: { _id: 1 } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-dbsearch",
-  "version": "6.2.9",
+  "version": "6.2.11",
   "description": "A Plugin that lets users search posts and topics",
   "main": "index.js",
   "repository": {

package/plugin.json

@@ -6,7 +6,8 @@
     "library": "./index.js",
     "upgrades": [
         "upgrades/dbsearch_change_mongodb_schema.js",
-        "upgrades/dbsearch_change_integer_index.js"
+        "upgrades/dbsearch_change_integer_index.js",
+        "upgrades/dbsearch_mongodb_ts_index.js"
     ],
     "hooks": [
         { "hook": "static:app.load", "method": "init" },

package/upgrades/dbsearch_change_integer_index.js

@@ -33,13 +33,13 @@ module.exports = {
 
 		if (mainDB === 'mongo') {
 			const topics = await db.client.collection('searchtopic').find({}).toArray();
-			const posts = await db.client.collection('searchposts').find({}).toArray();
+			const posts = await db.client.collection('searchpost').find({}).toArray();
 			const chats = await db.client.collection('searchchat').find({}).toArray();
 
 			progress.total = topics.length + posts.length + chats.length;
 
 			await convertIdToString('searchtopic', topics);
-			await convertIdToString('searchposts', posts);
+			await convertIdToString('searchpost', posts);
 			await convertIdToString('searchchat', chats);
 
 			return;

package/upgrades/dbsearch_mongodb_ts_index.js

@@ -0,0 +1,51 @@
+'use strict';
+
+
+const db = module.parent.require('./database');
+
+module.exports = {
+	name: 'Add timestamp field to searchtopic searchpost collections',
+	timestamp: Date.UTC(2025, 1, 18),
+	method: async function () {
+		const { progress } = this;
+		const nconf = require.main.require('nconf');
+		const isMongo = nconf.get('database') === 'mongo';
+		if (!isMongo) {
+			return;
+		}
+
+		async function addTsField(collection, docs) {
+			for (const doc of docs) {
+				if (doc._id) {
+					const stringId = doc._id;
+					let ts = 0;
+					if (collection === 'searchtopic') {
+						// eslint-disable-next-line no-await-in-loop
+						ts = await db.getObjectField(`topic:${stringId}`, 'timestamp');
+					} else if (collection === 'searchpost') {
+						// eslint-disable-next-line no-await-in-loop
+						ts = await db.getObjectField(`post:${stringId}`, 'timestamp');
+					}
+					ts = parseInt(ts, 10);
+					if (ts) {
+						// eslint-disable-next-line no-await-in-loop
+						await db.client.collection(collection).updateOne({
+							_id: stringId,
+						}, { $set: { ts } });
+					}
+				}
+				progress.incr(1);
+			}
+		}
+		await db.client.collection('searchtopic').createIndex({ ts: 1 }, { });
+		await db.client.collection('searchpost').createIndex({ ts: 1 }, { });
+
+		const topics = await db.client.collection('searchtopic').find({}).toArray();
+		const posts = await db.client.collection('searchpost').find({}).toArray();
+
+		progress.total = topics.length + posts.length;
+
+		await addTsField('searchtopic', topics);
+		await addTsField('searchpost', posts);
+	},
+};