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

Minor cleanup

Browse source
This commit is contained in:
Erik C. Thauvin 2023-01-28 21:17:45 -08:00
parent f5ecf2d1b4
commit 7c96301dc0
4 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -311,18 +311,16 @@ fun getRawJokes(
if (idRange.start >= 0) {
if (idRange.end == -1 || idRange.start == idRange.end) {
params[Parameter.RANGE] = idRange.start.toString()
} else if (idRange.end > idRange.start) {
params[Parameter.RANGE] = "${idRange.start}-${idRange.end}"
} else {
throw IllegalArgumentException("Invalid ID Range: ${idRange.start}, ${idRange.end}")
require(idRange.end > idRange.start) { "Invalid ID Range: ${idRange.start}, ${idRange.end}" }
params[Parameter.RANGE] = "${idRange.start}-${idRange.end}"
}
}
// Amount
require(amount > 0) { "Invalid Amount: $amount" }
if (amount > 1) {
params[Parameter.AMOUNT] = amount.toString()
} else if (amount <= 0) {
throw IllegalArgumentException("Invalid Amount: $amount")
}
// Safe

2
src/main/kotlin/net/thauvin/erik/jokeapi/JokeConfig.kt
View file

@ -77,7 +77,7 @@ class JokeConfig private constructor(
var safe: Boolean = false,
var auth: String = "",
var splitNewLine: Boolean = false
) {
) {
fun categories(categories: Set<Category>) = apply { this.categories = categories }
fun lang(language: Language) = apply { lang = language }
fun blacklistFlags(flags: Set<Flag>) = apply { blacklistFlags = flags }