From df1cc2b8e993f542719dfab23d0edcaf34228024 Mon Sep 17 00:00:00 2001 From: Antoine Aflalo <197810+Belphemur@users.noreply.github.com> Date: Sat, 14 Sep 2024 09:04:49 -0400 Subject: [PATCH] fix(flaresolverr): fix cookie expiry for flaresolverr (#1070) Cookie expiry is returned in seconds, the persistent cache expect it in miliseconds. Cookie is always considered as expired --- .../tachiyomi/network/interceptor/CloudflareInterceptor.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt index c2025950..00b266a1 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt @@ -232,11 +232,12 @@ object CFClearance { .name(cookie.name) .value(cookie.value) .domain(cookie.domain.removePrefix(".")) - .expiresAt(cookie.expires?.takeUnless { it < 0.0 }?.toLong() ?: Long.MAX_VALUE) .also { if (cookie.httpOnly != null && cookie.httpOnly) it.httpOnly() if (cookie.secure != null && cookie.secure) it.secure() if (!cookie.path.isNullOrEmpty()) it.path(cookie.path) + // We need to convert the expires time to milliseconds for the persistent cookie store + if (cookie.expires != null && cookie.expires > 0) it.expiresAt((cookie.expires * 1000).toLong()) }.build() }.groupBy { it.domain } .flatMap { (domain, cookies) ->