smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Got rid of InvalidUrlMsg

This commit is contained in:
Veloman Yunkan 2023-11-29 15:42:21 +04:00
parent a7ea908bcd
commit e470c97f74
3 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/server/internalServer.cpp
View File

@ -888,7 +888,6 @@ std::unique_ptr<Response> InternalServer::handle_search(const RequestContext& re
return handle_search_request(request); return handle_search_request(request);
} catch (const Error& e) { } catch (const Error& e) {
return HTTP400Response(*this, request) return HTTP400Response(*this, request)
+ invalidUrlMsg
+ e.message(); + e.message();
} }
} }

8
src/server/response.cpp
View File

@ -152,8 +152,6 @@ std::unique_ptr<Response> Response::build_304(const InternalServer& server, cons
return response; return response;
} }
const InvalidUrlMsg invalidUrlMsg;
std::string ContentResponseBlueprint::getMessage(const std::string& msgId) const std::string ContentResponseBlueprint::getMessage(const std::string& msgId) const
{ {
return getTranslatedString(m_request.get_user_language(), msgId); return getTranslatedString(m_request.get_user_language(), msgId);
@ -226,17 +224,13 @@ HTTP400Response::HTTP400Response(const InternalServer& server,
MHD_HTTP_BAD_REQUEST, MHD_HTTP_BAD_REQUEST,
"400-page-title", "400-page-title",
"400-page-heading") "400-page-heading")
{
}
HTTPErrorResponse& HTTP400Response::operator+(InvalidUrlMsg /*unused*/)
{ {
std::string requestUrl = urlDecode(m_request.get_full_url(), false); std::string requestUrl = urlDecode(m_request.get_full_url(), false);
const auto query = m_request.get_query(); const auto query = m_request.get_query();
if (!query.empty()) { if (!query.empty()) {
requestUrl += "?" + encodeDiples(query); requestUrl += "?" + encodeDiples(query);
} }
return *this + ParameterizedMessage("invalid-request", {{"url", requestUrl}}); *this += ParameterizedMessage("invalid-request", {{"url", requestUrl}});
} }
HTTP500Response::HTTP500Response(const InternalServer& server, HTTP500Response::HTTP500Response(const InternalServer& server,

9
src/server/response.h
View File

@ -177,8 +177,6 @@ struct HTTP404Response : HTTPErrorResponse
{ {
HTTP404Response(const InternalServer& server, HTTP404Response(const InternalServer& server,
const RequestContext& request); const RequestContext& request);
using HTTPErrorResponse::operator+;
}; };
struct UrlNotFoundResponse : HTTP404Response struct UrlNotFoundResponse : HTTP404Response
@ -187,17 +185,10 @@ struct UrlNotFoundResponse : HTTP404Response
const RequestContext& request); const RequestContext& request);
}; };
class InvalidUrlMsg {};
extern const InvalidUrlMsg invalidUrlMsg;
struct HTTP400Response : HTTPErrorResponse struct HTTP400Response : HTTPErrorResponse
{ {
HTTP400Response(const InternalServer& server, HTTP400Response(const InternalServer& server,
const RequestContext& request); const RequestContext& request);
using HTTPErrorResponse::operator+;
HTTPErrorResponse& operator+(InvalidUrlMsg /*unused*/);
}; };
struct HTTP500Response : HTTPErrorResponse struct HTTP500Response : HTTPErrorResponse