nodebb-plugin-dbsearch 6.2.5 → 6.2.6

package/lib/mongo.js

@@ -36,8 +36,6 @@ exports.searchIndex = async function (key, data, ids) {
 		return;
 	}
 
-	ids = ids.map(id => parseInt(id, 10));
-
 	const bulk = db.client.collection(`search${key}`).initializeUnorderedBulkOp();
 	ids.forEach((id, index) => {
 		const setData = {};
@@ -47,7 +45,7 @@ exports.searchIndex = async function (key, data, ids) {
 			}
 		});
 
-		bulk.find({ _id: id }).upsert().updateOne({ $set: setData });
+		bulk.find({ _id: String(id) }).upsert().updateOne({ $set: setData });
 	});
 
 	await bulk.execute();
@@ -100,9 +98,7 @@ exports.searchRemove = async function (key, ids) {
 		return;
 	}
 
-	ids = ids.map(id => parseInt(id, 10));
-
-	await db.client.collection(`search${key}`).deleteMany({ _id: { $in: ids } });
+	await db.client.collection(`search${key}`).deleteMany({ _id: { $in: ids.map(String) } });
 };
 
 exports.chat = {};
@@ -111,13 +107,11 @@ exports.chat.index = async (data, ids) => {
 		return;
 	}
 
