From 95dc9c5e1e73aabf44924dacf5f277d25eb6fa12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Pe=C3=B1a=20Y=20Lillo?=
 <80992641+Diegopyl1209@users.noreply.github.com>
Date: Wed, 31 Aug 2022 17:12:03 -0400
Subject: [PATCH] New source [Twitch] and changes [Xvideos, Pornhub]

---
 src/all/pornhub/build.gradle                  |   3 +-
 .../animeextension/all/pornhub/Pornhub.kt     |  80 ++++--
 src/all/twitch/AndroidManifest.xml            |  24 ++
 src/all/twitch/build.gradle                   |  13 +
 .../twitch/res/mipmap-hdpi/ic_launcher.png    | Bin 0 -> 1654 bytes
 .../twitch/res/mipmap-mdpi/ic_launcher.png    | Bin 0 -> 1654 bytes
 .../twitch/res/mipmap-xhdpi/ic_launcher.png   | Bin 0 -> 1654 bytes
 .../twitch/res/mipmap-xxhdpi/ic_launcher.png  | Bin 0 -> 1654 bytes
 .../twitch/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 1654 bytes
 .../animeextension/all/twitch/Twitch.kt       | 257 ++++++++++++++++++
 .../animeextension/all/twitch/TwitchIntent.kt |  27 ++
 src/all/xvideos/build.gradle                  |   2 +-
 .../animeextension/all/xvideos/Xvideos.kt     |  31 +--
 13 files changed, 384 insertions(+), 53 deletions(-)
 create mode 100644 src/all/twitch/AndroidManifest.xml
 create mode 100644 src/all/twitch/build.gradle
 create mode 100644 src/all/twitch/res/mipmap-hdpi/ic_launcher.png
 create mode 100644 src/all/twitch/res/mipmap-mdpi/ic_launcher.png
 create mode 100644 src/all/twitch/res/mipmap-xhdpi/ic_launcher.png
 create mode 100644 src/all/twitch/res/mipmap-xxhdpi/ic_launcher.png
 create mode 100644 src/all/twitch/res/mipmap-xxxhdpi/ic_launcher.png
 create mode 100644 src/all/twitch/src/eu/kanade/tachiyomi/animeextension/all/twitch/Twitch.kt
 create mode 100644 src/all/twitch/src/eu/kanade/tachiyomi/animeextension/all/twitch/TwitchIntent.kt

diff --git a/src/all/pornhub/build.gradle b/src/all/pornhub/build.gradle
index a94f16b..3f4e856 100644
--- a/src/all/pornhub/build.gradle
+++ b/src/all/pornhub/build.gradle
@@ -1,11 +1,12 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlinx-serialization'
 
 ext {
     extName = 'Pornhub'
     pkgNameSuffix = 'all.pornhub'
     extClass = '.Pornhub'
-    extVersionCode = 3
+    extVersionCode = 4
     libVersion = '13'
     containsNsfw = true
 }
diff --git a/src/all/pornhub/src/eu/kanade/tachiyomi/animeextension/all/pornhub/Pornhub.kt b/src/all/pornhub/src/eu/kanade/tachiyomi/animeextension/all/pornhub/Pornhub.kt
index fe88c6c..499ddd9 100644
--- a/src/all/pornhub/src/eu/kanade/tachiyomi/animeextension/all/pornhub/Pornhub.kt
+++ b/src/all/pornhub/src/eu/kanade/tachiyomi/animeextension/all/pornhub/Pornhub.kt
@@ -12,6 +12,11 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -21,6 +26,7 @@ import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
+import uy.kohesive.injekt.injectLazy
 import java.lang.Exception
 
 class Pornhub : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
@@ -35,6 +41,8 @@ class Pornhub : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val client: OkHttpClient = network.cloudflareClient
 
+    private val json: Json by injectLazy()
+
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -59,8 +67,6 @@ class Pornhub : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun episodeListParse(response: Response): List<SEpisode> {
         val episodes = mutableListOf<SEpisode>()
 
-        val jsoup = response.asJsoup()
-
         val episode = SEpisode.create().apply {
             name = "Video"
             date_upload = System.currentTimeMillis()
@@ -75,33 +81,24 @@ class Pornhub : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun episodeFromElement(element: Element) = throw Exception("not used")
 
+    @OptIn(ExperimentalSerializationApi::class)
     override fun videoListParse(response: Response): List<Video> {
         val url = response.request.url.toString()
         val videoList = mutableListOf<Video>()
         // credits to: https://github.com/Joel2B
-        val document = Jsoup.connect("https://appsdev.cyou/xv-ph-rt/api/?data=$url").ignoreContentType(true).get()
-        val jsonObject = JSONObject(document.select("body").text())["hls"]
-        val jsonUrls = JSONObject(jsonObject.toString())
-
-        val url1080 = jsonUrls["1080p"].toString().replace("amp;", "")
-        val url720 = jsonUrls["720p"].toString().replace("amp;", "")
-        val url480 = jsonUrls["480p"].toString().replace("amp;", "")
-        val url240 = jsonUrls["240p"].toString().replace("amp;", "")
-
-        if (jsonUrls["1080p"] != "") {
-            videoList.add(Video(url1080, "1080p", url1080))
-        }
-        if (jsonUrls["720p"] != "") {
-            videoList.add(Video(url720, "720p", url720))
-        }
-        if (jsonUrls["480p"] != "") {
-            videoList.add(Video(url480, "480p", url480))
-        }
-        if (jsonUrls["240p"] != "") {
-            videoList.add(Video(url240, "240p", url240))
-        }
-
-        return videoList
+        val document = client.newCall(GET("https://appsdev.cyou/xv-ph-rt/api/?data=$url")).execute().asJsoup().body().text()
+        val jsonResponse = json.decodeFromString<PornApiResponse>(document)
+
+        return listOf(
+            Video(jsonResponse.hls!!.all!!,"HLS: ALL",jsonResponse.hls!!.all),
+            Video(jsonResponse.hls!!.low!!,"HLS: LOW",jsonResponse.hls!!.low),
+            Video(jsonResponse.hls!!.hd!!,"HLS: HD",jsonResponse.hls!!.hd),
+            Video(jsonResponse.hls!!.fhd!!,"HLS: FHD",jsonResponse.hls!!.fhd),
+            Video(jsonResponse.mp4!!.low!!,"MP4: LOW",jsonResponse.mp4!!.low),
+            Video(jsonResponse.mp4!!.sd!!,"MP4: SD",jsonResponse.mp4!!.sd),
+            Video(jsonResponse.mp4!!.hd!!,"MP4: HD",jsonResponse.mp4!!.hd),
+            Video(jsonResponse.mp4!!.fhd!!,"MP4: FHD",jsonResponse.mp4!!.fhd)
+        ).filter { it.url.isNotBlank() }
     }
 
     override fun videoListSelector() = throw Exception("not used")
@@ -131,9 +128,7 @@ class Pornhub : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
         return GET("$baseUrl/video/search?search=$query&page=$page", headers)
     }
-    override fun searchAnimeFromElement(element: Element): SAnime {
-        return popularAnimeFromElement(element)
-    }
+    override fun searchAnimeFromElement(element: Element): SAnime = popularAnimeFromElement(element)
 
     override fun searchAnimeNextPageSelector(): String = popularAnimeNextPageSelector()
 
@@ -175,4 +170,33 @@ class Pornhub : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         }
         screen.addPreference(videoQualityPref)
     }
