From ae4cfda52639c66d452c09feb8944c8a04596d1d Mon Sep 17 00:00:00 2001
From: Samfun75 <38332931+Samfun75@users.noreply.github.com>
Date: Wed, 7 Dec 2022 15:13:16 +0300
Subject: [PATCH] SuperStream: Revert sub point type & Putlocker: Fix Search
 (#1065)

Fixes https://github.com/jmir1/aniyomi-extensions/issues/1063
---
 src/en/putlocker/build.gradle                                  | 2 +-
 .../kanade/tachiyomi/animeextension/en/putlocker/PutLocker.kt  | 2 +-
 src/en/superstream/build.gradle                                | 2 +-
 .../tachiyomi/animeextension/en/superstream/DataModel.kt       | 3 ++-
 .../tachiyomi/animeextension/en/superstream/SuperStreamAPI.kt  | 3 ++-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/en/putlocker/build.gradle b/src/en/putlocker/build.gradle
index 96e2c7ff8..0b4b11c25 100644
--- a/src/en/putlocker/build.gradle
+++ b/src/en/putlocker/build.gradle
@@ -6,7 +6,7 @@ ext {
     extName = 'PutLocker'
     pkgNameSuffix = 'en.putlocker'
     extClass = '.PutLocker'
-    extVersionCode = 2
+    extVersionCode = 3
     libVersion = '13'
 }
 
diff --git a/src/en/putlocker/src/eu/kanade/tachiyomi/animeextension/en/putlocker/PutLocker.kt b/src/en/putlocker/src/eu/kanade/tachiyomi/animeextension/en/putlocker/PutLocker.kt
index 956f327ab..dde40764f 100644
--- a/src/en/putlocker/src/eu/kanade/tachiyomi/animeextension/en/putlocker/PutLocker.kt
+++ b/src/en/putlocker/src/eu/kanade/tachiyomi/animeextension/en/putlocker/PutLocker.kt
@@ -85,7 +85,7 @@ class PutLocker : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     // =============================== Search ===============================
 
     override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
-        val re = Regex("[^A-Za-z0-9]")
+        val re = Regex("[^A-Za-z0-9 ]")
         val cleanQuery = re.replace(query, "").replace(" ", "+").lowercase()
         return GET("$baseUrl/movie/search/$cleanQuery/$page/")
     }
diff --git a/src/en/superstream/build.gradle b/src/en/superstream/build.gradle
index 9982edabd..91e8f34b0 100644
--- a/src/en/superstream/build.gradle
+++ b/src/en/superstream/build.gradle
@@ -6,7 +6,7 @@ ext {
     extName = 'SuperStream'
     pkgNameSuffix = 'en.superstream'
     extClass = '.SuperStream'
-    extVersionCode = 6
+    extVersionCode = 7
     libVersion = '13'
 }
 
diff --git a/src/en/superstream/src/eu/kanade/tachiyomi/animeextension/en/superstream/DataModel.kt b/src/en/superstream/src/eu/kanade/tachiyomi/animeextension/en/superstream/DataModel.kt
index 2f11903b8..11e8724d1 100644
--- a/src/en/superstream/src/eu/kanade/tachiyomi/animeextension/en/superstream/DataModel.kt
+++ b/src/en/superstream/src/eu/kanade/tachiyomi/animeextension/en/superstream/DataModel.kt
@@ -1,6 +1,7 @@
 package eu.kanade.tachiyomi.animeextension.en.superstream
 
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonElement
 
 @Serializable
 data class LinkData(
@@ -266,7 +267,7 @@ data class Subtitles(
     val lang: String? = null,
     val language: String? = null,
     val delay: Int? = null,
-    val point: String? = null,
+    val point: JsonElement? = null,
     val order: Int? = null,
     val admin_order: Int? = null,
     val myselect: Int? = null,
diff --git a/src/en/superstream/src/eu/kanade/tachiyomi/animeextension/en/superstream/SuperStreamAPI.kt b/src/en/superstream/src/eu/kanade/tachiyomi/animeextension/en/superstream/SuperStreamAPI.kt
index 8f20f69fc..0754a11b1 100644
--- a/src/en/superstream/src/eu/kanade/tachiyomi/animeextension/en/superstream/SuperStreamAPI.kt
+++ b/src/en/superstream/src/eu/kanade/tachiyomi/animeextension/en/superstream/SuperStreamAPI.kt
@@ -689,6 +689,7 @@ import eu.kanade.tachiyomi.network.POST
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.jsonPrimitive
 import okhttp3.FormBody
 import okhttp3.Headers
 import okhttp3.OkHttpClient
@@ -1009,7 +1010,7 @@ class SuperStreamAPI(val json: Json) {
                         subsList.add(
                             Track(
                                 sub.file_path,
-                                (sub.language ?: sub.lang ?: "Sub") + " ${index + 1} (${sub.point!!})"
+                                (sub.language ?: sub.lang ?: "Sub") + " ${index + 1} (${sub.point!!.jsonPrimitive.content})"
                             )
                         )
                     }