-	ids = ids.map(id => parseInt(id, 10));
-
 	const bulk = db.client.collection(`searchchat`).initializeUnorderedBulkOp();
 	ids.forEach((id, index) => {
 		const d = data[index];
 		if (d && d.content && d.uid && d.roomId) {
-			bulk.find({ _id: id }).upsert().updateOne({
+			bulk.find({ _id: String(id) }).upsert().updateOne({
 				$set: {
 					content: String(d.content),
 					roomId: String(d.roomId),

package/lib/postgres.js

@@ -13,17 +13,17 @@ pubsub.on('dbsearch-language-changed', (e) => {
 });
 
 async function initDB() {
-	await db.pool.query('CREATE TABLE IF NOT EXISTS "searchtopic" ( "id" BIGINT NOT NULL PRIMARY KEY, "content" TEXT, "uid" BIGINT, "cid" BIGINT )');
+	await db.pool.query('CREATE TABLE IF NOT EXISTS "searchtopic" ( "id" TEXT NOT NULL PRIMARY KEY, "content" TEXT, "uid" TEXT, "cid" BIGINT )');
 	await db.pool.query(`CREATE INDEX IF NOT EXISTS "idx__searchtopic__content" ON "searchtopic" USING GIN (to_tsvector('${searchLanguage}', "content"))`);
 	await db.pool.query('CREATE INDEX IF NOT EXISTS "idx__searchtopic__uid" ON "searchtopic"("uid")');
 	await db.pool.query('CREATE INDEX IF NOT EXISTS "idx__searchtopic__cid" ON "searchtopic"("cid")');
 
-	await db.pool.query('CREATE TABLE IF NOT EXISTS "searchpost" ( "id" BIGINT NOT NULL PRIMARY KEY, "content" TEXT, "uid" BIGINT, "cid" BIGINT )');
+	await db.pool.query('CREATE TABLE IF NOT EXISTS "searchpost" ( "id" TEXT NOT NULL PRIMARY KEY, "content" TEXT, "uid" TEXT, "cid" BIGINT )');
 	await db.pool.query(`CREATE INDEX IF NOT EXISTS "idx__searchpost__content" ON "searchpost" USING GIN (to_tsvector('${searchLanguage}', "content"))`);
 	await db.pool.query('CREATE INDEX IF NOT EXISTS "idx__searchpost__uid" ON "searchpost"("uid")');
 	await db.pool.query('CREATE INDEX IF NOT EXISTS "idx__searchpost__cid" ON "searchpost"("cid")');
 
-	await db.pool.query('CREATE TABLE IF NOT EXISTS "searchchat" ( "id" BIGINT NOT NULL PRIMARY KEY, "content" TEXT, "rid" BIGINT, "uid" BIGINT )');
+	await db.pool.query('CREATE TABLE IF NOT EXISTS "searchchat" ( "id" TEXT NOT NULL PRIMARY KEY, "content" TEXT, "rid" BIGINT, "uid" TEXT )');
 	await db.pool.query(`CREATE INDEX IF NOT EXISTS "idx__searchchat__content" ON "searchchat" USING GIN (to_tsvector('${searchLanguage}', "content"))`);
 	await db.pool.query('CREATE INDEX IF NOT EXISTS "idx__searchchat__rid" ON "searchchat"("rid")');
 	await db.pool.query('CREATE INDEX IF NOT EXISTS "idx__searchchat__uid" ON "searchchat"("uid")');
@@ -64,11 +64,11 @@ exports.searchIndex = async function (key, data, ids) {
 		return;
 	}
 
-	ids = ids.map(id => parseInt(id, 10));
+	ids = ids.map(String);
 	try {
 		await db.pool.query({
 			name: `dbsearch-searchIndex-${key}`,
-			text: `INSERT INTO "search${key}" SELECT d."id", d."data"->>'content' "content", (d."data"->>'uid')::bigint "uid", (d."data"->>'cid')::bigint "cid" FROM UNNEST($1::bigint[], $2::jsonb[]) d("id", "data") ON CONFLICT ("id") DO UPDATE SET "content" = COALESCE(EXCLUDED."content", "search${key}"."content"), "uid" = COALESCE(EXCLUDED."uid", "search${key}"."uid"), "cid" = COALESCE(EXCLUDED."cid", "search${key}"."cid")`,
+			text: `INSERT INTO "search${key}" SELECT d."id", d."data"->>'content' "content", (d."data"->>'uid')::text "uid", (d."data"->>'cid')::bigint "cid" FROM UNNEST($1::text[], $2::jsonb[]) d("id", "data") ON CONFLICT ("id") DO UPDATE SET "content" = COALESCE(EXCLUDED."content", "search${key}"."content"), "uid" = COALESCE(EXCLUDED."uid", "search${key}"."uid"), "cid" = COALESCE(EXCLUDED."cid", "search${key}"."cid")`,
 			values: [ids, data],
 		});
 	} catch (err) {
@@ -93,7 +93,7 @@ exports.search = async function (key, data, limit) {
 	try {
 		const res = await db.pool.query({
 			name: `dbsearch-search-${key}`,
-			text: `SELECT ARRAY(SELECT s."id" FROM "search${key}" s WHERE ($1::text IS NULL OR to_tsvector($5::regconfig, "content") @@ plainto_tsquery($5::regconfig, $1::text)) AND ($2::bigint[] IS NULL OR "uid" = ANY($2::bigint[])) AND ($3::bigint[] IS NULL OR "cid" = ANY($3::bigint[])) ORDER BY ts_rank_cd(to_tsvector($5::regconfig, "content"), plainto_tsquery($5::regconfig, $1::text)) DESC, s."id" ASC LIMIT $4::integer) r`,
+			text: `SELECT ARRAY(SELECT s."id" FROM "search${key}" s WHERE ($1::text IS NULL OR to_tsvector($5::regconfig, "content") @@ plainto_tsquery($5::regconfig, $1::text)) AND ($2::text[] IS NULL OR "uid" = ANY($2::text[])) AND ($3::bigint[] IS NULL OR "cid" = ANY($3::bigint[])) ORDER BY ts_rank_cd(to_tsvector($5::regconfig, "content"), plainto_tsquery($5::regconfig, $1::text)) DESC, s."id" ASC LIMIT $4::integer) r`,
 			values: [data.content, data.uid, data.cid, parseInt(limit, 10), searchLanguage],
 		});
 		return res.rows[0].r;
@@ -108,11 +108,11 @@ exports.searchRemove = async function (key, ids) {
 		return;
 	}
 
-	ids = ids.map(id => parseInt(id, 10));
+	ids = ids.map(String);
 	try {
 		await db.pool.query({
 			name: `dbsearch-searchRemove-${key}`,
-			text: `DELETE FROM "search${key}" s WHERE s."id" = ANY($1::bigint[])`,
+			text: `DELETE FROM "search${key}" s WHERE s."id" = ANY($1::text[])`,
 			values: [ids],
 		});
 	} catch (err) {
@@ -126,11 +126,11 @@ exports.chat.index = async (data, ids) => {
 		return;
 	}
 
-	ids = ids.map(id => parseInt(id, 10));
+	ids = ids.map(String);
 	try {
 		await db.pool.query({
 			name: `dbsearch-searchIndex-chat`,
-			text: `INSERT INTO "searchchat" SELECT d."id", d."data"->>'content' "content", (d."data"->>'uid')::bigint "uid", (d."data"->>'roomId')::bigint "rid" FROM UNNEST($1::bigint[], $2::jsonb[]) d("id", "data") ON CONFLICT ("id") DO UPDATE SET "content" = COALESCE(EXCLUDED."content", "searchchat"."content"), "uid" = COALESCE(EXCLUDED."uid", "searchchat"."uid"), "rid" = COALESCE(EXCLUDED."rid", "searchchat"."rid")`,
+			text: `INSERT INTO "searchchat" SELECT d."id", d."data"->>'content' "content", (d."data"->>'uid')::text "uid", (d."data"->>'roomId')::bigint "rid" FROM UNNEST($1::text[], $2::jsonb[]) d("id", "data") ON CONFLICT ("id") DO UPDATE SET "content" = COALESCE(EXCLUDED."content", "searchchat"."content"), "uid" = COALESCE(EXCLUDED."uid", "searchchat"."uid"), "rid" = COALESCE(EXCLUDED."rid", "searchchat"."rid")`,
 			values: [ids, data],
 		});
 	} catch (err) {
@@ -155,7 +155,7 @@ exports.chat.search = async (data, limit) => {
 	try {
 		const res = await db.pool.query({
 			name: `dbsearch-search-chat`,
-			text: `SELECT ARRAY(SELECT s."id" FROM "searchchat" s WHERE ($1::text IS NULL OR to_tsvector($5::regconfig, "content") @@ plainto_tsquery($5::regconfig, $1::text)) AND ($2::bigint[] IS NULL OR "uid" = ANY($2::bigint[])) AND ($3::bigint[] IS NULL OR "rid" = ANY($3::bigint[])) ORDER BY ts_rank_cd(to_tsvector($5::regconfig, "content"), plainto_tsquery($5::regconfig, $1::text)) DESC, s."id" ASC LIMIT $4::integer) r`,
+			text: `SELECT ARRAY(SELECT s."id" FROM "searchchat" s WHERE ($1::text IS NULL OR to_tsvector($5::regconfig, "content") @@ plainto_tsquery($5::regconfig, $1::text)) AND ($2::text[] IS NULL OR "uid" = ANY($2::text[])) AND ($3::bigint[] IS NULL OR "rid" = ANY($3::bigint[])) ORDER BY ts_rank_cd(to_tsvector($5::regconfig, "content"), plainto_tsquery($5::regconfig, $1::text)) DESC, s."id" ASC LIMIT $4::integer) r`,
 			values: [data.content, data.uid, data.roomId, parseInt(limit, 10), searchLanguage],
 		});
 		return res.rows[0].r;

package/package.json

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

package/plugin.json

@@ -5,7 +5,8 @@
     "url": "https://github.com/barisusakli/nodebb-plugin-dbsearch",
     "library": "./index.js",
     "upgrades": [
-        "upgrades/dbsearch_change_mongodb_schema.js"
+        "upgrades/dbsearch_change_mongodb_schema.js",
+        "upgrades/dbsearch_change_integer_index.js"
     ],
     "hooks": [
         { "hook": "static:app.load", "method": "init" },

package/upgrades/dbsearch_change_integer_index.js

@@ -0,0 +1,60 @@
+'use strict';
+
+
+const db = module.parent.require('./database');
+
+module.exports = {
+	name: 'Changing integer search indices to string',
+	timestamp: Date.UTC(2025, 0, 27),
+	method: async function () {
+		const { progress } = this;
+		const nconf = require.main.require('nconf');
+		const mainDB = nconf.get('database');
+		if (mainDB === 'redis') {
+			// redis is not affected, since everything is string already
+			return;
+		}
+
+		async function convertIdToString(collection, docs) {
+			for (const doc of docs) {
+				if (doc._id) {
+					const stringId = doc._id.toString();
+					// eslint-disable-next-line no-await-in-loop
+					await db.client.collection(collection).insertOne({
+						...doc,
+						_id: stringId,
+					});
+
+					// eslint-disable-next-line no-await-in-loop
+					await db.client.collection(collection).deleteOne({ _id: doc._id });
+				}
+				progress.incr(1);
+			}
+		}
+
+		if (mainDB === 'mongo') {
+			const topics = await db.client.collection('searchtopic').find({}).toArray();
+			const posts = await db.client.collection('searchposts').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('searchchat', chats);
+
+			return;
+		}
+
+		if (mainDB === 'postgres') {
+			await db.client.query('ALTER TABLE searchtopic ALTER COLUMN id TYPE text USING id::bigint');
+			await db.client.query('ALTER TABLE searchtopic ALTER COLUMN uid TYPE text USING uid::bigint');
+
+			await db.client.query('ALTER TABLE searchpost ALTER COLUMN id TYPE text USING id::bigint');
+			await db.client.query('ALTER TABLE searchpost ALTER COLUMN uid TYPE text USING uid::bigint');
+
+			await db.client.query('ALTER TABLE searchchat ALTER COLUMN id TYPE text USING id::bigint');
+			await db.client.query('ALTER TABLE searchchat ALTER COLUMN uid TYPE text USING uid::bigint');
+		}
+	},
+};