From 305cdef3f532495455ad250ba335387a7e73b7bb Mon Sep 17 00:00:00 2001 From: doomsdayrs Date: Mon, 15 Aug 2022 14:13:26 -0400 Subject: [PATCH] Enforce URLs to be in normal form By doing this, expand / shrink url will always be consistent --- src/main/kotlin/app/shosetsu/lib/lua/LuaExtension.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/app/shosetsu/lib/lua/LuaExtension.kt b/src/main/kotlin/app/shosetsu/lib/lua/LuaExtension.kt index 2f230b7..9a3cbc2 100644 --- a/src/main/kotlin/app/shosetsu/lib/lua/LuaExtension.kt +++ b/src/main/kotlin/app/shosetsu/lib/lua/LuaExtension.kt @@ -5,6 +5,7 @@ import app.shosetsu.lib.exceptions.InvalidFilterIDException import app.shosetsu.lib.exceptions.MissingOrInvalidKeysException import kotlinx.serialization.decodeFromString import kotlinx.serialization.json.Json +import okhttp3.HttpUrl.Companion.toHttpUrl import org.luaj.vm2.LuaError import org.luaj.vm2.LuaInteger import org.luaj.vm2.LuaString.EMPTYSTRING @@ -232,7 +233,7 @@ class LuaExtension @Throws( override fun expandURL(smallURL: String, type: Int): String { val f = source[KEY_EXPAND_URL] if (f.type() != TFUNCTION) return smallURL - return f.call(valueOf(smallURL), valueOf(type)).tojstring() + return f.call(valueOf(smallURL), valueOf(type)).tojstring().toHttpUrl().toUri().normalize().toString() } override fun shrinkURL(longURL: String, type: Int): String {