Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

link directly to matching comment from comment search results #1786

Merged
merged 2 commits into from
Aug 23, 2023
Merged

link directly to matching comment from comment search results #1786

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89cde0a
link directly to matching comment from comment search results
Jamiras Aug 23, 2023
c9911d8
Merge branch 'master' into comment_search_links
Jamiras Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions app/Helpers/database/search.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,14 +158,14 @@ function performSearch(
END AS Type,
cua.User AS ID,
CASE
WHEN c.articletype=" . ArticleType::Game . " THEN CONCAT('/game/', c.ArticleID)
WHEN c.articletype=" . ArticleType::Achievement . " THEN CONCAT('/achievement/', c.ArticleID)
WHEN c.articletype=" . ArticleType::Leaderboard . " THEN CONCAT('/leaderboardinfo.php?i=', c.ArticleID)
WHEN c.articletype=" . ArticleType::AchievementTicket . " THEN CONCAT('/ticketmanager.php?i=', c.ArticleID)
WHEN c.articletype=" . ArticleType::User . " THEN CONCAT('/user/', ua.User)
WHEN c.articletype=" . ArticleType::UserModeration . " THEN CONCAT('/user/', ua.User)
WHEN c.articletype=" . ArticleType::GameHash . " THEN CONCAT('/managehashes.php?g=', c.ArticleID)
WHEN c.articletype=" . ArticleType::SetClaim . " THEN CONCAT('/manageclaims.php?g=', c.ArticleID)
WHEN c.articletype=" . ArticleType::Game . " THEN CONCAT('/game/', c.ArticleID, '#comment_', c.ID)
WHEN c.articletype=" . ArticleType::Achievement . " THEN CONCAT('/achievement/', c.ArticleID, '#comment_', c.ID)
WHEN c.articletype=" . ArticleType::Leaderboard . " THEN CONCAT('/leaderboardinfo.php?i=', c.ArticleID, '#comment_', c.ID)
WHEN c.articletype=" . ArticleType::AchievementTicket . " THEN CONCAT('/ticketmanager.php?i=', c.ArticleID, '#comment_', c.ID)
WHEN c.articletype=" . ArticleType::User . " THEN CONCAT('/user/', ua.User, '#comment_', c.ID)
WHEN c.articletype=" . ArticleType::UserModeration . " THEN CONCAT('/user/', ua.User, '#comment_', c.ID)
WHEN c.articletype=" . ArticleType::GameHash . " THEN CONCAT('/managehashes.php?g=', c.ArticleID, '#comment_', c.ID)
WHEN c.articletype=" . ArticleType::SetClaim . " THEN CONCAT('/manageclaims.php?g=', c.ArticleID, '#comment_', c.ID)
ELSE CONCAT(c.articletype, '/', c.ArticleID)
END AS Target,
CASE
Expand All @@ -174,7 +174,7 @@ function performSearch(
END AS Title
FROM Comment AS c
LEFT JOIN UserAccounts AS cua ON cua.ID=c.UserID
LEFT JOIN UserAccounts AS ua ON ua.ID=c.ArticleID AND c.articletype=" . ArticleType::User . "
LEFT JOIN UserAccounts AS ua ON ua.ID=c.ArticleID AND c.articletype in (" . ArticleType::User . "," . ArticleType::UserModeration . ")
WHERE c.Payload LIKE '%$searchQuery%'
AND cua.User != 'Server' AND c.articletype IN (" . implode(',', $articleTypes) . ")
AND ua.Deleted IS NULL AND (ua.UserWallActive OR ua.UserWallActive IS NULL)
Expand Down
Loading