flashii/misuzu
flashii/misuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added ability to filter search by topic.

Browse source
This commit is contained in:
flash 2025-02-11 02:41:49 +00:00
parent e1cb500f99
commit 6b2bfb726f
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
20250210 20250210.1

13
public-legacy/search.php
View file

@ -33,6 +33,11 @@ Template::addFunction('search_merge_query', function($attrs) use (&$searchQueryE
elseif(!empty($searchQueryEvaluated['after'])) elseif(!empty($searchQueryEvaluated['after']))
$existing[] = 'after:' . $searchQueryEvaluated['after']; $existing[] = 'after:' . $searchQueryEvaluated['after'];
if(!empty($attrs['topic']))
$existing[] = 'topic:' . $attrs['topic'];
elseif(!empty($searchQueryEvaluated['topic']))
$existing[] = 'topic:' . $searchQueryEvaluated['topic'];
$existing = array_merge($existing, array_unique(array_merge( $existing = array_merge($existing, array_unique(array_merge(
$searchQueryEvaluated['query'], $searchQueryEvaluated['query'],
empty($attrs['query']) ? [] : explode(' ', $attrs['query']) empty($attrs['query']) ? [] : explode(' ', $attrs['query'])
@ -41,7 +46,7 @@ Template::addFunction('search_merge_query', function($attrs) use (&$searchQueryE
return implode(' ', $existing); return implode(' ', $existing);
}); });
if(!empty($searchQuery)) { if(!empty($searchQuery)) {
$searchQueryAttributes = ['type', 'author', 'after']; $searchQueryAttributes = ['type', 'author', 'after', 'topic'];
$searchQueryParts = explode(' ', $searchQuery); $searchQueryParts = explode(' ', $searchQuery);
foreach($searchQueryParts as $queryPart) { foreach($searchQueryParts as $queryPart) {
$queryPart = trim($queryPart); $queryPart = trim($queryPart);
@ -141,8 +146,10 @@ if(!empty($searchQuery)) {
else else
$newsCategoryInfos[$categoryId] = $categoryInfo = $msz->news->getCategory(postInfo: $postInfo); $newsCategoryInfos[$categoryId] = $categoryInfo = $msz->news->getCategory(postInfo: $postInfo);
$commentsCount = $postInfo->commentsSectionId !== null $commentsCount = $msz->commentsCtx->posts->countPosts(
? $msz->comments->countPosts(categoryInfo: $postInfo->commentsSectionId, deleted: false) : 0; categoryName: $postInfo->commentsCategoryName,
deleted: false,
);
$newsPosts[] = [ $newsPosts[] = [
'post' => $postInfo, 'post' => $postInfo,

4
src/Forum/ForumPostsData.php
View file

@ -94,6 +94,7 @@ class ForumPostsData {
&& $searchQuery['type'] !== 'forum:post') && $searchQuery['type'] !== 'forum:post')
return []; return [];
$topicInfo = null;
$userInfo = null; $userInfo = null;
$deleted = false; $deleted = false;
$pagination = null; $pagination = null;
@ -101,6 +102,9 @@ class ForumPostsData {
$afterPostInfo = null; $afterPostInfo = null;
$newerThanDays = null; $newerThanDays = null;
if(!empty($searchQuery['topic']))
$topicInfo = $searchQuery['topic'];
if(!empty($searchQuery['author'])) if(!empty($searchQuery['author']))
$userInfo = $searchQuery['author']; $userInfo = $searchQuery['author'];