+
+    @Serializable
+    data class PornApiResponse (
+        var hls        : Hls?    = Hls(),
+        var mp4        : Mp4?    = Mp4(),
+        var thumb      : String? = null,
+        var thumbnails : String? = null
+
+    )
+
+    @Serializable
+    data class Hls (
+        var all   : String? = "",
+        @SerialName("1080p" ) var fhd : String? = "",
+        @SerialName("720p"  ) var hd  : String? = "",
+        @SerialName("480p"  ) var sd  : String? = "",
+        @SerialName("240p"  ) var low  : String? = ""
+
+    )
+
+    @Serializable
+    data class Mp4 (
+    @SerialName("1080p" ) var fhd : String? = "",
+    @SerialName("720p"  ) var hd  : String? = "",
+    @SerialName("480p"  ) var sd  : String? = "",
+    @SerialName("240p"  ) var low  : String? = ""
+    )
+
+
 }
diff --git a/src/all/twitch/AndroidManifest.xml b/src/all/twitch/AndroidManifest.xml
new file mode 100644
index 0000000..42f73a0
--- /dev/null
+++ b/src/all/twitch/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+package="eu.kanade.tachiyomi.animeextension">
+
+<application android:icon="@mipmap/ic_launcher">
+    <activity
+        android:name=".all.twitch.TwitchIntent"
+        android:excludeFromRecents="true"
+        android:exported="true"
+        android:theme="@android:style/Theme.NoDisplay">
+        <intent-filter>
+            <action android:name="android.intent.action.VIEW" />
+
+            <category android:name="android.intent.category.DEFAULT" />
+            <category android:name="android.intent.category.BROWSABLE" />
+
+            <data
+                android:host="m.twitch.tv"
+                android:pathPattern="/..*"
+                android:scheme="https" />
+        </intent-filter>
+    </activity>
+</application>
+</manifest>
\ No newline at end of file
diff --git a/src/all/twitch/build.gradle b/src/all/twitch/build.gradle
new file mode 100644
index 0000000..d1fd18c
--- /dev/null
+++ b/src/all/twitch/build.gradle
@@ -0,0 +1,13 @@
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlinx-serialization'
+
+ext {
+    extName = 'Twitch'
+    pkgNameSuffix = 'all.twitch'
+    extClass = '.Twitch'
+    extVersionCode = 1
+    libVersion = '13'
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/all/twitch/res/mipmap-hdpi/ic_launcher.png b/src/all/twitch/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd0bc24a233857c87de35974301b395968eab2ee
GIT binary patch
literal 1654
zcmajfe>Br;90%~P8;-Dk+*_1ylIs?A35iumq{d-Ol1TF-`Q6E7n6Jr?>ZD?RUb)gF
zS1GzvS6T9Hku2NHbagp~?^<nEEoW?HGHZ8p??3Jzb<XoT&-?kD&pFTY{PVdOfWx2+
z%?tqmK>7N32LgajxR&k`O~pemakFOAjq}8M0>HfzqxmR3%~^*Ki17lb{p;Ro4weD_
zLHjiOi9I*IvXCof3Qdz?S|IKake^d6-)78?Jz-6&&;bCwabIuGpiG^~F>Lwh4r9H@
zVcQ8z^Ui{jQY)bWVHanpaUHR7X<ogJ3veZ`u@+r#6PWeI%V&#q<tWO+U=Q%!iabDf
z1EBMjcwyzNc%{rScf`Un#bOA4qRwuCb9<gSE5A&~LT6c=4`9%#A^4yumIEICU+4pa
zPch&qQS7472B(N(*~+*9_K5t?n~F~lQ(HykpV48+!&D~`$`*YH>C^=G%Qd%SS62wf
zeH_W>*R#pX;9CL?$(Cl?(=fP8?jqW6opZ3enzs4B!g@9*sCCr@h>Am^+he$zMj=#_
z>Q}32SQOY4njLKn8ckgsUP1?0cIik(svkwsFcv5t7qZ_TQGzXZsg|;G-Vc`25Mz3@
z71v-k>m!38aCMOt<+Wgv-Aun(bU0q8Iw@p4=Pu*V-u=SwzCajEz}f%knjnm>8oy!J
zANr`t?f?ccy!pXlApDWggnq};)`wh@adi9l5}K9w_|)U^b2{z4`u5gi+y<iuYvUVt
zzsR$XHZTf&^E<_a{7iL6+ti~fGU;y3{}iy+$1G7ksmDcom7(-`F~o#I=V0v(1<87c
zGS<Y~<5P_yhE|v~FfgumW)~F&#VgXgO}R!#jk)?mdt){v+~Uwo-S`IkT-L;EpEnfp
zuBpw<oW9zBB&zOl8q+R2bZ<zhnZ@M&_@5AqU0yFy5pMSJj&5Mc^2+>%>n{B8scfrN
zBawCZjH<Sf=o`&ES=wx{Lrg*b%wHR6Q!%J0&&2HegY{*Zxo-^)qO+&rx}K?%k?ukI
z<>z_Xq%Ju*;KbSdj1fHVIJuIV$Q~4gb^U6t&-1Gqds^juPVe^g3tZv;*Q)CapO&Bb
z`llm=VR-zLvv8IZ$9OjJ{>NxRGkUNuuVufVhY5XgG1H09M{K34$FgAfy}ILMMZ`?=
zAEAYF_Z06h@jiz+D~F3`)-_E#C+F}<sD?Qzw=2wDML0lO#+hA`oW)mmVdQuZ#;JnO
z79Bi-4Z{NZd-&*8#TS9)ZuJ(rL_C1?--?~wN%x=&R7xcwmwc>75$;28OGF+>hPfRs
zE!T(%$Wqu(j(df#ChALBuv4b#1m$UmgLD;=4vD9zY}W!}DB=sVWw_V)N}`Fh32x0a
z6;T)+Hqz~gGbEm-GF?lEzQ{$`PlglX%ZQt#mtZHzR7hcUY>);a!(s|sIR_J<h+5({
zX##>#56-&{3*T{7ZuRP(J9MGT4z=JH_s{J_592kHO}V9R$5KFi-R_*<PKR+M_~nW@
ziLnBP`(ZXjfvV(lGOGBK2+x(Uz|I9suuG!V3qI9K;)2}^`oU*OS{$%vK_AFS(qe<p
z7qGzIBrPV$T+j=$k~EsRAbUYS*w?JZ0XhFt4xEN_!&2sVs^|GFl5Kc$hWaX^i%_?U
z-CeHHnEbS&Cjs6~n>M8v$@|rN8w)|RZn!=3IlA;1+zm4`3!sYWVp;4Pa}kH(+FMgh
zEJd43(~)d=7?MwiPhfjV)o4rUVWbE?0y)XTg;*x3481YgBN>O}AXnjW*ca-6Dr7UV
zSka`2!y0AQT&7i^?W7O_!(vD-tDV61k*=T}rJ+b490xhcYlT=2sT}Q`T!ThywFpch
j|NL)F-MmgU{*^~(=$pKcw;G}~;~((dhx4X-MV|QwnBYbv

literal 0
HcmV?d00001

diff --git a/src/all/twitch/res/mipmap-mdpi/ic_launcher.png b/src/all/twitch/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd0bc24a233857c87de35974301b395968eab2ee
GIT binary patch
literal 1654
zcmajfe>Br;90%~P8;-Dk+*_1ylIs?A35iumq{d-Ol1TF-`Q6E7n6Jr?>ZD?RUb)gF
zS1GzvS6T9Hku2NHbagp~?^<nEEoW?HGHZ8p??3Jzb<XoT&-?kD&pFTY{PVdOfWx2+
z%?tqmK>7N32LgajxR&k`O~pemakFOAjq}8M0>HfzqxmR3%~^*Ki17lb{p;Ro4weD_
zLHjiOi9I*IvXCof3Qdz?S|IKake^d6-)78?Jz-6&&;bCwabIuGpiG^~F>Lwh4r9H@
zVcQ8z^Ui{jQY)bWVHanpaUHR7X<ogJ3veZ`u@+r#6PWeI%V&#q<tWO+U=Q%!iabDf
z1EBMjcwyzNc%{rScf`Un#bOA4qRwuCb9<gSE5A&~LT6c=4`9%#A^4yumIEICU+4pa
zPch&qQS7472B(N(*~+*9_K5t?n~F~lQ(HykpV48+!&D~`$`*YH>C^=G%Qd%SS62wf
zeH_W>*R#pX;9CL?$(Cl?(=fP8?jqW6opZ3enzs4B!g@9*sCCr@h>Am^+he$zMj=#_
z>Q}32SQOY4njLKn8ckgsUP1?0cIik(svkwsFcv5t7qZ_TQGzXZsg|;G-Vc`25Mz3@
z71v-k>m!38aCMOt<+Wgv-Aun(bU0q8Iw@p4=Pu*V-u=SwzCajEz}f%knjnm>8oy!J
zANr`t?f?ccy!pXlApDWggnq};)`wh@adi9l5}K9w_|)U^b2{z4`u5gi+y<iuYvUVt
zzsR$XHZTf&^E<_a{7iL6+ti~fGU;y3{}iy+$1G7ksmDcom7(-`F~o#I=V0v(1<87c
zGS<Y~<5P_yhE|v~FfgumW)~F&#VgXgO}R!#jk)?mdt){v+~Uwo-S`IkT-L;EpEnfp
zuBpw<oW9zBB&zOl8q+R2bZ<zhnZ@M&_@5AqU0yFy5pMSJj&5Mc^2+>%>n{B8scfrN
zBawCZjH<Sf=o`&ES=wx{Lrg*b%wHR6Q!%J0&&2HegY{*Zxo-^)qO+&rx}K?%k?ukI
z<>z_Xq%Ju*;KbSdj1fHVIJuIV$Q~4gb^U6t&-1Gqds^juPVe^g3tZv;*Q)CapO&Bb
z`llm=VR-zLvv8IZ$9OjJ{>NxRGkUNuuVufVhY5XgG1H09M{K34$FgAfy}ILMMZ`?=
zAEAYF_Z06h@jiz+D~F3`)-_E#C+F}<sD?Qzw=2wDML0lO#+hA`oW)mmVdQuZ#;JnO
z79Bi-4Z{NZd-&*8#TS9)ZuJ(rL_C1?--?~wN%x=&R7xcwmwc>75$;28OGF+>hPfRs
zE!T(%$Wqu(j(df#ChALBuv4b#1m$UmgLD;=4vD9zY}W!}DB=sVWw_V)N}`Fh32x0a
z6;T)+Hqz~gGbEm-GF?lEzQ{$`PlglX%ZQt#mtZHzR7hcUY>);a!(s|sIR_J<h+5({
zX##>#56-&{3*T{7ZuRP(J9MGT4z=JH_s{J_592kHO}V9R$5KFi-R_*<PKR+M_~nW@
ziLnBP`(ZXjfvV(lGOGBK2+x(Uz|I9suuG!V3qI9K;)2}^`oU*OS{$%vK_AFS(qe<p
z7qGzIBrPV$T+j=$k~EsRAbUYS*w?JZ0XhFt4xEN_!&2sVs^|GFl5Kc$hWaX^i%_?U
z-CeHHnEbS&Cjs6~n>M8v$@|rN8w)|RZn!=3IlA;1+zm4`3!sYWVp;4Pa}kH(+FMgh
zEJd43(~)d=7?MwiPhfjV)o4rUVWbE?0y)XTg;*x3481YgBN>O}AXnjW*ca-6Dr7UV
zSka`2!y0AQT&7i^?W7O_!(vD-tDV61k*=T}rJ+b490xhcYlT=2sT}Q`T!ThywFpch
j|NL)F-MmgU{*^~(=$pKcw;G}~;~((dhx4X-MV|QwnBYbv

literal 0
HcmV?d00001

diff --git a/src/all/twitch/res/mipmap-xhdpi/ic_launcher.png b/src/all/twitch/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd0bc24a233857c87de35974301b395968eab2ee
GIT binary patch
literal 1654
zcmajfe>Br;90%~P8;-Dk+*_1ylIs?A35iumq{d-Ol1TF-`Q6E7n6Jr?>ZD?RUb)gF
zS1GzvS6T9Hku2NHbagp~?^<nEEoW?HGHZ8p??3Jzb<XoT&-?kD&pFTY{PVdOfWx2+
z%?tqmK>7N32LgajxR&k`O~pemakFOAjq}8M0>HfzqxmR3%~^*Ki17lb{p;Ro4weD_
zLHjiOi9I*IvXCof3Qdz?S|IKake^d6-)78?Jz-6&&;bCwabIuGpiG^~F>Lwh4r9H@
zVcQ8z^Ui{jQY)bWVHanpaUHR7X<ogJ3veZ`u@+r#6PWeI%V&#q<tWO+U=Q%!iabDf
z1EBMjcwyzNc%{rScf`Un#bOA4qRwuCb9<gSE5A&~LT6c=4`9%#A^4yumIEICU+4pa
zPch&qQS7472B(N(*~+*9_K5t?n~F~lQ(HykpV48+!&D~`$`*YH>C^=G%Qd%SS62wf
zeH_W>*R#pX;9CL?$(Cl?(=fP8?jqW6opZ3enzs4B!g@9*sCCr@h>Am^+he$zMj=#_
z>Q}32SQOY4njLKn8ckgsUP1?0cIik(svkwsFcv5t7qZ_TQGzXZsg|;G-Vc`25Mz3@
z71v-k>m!38aCMOt<+Wgv-Aun(bU0q8Iw@p4=Pu*V-u=SwzCajEz}f%knjnm>8oy!J
zANr`t?f?ccy!pXlApDWggnq};)`wh@adi9l5}K9w_|)U^b2{z4`u5gi+y<iuYvUVt
zzsR$XHZTf&^E<_a{7iL6+ti~fGU;y3{}iy+$1G7ksmDcom7(-`F~o#I=V0v(1<87c
zGS<Y~<5P_yhE|v~FfgumW)~F&#VgXgO}R!#jk)?mdt){v+~Uwo-S`IkT-L;EpEnfp
zuBpw<oW9zBB&zOl8q+R2bZ<zhnZ@M&_@5AqU0yFy5pMSJj&5Mc^2+>%>n{B8scfrN
zBawCZjH<Sf=o`&ES=wx{Lrg*b%wHR6Q!%J0&&2HegY{*Zxo-^)qO+&rx}K?%k?ukI
z<>z_Xq%Ju*;KbSdj1fHVIJuIV$Q~4gb^U6t&-1Gqds^juPVe^g3tZv;*Q)CapO&Bb
z`llm=VR-zLvv8IZ$9OjJ{>NxRGkUNuuVufVhY5XgG1H09M{K34$FgAfy}ILMMZ`?=
zAEAYF_Z06h@jiz+D~F3`)-_E#C+F}<sD?Qzw=2wDML0lO#+hA`oW)mmVdQuZ#;JnO
z79Bi-4Z{NZd-&*8#TS9)ZuJ(rL_C1?--?~wN%x=&R7xcwmwc>75$;28OGF+>hPfRs
zE!T(%$Wqu(j(df#ChALBuv4b#1m$UmgLD;=4vD9zY}W!}DB=sVWw_V)N}`Fh32x0a
z6;T)+Hqz~gGbEm-GF?lEzQ{$`PlglX%ZQt#mtZHzR7hcUY>);a!(s|sIR_J<h+5({
zX##>#56-&{3*T{7ZuRP(J9MGT4z=JH_s{J_592kHO}V9R$5KFi-R_*<PKR+M_~nW@
ziLnBP`(ZXjfvV(lGOGBK2+x(Uz|I9suuG!V3qI9K;)2}^`oU*OS{$%vK_AFS(qe<p
z7qGzIBrPV$T+j=$k~EsRAbUYS*w?JZ0XhFt4xEN_!&2sVs^|GFl5Kc$hWaX^i%_?U
z-CeHHnEbS&Cjs6~n>M8v$@|rN8w)|RZn!=3IlA;1+zm4`3!sYWVp;4Pa}kH(+FMgh
zEJd43(~)d=7?MwiPhfjV)o4rUVWbE?0y)XTg;*x3481YgBN>O}AXnjW*ca-6Dr7UV
zSka`2!y0AQT&7i^?W7O_!(vD-tDV61k*=T}rJ+b490xhcYlT=2sT}Q`T!ThywFpch
j|NL)F-MmgU{*^~(=$pKcw;G}~;~((dhx4X-MV|QwnBYbv

literal 0
HcmV?d00001

diff --git a/src/all/twitch/res/mipmap-xxhdpi/ic_launcher.png b/src/all/twitch/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd0bc24a233857c87de35974301b395968eab2ee
GIT binary patch
literal 1654
zcmajfe>Br;90%~P8;-Dk+*_1ylIs?A35iumq{d-Ol1TF-`Q6E7n6Jr?>ZD?RUb)gF
zS1GzvS6T9Hku2NHbagp~?^<nEEoW?HGHZ8p??3Jzb<XoT&-?kD&pFTY{PVdOfWx2+
z%?tqmK>7N32LgajxR&k`O~pemakFOAjq}8M0>HfzqxmR3%~^*Ki17lb{p;Ro4weD_
zLHjiOi9I*IvXCof3Qdz?S|IKake^d6-)78?Jz-6&&;bCwabIuGpiG^~F>Lwh4r9H@
zVcQ8z^Ui{jQY)bWVHanpaUHR7X<ogJ3veZ`u@+r#6PWeI%V&#q<tWO+U=Q%!iabDf
z1EBMjcwyzNc%{rScf`Un#bOA4qRwuCb9<gSE5A&~LT6c=4`9%#A^4yumIEICU+4pa
zPch&qQS7472B(N(*~+*9_K5t?n~F~lQ(HykpV48+!&D~`$`*YH>C^=G%Qd%SS62wf
zeH_W>*R#pX;9CL?$(Cl?(=fP8?jqW6opZ3enzs4B!g@9*sCCr@h>Am^+he$zMj=#_
z>Q}32SQOY4njLKn8ckgsUP1?0cIik(svkwsFcv5t7qZ_TQGzXZsg|;G-Vc`25Mz3@
z71v-k>m!38aCMOt<+Wgv-Aun(bU0q8Iw@p4=Pu*V-u=SwzCajEz}f%knjnm>8oy!J
zANr`t?f?ccy!pXlApDWggnq};)`wh@adi9l5}K9w_|)U^b2{z4`u5gi+y<iuYvUVt
zzsR$XHZTf&^E<_a{7iL6+ti~fGU;y3{}iy+$1G7ksmDcom7(-`F~o#I=V0v(1<87c
zGS<Y~<5P_yhE|v~FfgumW)~F&#VgXgO}R!#jk)?mdt){v+~Uwo-S`IkT-L;EpEnfp
zuBpw<oW9zBB&zOl8q+R2bZ<zhnZ@M&_@5AqU0yFy5pMSJj&5Mc^2+>%>n{B8scfrN
zBawCZjH<Sf=o`&ES=wx{Lrg*b%wHR6Q!%J0&&2HegY{*Zxo-^)qO+&rx}K?%k?ukI
z<>z_Xq%Ju*;KbSdj1fHVIJuIV$Q~4gb^U6t&-1Gqds^juPVe^g3tZv;*Q)CapO&Bb
z`llm=VR-zLvv8IZ$9OjJ{>NxRGkUNuuVufVhY5XgG1H09M{K34$FgAfy}ILMMZ`?=
zAEAYF_Z06h@jiz+D~F3`)-_E#C+F}<sD?Qzw=2wDML0lO#+hA`oW)mmVdQuZ#;JnO
z79Bi-4Z{NZd-&*8#TS9)ZuJ(rL_C1?--?~wN%x=&R7xcwmwc>75$;28OGF+>hPfRs
zE!T(%$Wqu(j(df#ChALBuv4b#1m$UmgLD;=4vD9zY}W!}DB=sVWw_V)N}`Fh32x0a
z6;T)+Hqz~gGbEm-GF?lEzQ{$`PlglX%ZQt#mtZHzR7hcUY>);a!(s|sIR_J<h+5({
zX##>#56-&{3*T{7ZuRP(J9MGT4z=JH_s{J_592kHO}V9R$5KFi-R_*<PKR+M_~nW@
ziLnBP`(ZXjfvV(lGOGBK2+x(Uz|I9suuG!V3qI9K;)2}^`oU*OS{$%vK_AFS(qe<p
z7qGzIBrPV$T+j=$k~EsRAbUYS*w?JZ0XhFt4xEN_!&2sVs^|GFl5Kc$hWaX^i%_?U
z-CeHHnEbS&Cjs6~n>M8v$@|rN8w)|RZn!=3IlA;1+zm4`3!sYWVp;4Pa}kH(+FMgh
zEJd43(~)d=7?MwiPhfjV)o4rUVWbE?0y)XTg;*x3481YgBN>O}AXnjW*ca-6Dr7UV
zSka`2!y0AQT&7i^?W7O_!(vD-tDV61k*=T}rJ+b490xhcYlT=2sT}Q`T!ThywFpch
j|NL)F-MmgU{*^~(=$pKcw;G}~;~((dhx4X-MV|QwnBYbv

literal 0
HcmV?d00001

diff --git a/src/all/twitch/res/mipmap-xxxhdpi/ic_launcher.png b/src/all/twitch/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd0bc24a233857c87de35974301b395968eab2ee
GIT binary patch
literal 1654
zcmajfe>Br;90%~P8;-Dk+*_1ylIs?A35iumq{d-Ol1TF-`Q6E7n6Jr?>ZD?RUb)gF
zS1GzvS6T9Hku2NHbagp~?^<nEEoW?HGHZ8p??3Jzb<XoT&-?kD&pFTY{PVdOfWx2+
z%?tqmK>7N32LgajxR&k`O~pemakFOAjq}8M0>HfzqxmR3%~^*Ki17lb{p;Ro4weD_
zLHjiOi9I*IvXCof3Qdz?S|IKake^d6-)78?Jz-6&&;bCwabIuGpiG^~F>Lwh4r9H@
zVcQ8z^Ui{jQY)bWVHanpaUHR7X<ogJ3veZ`u@+r#6PWeI%V&#q<tWO+U=Q%!iabDf
z1EBMjcwyzNc%{rScf`Un#bOA4qRwuCb9<gSE5A&~LT6c=4`9%#A^4yumIEICU+4pa
zPch&qQS7472B(N(*~+*9_K5t?n~F~lQ(HykpV48+!&D~`$`*YH>C^=G%Qd%SS62wf
zeH_W>*R#pX;9CL?$(Cl?(=fP8?jqW6opZ3enzs4B!g@9*sCCr@h>Am^+he$zMj=#_
z>Q}32SQOY4njLKn8ckgsUP1?0cIik(svkwsFcv5t7qZ_TQGzXZsg|;G-Vc`25Mz3@
z71v-k>m!38aCMOt<+Wgv-Aun(bU0q8Iw@p4=Pu*V-u=SwzCajEz}f%knjnm>8oy!J
zANr`t?f?ccy!pXlApDWggnq};)`wh@adi9l5}K9w_|)U^b2{z4`u5gi+y<iuYvUVt
zzsR$XHZTf&^E<_a{7iL6+ti~fGU;y3{}iy+$1G7ksmDcom7(-`F~o#I=V0v(1<87c
zGS<Y~<5P_yhE|v~FfgumW)~F&#VgXgO}R!#jk)?mdt){v+~Uwo-S`IkT-L;EpEnfp
zuBpw<oW9zBB&zOl8q+R2bZ<zhnZ@M&_@5AqU0yFy5pMSJj&5Mc^2+>%>n{B8scfrN
zBawCZjH<Sf=o`&ES=wx{Lrg*b%wHR6Q!%J0&&2HegY{*Zxo-^)qO+&rx}K?%k?ukI
z<>z_Xq%Ju*;KbSdj1fHVIJuIV$Q~4gb^U6t&-1Gqds^juPVe^g3tZv;*Q)CapO&Bb
z`llm=VR-zLvv8IZ$9OjJ{>NxRGkUNuuVufVhY5XgG1H09M{K34$FgAfy}ILMMZ`?=
zAEAYF_Z06h@jiz+D~F3`)-_E#C+F}<sD?Qzw=2wDML0lO#+hA`oW)mmVdQuZ#;JnO
z79Bi-4Z{NZd-&*8#TS9)ZuJ(rL_C1?--?~wN%x=&R7xcwmwc>75$;28OGF+>hPfRs
zE!T(%$Wqu(j(df#ChALBuv4b#1m$UmgLD;=4vD9zY}W!}DB=sVWw_V)N}`Fh32x0a
z6;T)+Hqz~gGbEm-GF?lEzQ{$`PlglX%ZQt#mtZHzR7hcUY>);a!(s|sIR_J<h+5({
zX##>#56-&{3*T{7ZuRP(J9MGT4z=JH_s{J_592kHO}V9R$5KFi-R_*<PKR+M_~nW@
ziLnBP`(ZXjfvV(lGOGBK2+x(Uz|I9suuG!V3qI9K;)2}^`oU*OS{$%vK_AFS(qe<p
z7qGzIBrPV$T+j=$k~EsRAbUYS*w?JZ0XhFt4xEN_!&2sVs^|GFl5Kc$hWaX^i%_?U
z-CeHHnEbS&Cjs6~n>M8v$@|rN8w)|RZn!=3IlA;1+zm4`3!sYWVp;4Pa}kH(+FMgh
zEJd43(~)d=7?MwiPhfjV)o4rUVWbE?0y)XTg;*x3481YgBN>O}AXnjW*ca-6Dr7UV
zSka`2!y0AQT&7i^?W7O_!(vD-tDV61k*=T}rJ+b490xhcYlT=2sT}Q`T!ThywFpch
j|NL)F-MmgU{*^~(=$pKcw;G}~;~((dhx4X-MV|QwnBYbv

literal 0
HcmV?d00001

diff --git a/src/all/twitch/src/eu/kanade/tachiyomi/animeextension/all/twitch/Twitch.kt b/src/all/twitch/src/eu/kanade/tachiyomi/animeextension/all/twitch/Twitch.kt
new file mode 100644
index 0000000..3a78b4d
--- /dev/null
+++ b/src/all/twitch/src/eu/kanade/tachiyomi/animeextension/all/twitch/Twitch.kt
@@ -0,0 +1,257 @@
+package eu.kanade.tachiyomi.animeextension.all.twitch
+
+import android.app.Application
+import android.content.SharedPreferences
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
+import eu.kanade.tachiyomi.animesource.model.AnimesPage
+import eu.kanade.tachiyomi.animesource.model.SAnime
+import eu.kanade.tachiyomi.animesource.model.SEpisode
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+import uy.kohesive.injekt.injectLazy
+
+class Twitch : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
+
+    override val name = "Twitch"
+
+    override val baseUrl = "https://twitchtracker.com" // bruh idk if exists a better page to get the details from the streamer
+
+    override val lang = "all"
+
+    override val supportsLatest = true
+
+    override val client: OkHttpClient = network.cloudflareClient
+
+    private val json: Json by injectLazy()
+
+    private val preferences: SharedPreferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    override fun popularAnimeSelector(): String = "tbody tr"
+
+    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/channels/ranking?page=$page")
+
+    override fun popularAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create().apply {
+            setUrlWithoutDomain(
+                element.select("td a").attr("href")
+            )
+            title = element.select("td a").text()
+            thumbnail_url = element.select("td a img").attr("src")
+        }
+        return anime
+    }
+
+    override fun popularAnimeNextPageSelector(): String = "ul.pagination.pagination-simple li a:contains(Next)"
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val document = response.asJsoup()
+
+        return if (document.select("li.list-group-item span.label.label-danger").text().contains("streaming now")) {
+            mutableListOf(
+                SEpisode.create().apply {
+                    setUrlWithoutDomain(response.request.url.toString())
+                    name = "Streaming Now (Refresh to update state)"
+                    episode_number = 1F
+                }
+            )
+        } else {
+            mutableListOf(
+                SEpisode.create().apply {
+                    url = ""
+                    name = "Offline (Refresh to update state)"
+                    episode_number = 0F
+                }
+            )
+        }
+    }
+
+    override fun episodeListSelector() = throw Exception("not used")
+
+    override fun episodeFromElement(element: Element) = throw Exception("not used")
+
+    override fun videoListParse(response: Response): List<Video> {
+        if (response.request.url.toString() == "$baseUrl/") {
+            val amogusVideo = "https://cdn.discordapp.com/attachments/909242748283006996/1014362630456090654/amogus.mp4"
+            return listOf(Video(amogusVideo, "Refresh Anime to Update State (Offline)", amogusVideo))
+        }
+        val videos = mutableListOf<Video>()
+        if (response.request.url.toString().isNotBlank()) {
+
+            val channelName = response.request.url.toString().substringAfterLast("/")
+            val twitchUrl = "https://www.twitch.tv/$channelName"
+            val apiUrl = "https://pwn.sh/tools/streamapi.py?url=$twitchUrl"
+            val jsonResponse = client.newCall(GET(apiUrl)).execute().body!!.string()
+            val json = json.decodeFromString<ApiResponse>(jsonResponse)
+            videos.add(Video("${json.urls!!.audio_only}", "Audio Only", "${json.urls!!.audio_only}"))
+            videos.add(Video("${json.urls!!.veryLow}", "Very Low", "${json.urls!!.veryLow}"))
+            videos.add(Video("${json.urls!!.low}", "Low", "${json.urls!!.low}"))
+            videos.add(Video("${json.urls!!.sd}", "SD", "${json.urls!!.sd}"))
+            videos.add(Video("${json.urls!!.hd}", "HD", "${json.urls!!.hd}"))
+            videos.add(Video("${json.urls!!.fhd}", "FHD", "${json.urls!!.fhd}"))
+        }
+
+        return videos.filter { it.url != "null" }
+    }
+
+    override fun videoListSelector() = throw Exception("not used")
+
+    override fun videoUrlParse(document: Document) = throw Exception("not used")
+
+    override fun videoFromElement(element: Element) = throw Exception("not used")
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
+        val liveNowFilter = try { (filters.find { it is LiveNowFilter } as LiveNowFilter).state } catch (e: Exception) { false }
+        val langFilter = try { (filters.find { it is LanguageFilter } as LanguageFilter) } catch (e: Exception) { LanguageFilter().apply { state = 0 } }
+
+        return when {
+            query.isNotBlank() -> GET("$baseUrl/search?q=$query")
+            liveNowFilter && langFilter.state != 0 -> GET("$baseUrl/channels/live/${langFilter.toUriPart()}?page=$page")
+            liveNowFilter -> GET("$baseUrl/channels/live?page=$page")
+            langFilter.state != 0 -> GET("$baseUrl/channels/ranking/${langFilter.toUriPart()}?page=$page")
+            else -> GET("$baseUrl/channels/ranking?page=$page")
+        }
+    }
+
+    override fun searchAnimeParse(response: Response): AnimesPage {
+        val url = response.request.url.toString()
+        val document = response.asJsoup()
+        return if (url.contains("/channels/")) {
+            val nextPageElement = document.select("ul.pagination.pagination-simple li a:contains(Next)").first().text()
+            val nextPage = !nextPageElement.isNullOrBlank()
+            AnimesPage(document.select(popularAnimeSelector()).map { popularAnimeFromElement(it) }, nextPage)
+        } else {
+            AnimesPage(document.select(searchAnimeSelector()).map { searchAnimeFromElement(it) }, false)
+        }
+    }
+
+    override fun searchAnimeFromElement(element: Element): SAnime = SAnime.create().apply {
+        thumbnail_url = element.select("td.image-cell img").attr("src")
+        title = element.select("td a.item-title").text()
+        url = popularAnimeFromElement(element).url
+    }
+
+    override fun searchAnimeNextPageSelector(): String = popularAnimeNextPageSelector()
+
+    override fun searchAnimeSelector(): String = "table.tops.table.table-condensed.table-hover tbody tr"
+
+    override fun animeDetailsParse(document: Document): SAnime {
+        val anime = SAnime.create().apply {
+            title = document.select("div#app-conception div#app-title").text()
+            genre = document.select("ul.list-group.text-center li.list-group-item div div a.label.label-soft").text()
+            status = SAnime.ONGOING
+            description = document.select("div.row div.col-md-4.text-center").text()
+        }
+        return anime
+    }
+
+    override fun latestUpdatesNextPageSelector() = popularAnimeNextPageSelector()
+
+    override fun latestUpdatesFromElement(element: Element) = popularAnimeFromElement(element)
+
+    override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/channels/live?page=$page")
+
+    override fun latestUpdatesSelector() = popularAnimeSelector()
+
+    override fun getFilterList(): AnimeFilterList = AnimeFilterList(
+        AnimeFilter.Header("La busqueda por texto ignora el filtro"),
+        LiveNowFilter(),
+        LanguageFilter()
+    )
+
+    private class LiveNowFilter : AnimeFilter.CheckBox("Just show Live Now", false)
+
+    private class LanguageFilter : UriPartFilter(
+        "Languages",
+        arrayOf(
+            Pair("<Seleccionar>", ""),
+            Pair("English", "english"),
+            Pair("Spanish", "spanish"),
+            Pair("Portuguese", "portuguese"),
+            Pair("French", "french"),
+            Pair("German", "german"),
+            Pair("Italian", "italian"),
+            Pair("Russian", "russian"),
+            Pair("Japanese", "japanese"),
+            Pair("Korean", "korean"),
+            Pair("Chinese", "chinese"),
+            Pair("Italian", "italian")
+        )
+    )
+    private open class UriPartFilter(displayName: String, val vals: Array<Pair<String, String>>) :
+        AnimeFilter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) {
+        fun toUriPart() = vals[state].second
+    }
+
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString("preferred_quality", "Amazon")
+        if (quality != null) {
+            val newList = mutableListOf<Video>()
+            var preferred = 0
+            for (video in this) {
+                if (video.quality == quality) {
+                    newList.add(preferred, video)
+                    preferred++
+                } else {
+                    newList.add(video)
+                }
+            }
+            return newList
+        }
+        return this
+    }
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+
+        val videoQualityPref = ListPreference(screen.context).apply {
+            key = "preferred_quality"
+            title = "Preferred video quality"
+            entries = arrayOf("Audio Only", "160p", "360p", "480p", "720p60FPS", "1080p60FPS")
+            entryValues = arrayOf("Audio Only", "Very Low", "Low", "SD", "HD", "FHD")
+            setDefaultValue("720p60FPS")
+            summary = "%s"
+
+            setOnPreferenceChangeListener { _, newValue ->
+                val selected = newValue as String
+                val index = findIndexOfValue(selected)
+                val entry = entryValues[index] as String
+                preferences.edit().putString(key, entry).commit()
+            }
+        }
+        screen.addPreference(videoQualityPref)
+    }
+
+    @Serializable
+    data class ApiResponse(
+        var success: Boolean? = null,
+        var urls: Urls? = Urls()
+    )
+
+    @Serializable
+    data class Urls(
+        var audio_only: String? = null,
+        @SerialName("160p") var veryLow: String? = null,
+        @SerialName("360p") var low: String? = null,
+        @SerialName("480p") var sd: String? = null,
+        @SerialName("720p60") var hd: String? = null,
+        @SerialName("1080p60") var fhd: String? = null
+    )
+}
diff --git a/src/all/twitch/src/eu/kanade/tachiyomi/animeextension/all/twitch/TwitchIntent.kt b/src/all/twitch/src/eu/kanade/tachiyomi/animeextension/all/twitch/TwitchIntent.kt
new file mode 100644
index 0000000..66d0537
--- /dev/null
+++ b/src/all/twitch/src/eu/kanade/tachiyomi/animeextension/all/twitch/TwitchIntent.kt
@@ -0,0 +1,27 @@
+package eu.kanade.tachiyomi.animeextension.all.twitch
+
+import android.app.Activity
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.os.Bundle
+import kotlin.system.exitProcess
+
+class TwitchIntent : Activity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val pathSegments = intent?.data?.pathSegments
+        if (pathSegments != null) {
+            val mainIntent = Intent().apply {
+                action = "eu.kanade.tachiyomi.ANIMESEARCH"
+                putExtra("query", pathSegments[0])
+                putExtra("filter", packageName)
+            }
+            try {
+                startActivity(mainIntent)
+            } catch (e: ActivityNotFoundException) {}
+        }
+
+        finish()
+        exitProcess(0)
+    }
+}
diff --git a/src/all/xvideos/build.gradle b/src/all/xvideos/build.gradle
index 6b63659..6fa2149 100644
--- a/src/all/xvideos/build.gradle
+++ b/src/all/xvideos/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'Xvideos'
     pkgNameSuffix = 'all.xvideos'
     extClass = '.Xvideos'
-    extVersionCode = 2
+    extVersionCode = 3
     libVersion = '13'
     containsNsfw = true
 }
diff --git a/src/all/xvideos/src/eu/kanade/tachiyomi/animeextension/all/xvideos/Xvideos.kt b/src/all/xvideos/src/eu/kanade/tachiyomi/animeextension/all/xvideos/Xvideos.kt
index be9c51f..d77750e 100644
--- a/src/all/xvideos/src/eu/kanade/tachiyomi/animeextension/all/xvideos/Xvideos.kt
+++ b/src/all/xvideos/src/eu/kanade/tachiyomi/animeextension/all/xvideos/Xvideos.kt
@@ -40,7 +40,7 @@ class Xvideos : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun popularAnimeSelector(): String = "div#main div#content div.mozaique.cust-nb-cols > div"
 
-    override fun popularAnimeRequest(page: Int): Request = GET("https://www.xvideos.com/new/$page")
+    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/new/$page")
 
     override fun popularAnimeFromElement(element: Element): SAnime {
         val anime = SAnime.create()
@@ -58,7 +58,7 @@ class Xvideos : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         val episodes = mutableListOf<SEpisode>()
         val episode = SEpisode.create().apply {
             name = "Video"
-            url = response.request.url.toString().replace("https://www.xvideos.com", "")
+            setUrlWithoutDomain(response.request.url.toString())
             date_upload = System.currentTimeMillis()
         }
         episodes.add(episode)
@@ -90,7 +90,7 @@ class Xvideos : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     override fun videoFromElement(element: Element) = throw Exception("not used")
 
     override fun List<Video>.sort(): List<Video> {
-        val quality = preferences.getString("preferred_quality", "High")
+        val quality = preferences.getString("preferred_quality", "HLS")
         if (quality != null) {
             val newList = mutableListOf<Video>()
             var preferred = 0
@@ -108,10 +108,11 @@ class Xvideos : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     }
 
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
-
+        val tagFilter = filters.find{it is Tags} as Tags
         return when {
             query.isNotBlank() -> GET("$baseUrl/?k=$query&p=$page", headers)
-            else -> GET("$baseUrl/tags/${getSearchParameters(filters)}/$page ")
+            tagFilter.state.isNotBlank() -> GET("$baseUrl/tags/${tagFilter.state}/$page ")
+            else -> GET("$baseUrl/new/$page", headers)
         }
     }
     override fun searchAnimeFromElement(element: Element): SAnime {
@@ -141,26 +142,10 @@ class Xvideos : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override fun getFilterList(): AnimeFilterList = AnimeFilterList(
         AnimeFilter.Header("Search by text does not affect the filter"),
-        Tags("", "Tag")
+        Tags("Tag")
     )
 
-    private fun getSearchParameters(filters: AnimeFilterList): String {
-        var finalstring = ""
-        var tags = ""
-
-        filters.forEach { filter ->
-            when (filter) {
-                is Tags -> {
-                    tags = filter.state.ifEmpty { "" }
-                }
-                else -> {}
-            }
-            finalstring += tags
-        }
-        return finalstring
-    }
-
-    internal class Tags(val input: String, name: String) : AnimeFilter.Text(name)
+    internal class Tags(name: String) : AnimeFilter.Text(name)
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
         val videoQualityPref = ListPreference(screen.context).apply {