erik/akismet-kotlin
erik/akismet-kotlin
1
1
Fork 0
Code Issues Pull requests Releases Activity

Cleanup.

Browse source
This commit is contained in:
Erik C. Thauvin 2019-09-24 17:12:01 -07:00
parent 0e6d9921f6
commit 2db72fa867
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/main/kotlin/net/thauvin/erik/akismet/AkismetComment.kt
View file

@ -37,6 +37,13 @@ import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonConfiguration import kotlinx.serialization.json.JsonConfiguration
import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletRequest
private fun String?.ifNull(): String {
if (this == null) {
return ""
}
return this
}
/** /**
* A comment to send to Akismet. * A comment to send to Akismet.
* *
@ -185,7 +192,10 @@ open class AkismetComment(val userIp: String, val userAgent: String) {
* *
* @see [serverEnv] * @see [serverEnv]
*/ */
constructor(request: HttpServletRequest) : this(request.remoteAddr.ifNull(), request.getHeader("User-Agent").ifNull()) { constructor(request: HttpServletRequest) : this(
request.remoteAddr.ifNull(),
request.getHeader("User-Agent").ifNull()
) {
referrer = request.getHeader("referer").ifNull() referrer = request.getHeader("referer").ifNull()
serverEnv = buildServerEnv(request) serverEnv = buildServerEnv(request)
} }
@ -274,10 +284,3 @@ private fun buildServerEnv(request: HttpServletRequest): HashMap<String, String>
return params return params
} }
private fun String.ifNull(): String {
if (this == null) {
return ""
}
return this
}