Mirror/MarginaliaSearch
1
0
Fork 0
mirror of https://github.com/MarginaliaSearch/MarginaliaSearch.git synced 2025-02-24 13:19:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(search) Fix broken redirect for flagging problems with websites

Browse Source
This commit is contained in:
Viktor Lofgren 2023-10-27 11:20:49 +02:00
parent c7cb6664b4
commit aeaf2d546a
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
code/services-application/search-service/src/main/java/nu/marginalia/search/SearchService.java
View File

@ -48,7 +48,6 @@ public class SearchService extends Service {
Gson gson = GsonFactory.get(); Gson gson = GsonFactory.get();
Spark.get("/public/search", searchQueryService::pathSearch); Spark.get("/public/search", searchQueryService::pathSearch);
Spark.get("/public/site-search/:site/*", this::siteSearchRedir);
Spark.get("/public/", frontPageService::render); Spark.get("/public/", frontPageService::render);
Spark.get("/public/news.xml", frontPageService::renderNewsFeed); Spark.get("/public/news.xml", frontPageService::renderNewsFeed);
Spark.get("/public/:resource", this::serveStatic); Spark.get("/public/:resource", this::serveStatic);
@ -57,9 +56,8 @@ public class SearchService extends Service {
Spark.get("/public/site/flag-site/:domainId", flagSiteService::flagSiteForm); Spark.get("/public/site/flag-site/:domainId", flagSiteService::flagSiteForm);
Spark.post("/public/site/flag-site/:domainId", flagSiteService::flagSiteAction); Spark.post("/public/site/flag-site/:domainId", flagSiteService::flagSiteAction);
Spark.get("/public/site-search/:site/*", this::siteSearchRedir);
Spark.get("/site-search/:site/*", this::siteSearchRedir); Spark.get("/public/site/:site", this::siteSearchRedir);
Spark.exception(Exception.class, (e,p,q) -> { Spark.exception(Exception.class, (e,p,q) -> {
logger.error("Error during processing", e); logger.error("Error during processing", e);
@ -77,14 +75,17 @@ public class SearchService extends Service {
private Object siteSearchRedir(Request request, Response response) { private Object siteSearchRedir(Request request, Response response) {
final String site = request.params("site"); final String site = request.params("site");
final String queryRaw = request.splat()[0]; final String searchTerms;
final String query = URLEncoder.encode(String.format("%s site:%s", queryRaw, site), StandardCharsets.UTF_8); if (request.splat().length == 0) searchTerms = "";
else searchTerms = request.splat()[0];
final String query = URLEncoder.encode(String.format("%s site:%s", searchTerms, site), StandardCharsets.UTF_8).trim();
final String profile = request.queryParamOrDefault("profile", "yolo"); final String profile = request.queryParamOrDefault("profile", "yolo");
response.redirect(websiteUrl.withPath("search?query="+query+"&profile="+profile)); response.redirect(websiteUrl.withPath("search?query="+query+"&profile="+profile));
return null; return "";
} }