Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-26 16:41:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: move record to controller

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2021-10-25 16:32:35 -04:00
parent f4cf482a87
commit ee8e048015
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/controllers/search.js
View File

@@ -66,6 +66,7 @@ searchController.search = async function (req, res, next) {
const [searchData, categoriesData] = await Promise.all([ const [searchData, categoriesData] = await Promise.all([
search.search(data), search.search(data),
recordSearch(data);
buildCategories(req.uid, searchOnly), buildCategories(req.uid, searchOnly),
]); ]);
@@ -95,6 +96,14 @@ searchController.search = async function (req, res, next) {
res.render('search', searchData); res.render('search', searchData);
}; };
async function recordSearch(data) {
const { query, searchIn } = data;
const cleanedQuery = String(query).trim().toLowerCase().substr(0, 255);
if (['titles', 'titlesposts', 'posts'].includes(searchIn) && cleanedQuery.length > 2) {
await db.sortedSetIncrBy('searches:all', 1, cleanedQuery);
}
}
async function buildCategories(uid, searchOnly) { async function buildCategories(uid, searchOnly) {
if (searchOnly) { if (searchOnly) {
return []; return [];

8
src/search.js
View File

@@ -45,7 +45,6 @@ async function searchInContent(data) {
async function doSearch(type, searchIn) { async function doSearch(type, searchIn) {
if (searchIn.includes(data.searchIn)) { if (searchIn.includes(data.searchIn)) {
await recordSearch(data.query);
return await plugins.hooks.fire('filter:search.query', { return await plugins.hooks.fire('filter:search.query', {
index: type, index: type,
content: data.query, content: data.query,
@@ -95,13 +94,6 @@ async function searchInContent(data) {
return Object.assign(returnData, metadata); return Object.assign(returnData, metadata);
} }
async function recordSearch(query) {
const cleanedQuery = String(query).trim().toLowerCase().substr(0, 255);
if (cleanedQuery.length > 2) {
await db.sortedSetIncrBy('searches:all', 1, cleanedQuery);
}
}
async function filterAndSort(pids, data) { async function filterAndSort(pids, data) {
if (data.sortBy === 'relevance' && !data.replies && !data.timeRange && !data.hasTags && !plugins.hooks.hasListeners('filter:search.filterAndSort')) { if (data.sortBy === 'relevance' && !data.replies && !data.timeRange && !data.hasTags && !plugins.hooks.hasListeners('filter:search.filterAndSort')) {
return pids; return pids;