From f9e3e5a2bf57ae31320f3d5349ac50f3d0eff369 Mon Sep 17 00:00:00 2001
From: LagradOst <balt.758@gmail.com>
Date: Sat, 2 Oct 2021 19:53:20 +0200
Subject: [PATCH] cookie fix aka Tenshi fix

---
 app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt  | 4 ++--
 .../cloudstream3/animeproviders/TenshiProvider.kt        | 1 +
 .../movieproviders/{VfFilm.kt => VfFilmProvider.kt}      | 6 +-----
 .../java/com/lagradost/cloudstream3/network/Requests.kt  | 9 +++++++--
 4 files changed, 11 insertions(+), 9 deletions(-)
 rename app/src/main/java/com/lagradost/cloudstream3/movieproviders/{VfFilm.kt => VfFilmProvider.kt} (95%)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
index d115ca1a..018faf25 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
@@ -42,12 +42,12 @@ object APIHolder {
         WatchCartoonOnlineProvider(),
         AllMoviesForYouProvider(),
         AsiaFlixProvider(),
-        TrailersToProvider(), // be aware that this is fuckery
         VidEmbedProvider(),
-        VfFilm()
+        VfFilmProvider()
     )
 
     val restrictedApis = arrayListOf(
+        TrailersToProvider(), // be aware that this is fuckery
         //NyaaProvider(), //torrents in cs3 is wack
         ThenosProvider(),
     )
diff --git a/app/src/main/java/com/lagradost/cloudstream3/animeproviders/TenshiProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/animeproviders/TenshiProvider.kt
index 32d86fa3..a319e051 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/animeproviders/TenshiProvider.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/animeproviders/TenshiProvider.kt
@@ -212,6 +212,7 @@ class TenshiProvider : MainAPI() {
         val url = "$mainUrl/anime"
         var response = get(url, params = mapOf("q" to query), cookies = mapOf("loop-view" to "thumb")).text
         var document = Jsoup.parse(response)
+
         val returnValue = parseSearchPage(document)
 
         while (!document.select("""a.page-link[rel="next"]""").isEmpty()) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/movieproviders/VfFilm.kt b/app/src/main/java/com/lagradost/cloudstream3/movieproviders/VfFilmProvider.kt
similarity index 95%
rename from app/src/main/java/com/lagradost/cloudstream3/movieproviders/VfFilm.kt
rename to app/src/main/java/com/lagradost/cloudstream3/movieproviders/VfFilmProvider.kt
index 510edaca..bbb6b4bf 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/movieproviders/VfFilm.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/movieproviders/VfFilmProvider.kt
@@ -1,18 +1,14 @@
 package com.lagradost.cloudstream3.movieproviders
 
-import com.fasterxml.jackson.module.kotlin.readValue
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.network.get
-import com.lagradost.cloudstream3.network.post
 import com.lagradost.cloudstream3.network.text
-import com.lagradost.cloudstream3.network.url
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
-import okio.Buffer
 import org.jsoup.Jsoup
 
 // referer = https://vf-film.org, USERAGENT ALSO REQUIRED
-class VfFilm : MainAPI() {
+class VfFilmProvider : MainAPI() {
     override val mainUrl: String
         get() = "https://vf-film.org"
     override val name: String
diff --git a/app/src/main/java/com/lagradost/cloudstream3/network/Requests.kt b/app/src/main/java/com/lagradost/cloudstream3/network/Requests.kt
index bfc9496a..e86bb2e7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/network/Requests.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/network/Requests.kt
@@ -3,7 +3,6 @@ package com.lagradost.cloudstream3.network
 import com.lagradost.cloudstream3.USER_AGENT
 import okhttp3.*
 import okhttp3.Headers.Companion.toHeaders
-import okio.Buffer
 import java.net.URI
 import java.util.*
 import java.util.concurrent.TimeUnit
@@ -73,7 +72,12 @@ fun getCache(cacheTime: Int, cacheUnit: TimeUnit): CacheControl {
  */
 fun getHeaders(headers: Map<String, String>, referer: String?, cookie: Map<String, String>): Headers {
     val refererMap = (referer ?: DEFAULT_REFERER)?.let { mapOf("referer" to it) } ?: mapOf()
-    return (DEFAULT_COOKIES + DEFAULT_HEADERS + cookie + headers + refererMap).toHeaders()
+    val cookieHeaders = (DEFAULT_COOKIES + cookie)
+    val cookieMap = if(cookieHeaders.isNotEmpty()) mapOf("Cookie" to cookieHeaders.entries.joinToString(separator = "; ") {
+        "${it.key}=${it.value};"
+    }) else mapOf()
+    val tempHeaders = (DEFAULT_HEADERS + cookieMap + headers + refererMap)
+    return tempHeaders.toHeaders()
 }
 
 fun get(
@@ -92,6 +96,7 @@ fun get(
         .followSslRedirects(allowRedirects)
         .callTimeout(timeout, TimeUnit.SECONDS)
         .build()
+    println("cookie2: " + cookies)
     val request = getRequestCreator(url, headers, referer, params, cookies, cacheTime, cacheUnit)
     return client.newCall(request).execute()
 }