erik/jokeapi
erik/jokeapi
1
1
Fork 0
Code Issues Releases Activity

Fixed parameter encoding

Browse source
This commit is contained in:
Erik C. Thauvin 2022-09-24 22:10:06 -07:00
parent 5eaad56afd
commit a2636f404d
1 changed files with 16 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/main/kotlin/net/thauvin/erik/jokeapi/JokeApi.kt
View file

@ -80,7 +80,10 @@ class JokeApi {
val param = it.next() val param = it.next()
urlBuilder.append(param.key) urlBuilder.append(param.key)
if (param.value.isNotEmpty()) { if (param.value.isNotEmpty()) {
urlBuilder.append("=${param.value}") urlBuilder.append("=").append(
URLEncoder.encode(param.value, StandardCharsets.UTF_8).replace("+", "%20")
.replace("*", "%2A").replace("%7E", "~")
)
} }
if (it.hasNext()) { if (it.hasNext()) {
urlBuilder.append("&") urlBuilder.append("&")
@ -139,7 +142,7 @@ class JokeApi {
// Contains // Contains
if (search.isNotBlank()) { if (search.isNotBlank()) {
params[Parameter.CONTAINS] = URLEncoder.encode(search, StandardCharsets.UTF_8).replace("+", "%20") params[Parameter.CONTAINS] = search
} }
// Range // Range
@ -211,9 +214,7 @@ class JokeApi {
) )
413 -> httpException = HttpErrorException( 413 -> httpException = HttpErrorException(
responseCode, responseCode, "URI Too Long", IOException("The URL exceeds the maximum length of 250 characters.")
"URI Too Long",
IOException("The URL exceeds the maximum length of 250 characters.")
) )
414 -> httpException = HttpErrorException( 414 -> httpException = HttpErrorException(
@ -224,22 +225,22 @@ class JokeApi {
429 -> httpException = HttpErrorException( 429 -> httpException = HttpErrorException(
responseCode, "Too Many Requests", IOException( responseCode, "Too Many Requests", IOException(
"You have exceeded the limit of 120 requests per minute and have to wait a bit" + "You have exceeded the limit of 120 requests per minute and have to wait a bit"
" until you are allowed to send requests again." + " until you are allowed to send requests again."
) )
) )
500 -> httpException = HttpErrorException( 500 -> httpException = HttpErrorException(
responseCode, "Internal Server Error", IOException( responseCode, "Internal Server Error", IOException(
"There was a general internal error within JokeAPI. You can get more info from" + "There was a general internal error within JokeAPI. You can get more info from"
" the properties in the response text." + " the properties in the response text."
) )
) )
523 -> httpException = HttpErrorException( 523 -> httpException = HttpErrorException(
responseCode, "Origin Unreachable", IOException( responseCode, "Origin Unreachable", IOException(
"The server is temporarily offline due to maintenance or a dynamic IP update." + "The server is temporarily offline due to maintenance or a dynamic IP update."
" Please be patient in this case." + " Please be patient in this case."
) )
) )
@ -262,18 +263,11 @@ class JokeApi {
safe: Boolean = false, safe: Boolean = false,
splitNewLine: Boolean = true splitNewLine: Boolean = true
): Joke { ): Joke {
val json = val json = JSONObject(
JSONObject( getRawJoke(
getRawJoke( categories, language, flags, type, search = search, idRange = idRange, safe = safe
categories,
language,
flags,
type,
search = search,
idRange = idRange,
safe = safe
)
) )
)
if (json.getBoolean("error")) { if (json.getBoolean("error")) {
val causedBy = json.getJSONArray("causedBy") val causedBy = json.getJSONArray("causedBy")
val causes = MutableList<String>(causedBy.length()) { i -> causedBy.getString(i) } val causes = MutableList<String>(causedBy.length()) { i -> causedBy.getString(i) }