From 64549d8fea3c918c8bc6e255a0a48702ecf4ec22 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Sun, 16 Oct 2022 00:57:52 +0200
Subject: [PATCH 1/7] olgply fix

---
 OlgplyProvider/build.gradle.kts                        |  2 +-
 .../src/main/kotlin/com/lagradost/OlgplyProvider.kt    | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/OlgplyProvider/build.gradle.kts b/OlgplyProvider/build.gradle.kts
index 9099795..5ea82d0 100644
--- a/OlgplyProvider/build.gradle.kts
+++ b/OlgplyProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 3
+version = 4
 
 
 cloudstream {
diff --git a/OlgplyProvider/src/main/kotlin/com/lagradost/OlgplyProvider.kt b/OlgplyProvider/src/main/kotlin/com/lagradost/OlgplyProvider.kt
index c2a0636..7eec1c9 100644
--- a/OlgplyProvider/src/main/kotlin/com/lagradost/OlgplyProvider.kt
+++ b/OlgplyProvider/src/main/kotlin/com/lagradost/OlgplyProvider.kt
@@ -2,7 +2,6 @@ package com.lagradost
 
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.TvType
-import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.metaproviders.TmdbLink
 import com.lagradost.cloudstream3.metaproviders.TmdbProvider
 import com.lagradost.cloudstream3.network.WebViewResolver
@@ -10,9 +9,6 @@ import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.nicehttp.requestCreator
-import org.mozilla.javascript.Context
-import org.mozilla.javascript.Scriptable
-import org.mozilla.javascript.ScriptableObject
 
 class OlgplyProvider : TmdbProvider() {
     override var mainUrl = "https://olgply.com"
@@ -31,7 +27,7 @@ class OlgplyProvider : TmdbProvider() {
             Regex("""\.m3u8|i7njdjvszykaieynzsogaysdgb0hm8u1mzubmush4maopa4wde\.com""")
         ).resolveUsingWebView(
             requestCreator(
-                "GET", url, referer = "https://olgply.xyz/"
+                "GET", url, referer = "https://olgply.com/"
             )
         )
             .first ?: return
@@ -39,7 +35,7 @@ class OlgplyProvider : TmdbProvider() {
         callback.invoke(
             ExtractorLink(
                 this.name,
-                "Movies4Discord",
+                this.name,
                 foundVideo.url.toString(),
                 "",
                 Qualities.Unknown.value,
@@ -57,7 +53,7 @@ class OlgplyProvider : TmdbProvider() {
     ): Boolean {
         val mappedData = parseJson<TmdbLink>(data)
         val tmdbId = mappedData.tmdbID ?: return false
-        val jsRegex = Regex("""eval\(.*\);""")
+//        val jsRegex = Regex("""eval\(.*\);""")
 
         val apiUrl =
             "https://olgply.xyz/${tmdbId}${mappedData.season?.let { "/$it" } ?: ""}${mappedData.episode?.let { "/$it" } ?: ""}"

From 73062a8041a0eb5023d4ab8376cc637bfc4b2ac8 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Sun, 16 Oct 2022 15:08:45 +0200
Subject: [PATCH 2/7] Disable aniflix

---
 AniflixProvider/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AniflixProvider/build.gradle.kts b/AniflixProvider/build.gradle.kts
index 71e0ff6..6a4d008 100644
--- a/AniflixProvider/build.gradle.kts
+++ b/AniflixProvider/build.gradle.kts
@@ -16,7 +16,7 @@ cloudstream {
      * 2: Slow
      * 3: Beta only
      * */
-    status = 1 // will be 3 if unspecified
+    status = 0 // will be 3 if unspecified
     tvTypes = listOf(
         "Anime",
         "AnimeMovie",

From 4ff296dea592ee5356c0dbe6c8e81d742c7fb711 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Sun, 16 Oct 2022 19:44:52 +0200
Subject: [PATCH 3/7] Add Ask4movie

---
 Ask4Movie/build.gradle.kts                    |  27 ++
 Ask4Movie/src/main/AndroidManifest.xml        |   2 +
 .../kotlin/com/lagradost/Ask4MoviePlugin.kt   |  14 ++
 .../kotlin/com/lagradost/Ask4MovieProvider.kt | 237 ++++++++++++++++++
 4 files changed, 280 insertions(+)
 create mode 100644 Ask4Movie/build.gradle.kts
 create mode 100644 Ask4Movie/src/main/AndroidManifest.xml
 create mode 100644 Ask4Movie/src/main/kotlin/com/lagradost/Ask4MoviePlugin.kt
 create mode 100644 Ask4Movie/src/main/kotlin/com/lagradost/Ask4MovieProvider.kt

diff --git a/Ask4Movie/build.gradle.kts b/Ask4Movie/build.gradle.kts
new file mode 100644
index 0000000..0315eba
--- /dev/null
+++ b/Ask4Movie/build.gradle.kts
@@ -0,0 +1,27 @@
+// use an integer for version numbers
+version = 3
+
+
+cloudstream {
+    language = "en"
+    // All of these properties are optional, you can safely remove them
+
+//    description = "Uses TMDB"
+    authors = listOf("Blatzar")
+
+    /**
+     * Status int as the following:
+     * 0: Down
+     * 1: Ok
+     * 2: Slow
+     * 3: Beta only
+     * */
+    status = 1 // will be 3 if unspecified
+    tvTypes = listOf(
+        "TvSeries",
+        "Movie",
+        "AnimeMovie"
+    )
+
+    iconUrl = "https://www.google.com/s2/favicons?domain=ask4movie.mx&sz=%size%"
+}
\ No newline at end of file
diff --git a/Ask4Movie/src/main/AndroidManifest.xml b/Ask4Movie/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..29aec9d
--- /dev/null
+++ b/Ask4Movie/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.lagradost"/>
\ No newline at end of file
diff --git a/Ask4Movie/src/main/kotlin/com/lagradost/Ask4MoviePlugin.kt b/Ask4Movie/src/main/kotlin/com/lagradost/Ask4MoviePlugin.kt
new file mode 100644
index 0000000..58d5351
--- /dev/null
+++ b/Ask4Movie/src/main/kotlin/com/lagradost/Ask4MoviePlugin.kt
@@ -0,0 +1,14 @@
+
+package com.lagradost
+
+import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
+import com.lagradost.cloudstream3.plugins.Plugin
+import android.content.Context
+
+@CloudstreamPlugin
+class Ask4MoviePlugin: Plugin() {
+    override fun load(context: Context) {
+        // All providers should be added in this manner. Please don't edit the providers list directly.
+        registerMainAPI(Ask4MovieProvider())
+    }
+}
\ No newline at end of file
diff --git a/Ask4Movie/src/main/kotlin/com/lagradost/Ask4MovieProvider.kt b/Ask4Movie/src/main/kotlin/com/lagradost/Ask4MovieProvider.kt
new file mode 100644
index 0000000..05d7870
--- /dev/null
+++ b/Ask4Movie/src/main/kotlin/com/lagradost/Ask4MovieProvider.kt
@@ -0,0 +1,237 @@
+package com.lagradost
+
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.utils.Coroutines.main
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.loadExtractor
+import org.jsoup.Jsoup
+import org.jsoup.nodes.Element
+import java.net.URI
+
+class Ask4MovieProvider : MainAPI() {
+    override var mainUrl = "https://ask4movie.mx"
+
+    override var name = "Ask4Movie"
+    override val supportedTypes = setOf(TvType.TvSeries, TvType.Movie, TvType.AnimeMovie)
+    override val hasMainPage = true
+
+    private fun Element.toSearchResponse(): MovieSearchResponse {
+        // style="background-image: url(https://ask4movie.me/wp-content/uploads/2022/08/Your-Name.-2016-cover.jpg)"
+        val posterRegex = Regex("""url\((.*?)\)""")
+        val poster = posterRegex.find(this.attr("style"))?.groupValues?.get(1)
+
+        val a = this.select("a")
+        val href = a.attr("href")
+        val title = a.text().trim()
+
+        // Title (2022) -> 2022
+        val year =
+            Regex("""\((\d{4})\)$""").find(title)?.groupValues?.getOrNull(1)?.toIntOrNull()
+
+        return MovieSearchResponse(
+            title,
+            href,
+            this@Ask4MovieProvider.name,
+            TvType.Movie,
+            poster,
+            year,
+            null,
+            null,
+            null
+        )
+    }
+
+    // Used in movies/single seasons to get recommendations
+    private fun Element.articleToSearchResponse(): MovieSearchResponse {
+        val poster = this.select("img").attr("src")
+
+        val a = this.select("a")
+        val href = a.attr("href")
+        val title = a.attr("title")
+
+        // Title (2022) -> 2022
+        val year =
+            Regex("""\((\d{4})\)$""").find(title)?.groupValues?.getOrNull(1)?.toIntOrNull()
+
+        return MovieSearchResponse(
+            title,
+            href,
+            this@Ask4MovieProvider.name,
+            TvType.Movie,
+            poster,
+            year,
+            null,
+            null,
+            null
+        )
+    }
+
+    override suspend fun search(query: String): List<SearchResponse> {
+        val url = "$mainUrl/?s=$query"
+        val doc = app.post(
+            url,
+//            data = mapOf("np_asl_data" to "customset[]=post&customset[]=ct_channel&customset[]=post&customset[]=post&customset[]=post&customset[]=post&asl_gen[]=title&asl_gen[]=exact&qtranslate_lang=0&filters_initial=1&filters_changed=0")
+        ).document
+        return doc.select("div.item").map {
+            it.toSearchResponse()
+        }
+    }
+
+    private fun getIframe(html: String): String? {
+        val data = Regex("""<script src="data:text\/javascript;base64,([^"']*)""").findAll(html)
+            .lastOrNull()?.groupValues?.getOrNull(1) ?: return null
+        val decoded = base64Decode(data)
+        val iframeUrlRegex = Regex("""dir['"],['"]([^"']*)""")
+
+        val iframeEncoded = iframeUrlRegex.find(decoded)?.groupValues?.getOrNull(1) ?: return null
+        val iframe = base64Decode(iframeEncoded)
+        return Jsoup.parse(iframe).select("iframe").attr("src")
+    }
+
+    private suspend fun getEpisodes(iframe: String): List<Episode> {
+        val playlistDoc = app.get(iframe).document
+
+        // S04┋E01
+        val episodeRegex = Regex("""S(\d+).E(\d+)""")
+        return playlistDoc.select("span.episode").mapNotNull { episode ->
+            val partialUrl = episode.attr("data-url")
+            val fullUrl = "https://${URI(iframe).rawAuthority}$partialUrl"
+            val info = episodeRegex.find(episode.text())
+            val seasonIndex = info?.groupValues?.getOrNull(1)?.toIntOrNull()
+            val episodeIndex = info?.groupValues?.getOrNull(2)?.toIntOrNull()
+            Episode(
+                fullUrl,
+                episode = episodeIndex,
+                season = seasonIndex
+            )
+        }
+    }
+
+    override suspend fun getMainPage(page: Int, request: MainPageRequest): HomePageResponse? {
+        val document = app.get(mainUrl).document
+        val rows = document.select("div.row")
+
+        val posterRegex = Regex("""url\((.*?)\)""")
+        val mappedRows = rows.mapNotNull {
+            val items = it.select("div.slide-item").map { element ->
+                val thumb = element.select("div.item-thumb")
+                val poster = posterRegex.find(thumb.attr("style"))?.groupValues?.get(1)
+                val href = thumb.select("a").attr("href")
+                val title = element.select("div.video-short-intro a").text()
+                val year =
+                    Regex("""\((\d{4})\)$""").find(title)?.groupValues?.getOrNull(1)?.toIntOrNull()
+                MovieSearchResponse(title, href, this.name, TvType.Movie, poster, year)
+            }.ifEmpty {
+                it.select("div.channel-content.clearfix").map { searchElement ->
+                    searchElement.articleToSearchResponse()
+                }
+            }
+
+            val title = it.select("div.title").text()
+            if (title.contains("porn", true) && !settingsForProvider.enableAdult) return@mapNotNull null
+            HomePageList(title, items)
+        }
+        return HomePageResponse(mappedRows)
+    }
+
+    override suspend fun load(url: String): LoadResponse {
+        val response = app.get(url)
+        val document = response.document
+
+        val seasons = document.select("div.item")
+        val isSingleVideo = (seasons.isNullOrEmpty())
+        val yearRegex = Regex("""\((\d{4})\)$""")
+
+        if (isSingleVideo) {
+            val description = document.select("div.custom.video-the-content").text().trim()
+            val (title, year) = document.select("a.video-title").text().let {
+                it.replace(yearRegex, "") to yearRegex.find(it)?.groupValues?.get(1)?.toIntOrNull()
+            }
+            val genres =
+                document.selectFirst("div.categories.cactus-info")?.select("a")?.map { it.text() }
+
+            // This is actually a json with all the data, but I opted to just scrape the html
+            // Try the json in the future if html turns out bad
+            val posterRegex = Regex("""contentUrl['"].*?(http[^"']*)""")
+            val poster = posterRegex.find(response.text)?.groupValues?.get(1)
+            val recommendations = document.select("div.cactus-sub-wrap article").mapNotNull {
+                it.articleToSearchResponse()
+            }
+
+            val iframe = getIframe(response.text)
+            // It can be a season as a single video iframe!
+            return if (iframe?.contains("/p/") == true) {
+                val episodes = getEpisodes(iframe)
+                TvSeriesLoadResponse(
+                    title,
+                    url,
+                    this.name,
+                    TvType.TvSeries,
+                    episodes,
+                    poster,
+                    year,
+                    recommendations = recommendations,
+                    tags = genres,
+                    plot = description
+                )
+            } else {
+                newMovieLoadResponse(title, url, TvType.Movie, iframe) {
+                    this.posterUrl = poster
+                    this.tags = genres
+                    this.plot = description
+                    this.year = year
+                    this.recommendations = recommendations
+                }
+            }
+        } else {
+            val recommendations = document.select("div.channel.clearfix").mapNotNull {
+                it.articleToSearchResponse()
+            }
+
+            val descriptionDiv = document.select("div.channel-description")
+            val description = descriptionDiv.select("p").firstOrNull()?.text()?.trim()
+
+            val genres = descriptionDiv.select("span.genres").let {
+                if (it.isNotEmpty()) it.text().split(",")
+                else descriptionDiv.select("p")
+                    .firstOrNull { element -> element.text().contains("Genre:") }
+                    ?.text()?.substringAfter("Genre:")?.split(",")
+            }
+
+            val (title, year) = document.select("h3.channel-name").text().let {
+                it.replace(yearRegex, "") to yearRegex.find(it)?.groupValues?.get(1)?.toIntOrNull()
+            }
+
+            val poster = document.select("div.channel-pic > img").attr("src")
+            val mappedSeasons = seasons.apmap {
+                val href = it.select("div.top-item > a").attr("href")
+                val text = app.get(href).text
+                val iframe = getIframe(text) ?: return@apmap emptyList()
+                getEpisodes(iframe)
+            }.flatten()
+
+            return TvSeriesLoadResponse(
+                title,
+                url,
+                this.name,
+                TvType.TvSeries,
+                mappedSeasons,
+                poster,
+                year,
+                recommendations = recommendations,
+                tags = genres,
+                plot = description
+            )
+        }
+    }
+
+    override suspend fun loadLinks(
+        data: String,
+        isCasting: Boolean,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ): Boolean {
+        loadExtractor(data, this.mainUrl, subtitleCallback, callback)
+        return true
+    }
+}
\ No newline at end of file

From 94ac0a3b57804f532455f5c5f950a59d02f7ae7c Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Sun, 16 Oct 2022 20:45:17 +0200
Subject: [PATCH 4/7] Fix horizontal images

---
 Ask4Movie/build.gradle.kts                                   | 2 +-
 Ask4Movie/src/main/kotlin/com/lagradost/Ask4MovieProvider.kt | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Ask4Movie/build.gradle.kts b/Ask4Movie/build.gradle.kts
index 0315eba..2d34449 100644
--- a/Ask4Movie/build.gradle.kts
+++ b/Ask4Movie/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 3
+version = 4
 
 
 cloudstream {
diff --git a/Ask4Movie/src/main/kotlin/com/lagradost/Ask4MovieProvider.kt b/Ask4Movie/src/main/kotlin/com/lagradost/Ask4MovieProvider.kt
index 05d7870..fb91e65 100644
--- a/Ask4Movie/src/main/kotlin/com/lagradost/Ask4MovieProvider.kt
+++ b/Ask4Movie/src/main/kotlin/com/lagradost/Ask4MovieProvider.kt
@@ -113,6 +113,7 @@ class Ask4MovieProvider : MainAPI() {
 
         val posterRegex = Regex("""url\((.*?)\)""")
         val mappedRows = rows.mapNotNull {
+            var isHorizontal = true
             val items = it.select("div.slide-item").map { element ->
                 val thumb = element.select("div.item-thumb")
                 val poster = posterRegex.find(thumb.attr("style"))?.groupValues?.get(1)
@@ -122,6 +123,7 @@ class Ask4MovieProvider : MainAPI() {
                     Regex("""\((\d{4})\)$""").find(title)?.groupValues?.getOrNull(1)?.toIntOrNull()
                 MovieSearchResponse(title, href, this.name, TvType.Movie, poster, year)
             }.ifEmpty {
+                isHorizontal = false
                 it.select("div.channel-content.clearfix").map { searchElement ->
                     searchElement.articleToSearchResponse()
                 }
@@ -129,7 +131,7 @@ class Ask4MovieProvider : MainAPI() {
 
             val title = it.select("div.title").text()
             if (title.contains("porn", true) && !settingsForProvider.enableAdult) return@mapNotNull null
-            HomePageList(title, items)
+            HomePageList(title, items, isHorizontal)
         }
         return HomePageResponse(mappedRows)
     }

From d0b91fc518c39e1292fa072fa387913e9a71636b Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Mon, 17 Oct 2022 12:10:11 +0200
Subject: [PATCH 5/7] update webpage url

---
 NginxProvider/src/main/kotlin/com/lagradost/NginxApi.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NginxProvider/src/main/kotlin/com/lagradost/NginxApi.kt b/NginxProvider/src/main/kotlin/com/lagradost/NginxApi.kt
index 714cabb..72bbadc 100644
--- a/NginxProvider/src/main/kotlin/com/lagradost/NginxApi.kt
+++ b/NginxProvider/src/main/kotlin/com/lagradost/NginxApi.kt
@@ -15,7 +15,7 @@
      override val requiresUsername = true
      override val requiresPassword = true
      override val requiresServer = true
-     override val createAccountUrl = "https://recloudstream.github.io/docs/users/use-nginx.md"
+     override val createAccountUrl = "https://www.cloudstream.cf/docs/users/use-nginx.md"
 
      companion object {
          const val NGINX_USER_KEY: String = "nginx_user"

From 45f2bbf95c3675d3bee9d1e0fd678876ffbb64f7 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Mon, 17 Oct 2022 12:11:07 +0200
Subject: [PATCH 6/7] bump ver

---
 NginxProvider/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/NginxProvider/build.gradle.kts b/NginxProvider/build.gradle.kts
index 31a7a69..0ba3e30 100644
--- a/NginxProvider/build.gradle.kts
+++ b/NginxProvider/build.gradle.kts
@@ -5,7 +5,7 @@ dependencies {
 }
 
 // use an integer for version numbers
-version = 9
+version = 10
 
 
 cloudstream {
@@ -29,4 +29,4 @@ cloudstream {
         "Movie",
     )
     requiresResources = true
-}
\ No newline at end of file
+}

From 101161e8295bd25a9aeec2446d707049b11fea27 Mon Sep 17 00:00:00 2001
From: LagradOst <46196380+Blatzar@users.noreply.github.com>
Date: Wed, 19 Oct 2022 00:37:11 +0200
Subject: [PATCH 7/7] Add encryption message to sflix description

---
 SflixProvider/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SflixProvider/build.gradle.kts b/SflixProvider/build.gradle.kts
index c941f86..9e9f6d0 100644
--- a/SflixProvider/build.gradle.kts
+++ b/SflixProvider/build.gradle.kts
@@ -6,7 +6,7 @@ cloudstream {
     language = "en"
     // All of these properties are optional, you can safely remove them
 
-    description = "Also includes Dopebox, Solarmovie, Zoro, HDToday and 2embed"
+    description = "Due to the video host changing encryption methods extremely often these extensions might not work perfectly. Also includes Dopebox, Solarmovie, Zoro, HDToday and 2embed"
     // authors = listOf("Cloudburst")
 
     /**