From bb884dfee1e98bb8933022f9988ca11adcba3e47 Mon Sep 17 00:00:00 2001
From: OncePunchedMan <64155117+OncePunchedMan@users.noreply.github.com>
Date: Tue, 19 Jan 2021 22:42:11 +0000
Subject: [PATCH] fix remanga blocking tachi (#5491)

---
 src/ru/remanga/build.gradle                   |  2 +-
 .../tachiyomi/extension/ru/remanga/Remanga.kt | 21 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/ru/remanga/build.gradle b/src/ru/remanga/build.gradle
index 1520b3093..c86b9d3ee 100644
--- a/src/ru/remanga/build.gradle
+++ b/src/ru/remanga/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'Remanga'
     pkgNameSuffix = 'ru.remanga'
     extClass = '.Remanga'
-    extVersionCode = 12
+    extVersionCode = 13
     libVersion = '1.2'
 }
 
diff --git a/src/ru/remanga/src/eu/kanade/tachiyomi/extension/ru/remanga/Remanga.kt b/src/ru/remanga/src/eu/kanade/tachiyomi/extension/ru/remanga/Remanga.kt
index ca3bfd883..210cf2775 100644
--- a/src/ru/remanga/src/eu/kanade/tachiyomi/extension/ru/remanga/Remanga.kt
+++ b/src/ru/remanga/src/eu/kanade/tachiyomi/extension/ru/remanga/Remanga.kt
@@ -57,6 +57,8 @@ import java.io.ByteArrayOutputStream
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
+import kotlin.math.absoluteValue
+import kotlin.random.Random
 
 class Remanga : ConfigurableSource, HttpSource() {
     override val name = "Remanga"
@@ -69,10 +71,11 @@ class Remanga : ConfigurableSource, HttpSource() {
 
     private var token: String = ""
 
-    override fun headersBuilder() = Headers.Builder().apply {
-        add("User-Agent", "Tachiyomi" + System.getProperty("http.agent"))
-        add("Referer", baseUrl)
-    }
+    protected open val userAgentRandomizer = " ${Random.nextInt().absoluteValue}"
+
+    override fun headersBuilder(): Headers.Builder = Headers.Builder()
+        .add("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:77.0) Gecko/20100101 Firefox/78.0$userAgentRandomizer")
+        .add("Referer", "https://www.google.com")
 
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
@@ -332,10 +335,7 @@ class Remanga : ConfigurableSource, HttpSource() {
     override fun imageUrlParse(response: Response): String = throw NotImplementedError("Unused")
 
     private fun combineImage(pages: List<String>): String {
-        val refererHeaders = Headers.Builder().apply {
-            add("User-Agent", "Tachiyomi" + System.getProperty("http.agent"))
-            add("Referer", "https://img.remanga.org")
-        }.build()
+        val refererHeaders = headersBuilder().build()
         val s = client.newCall(GET(pages[0], refererHeaders)).execute().body()!!.bytes()
         val b = BitmapFactory.decodeByteArray(s, 0, s.size)
 
@@ -357,10 +357,7 @@ class Remanga : ConfigurableSource, HttpSource() {
     }
 
     override fun imageRequest(page: Page): Request {
-        val refererHeaders = Headers.Builder().apply {
-            add("User-Agent", "Tachiyomi" + System.getProperty("http.agent"))
-            add("Referer", "https://img.remanga.org")
-        }.build()
+        val refererHeaders = headersBuilder().build()
         return GET(page.imageUrl!!, refererHeaders)
     }