From 055dbce5d2807b9caba89480d5c0b351cd2f19ea Mon Sep 17 00:00:00 2001
From: siritami <102145692+FiorenMas@users.noreply.github.com>
Date: Wed, 22 Jan 2025 14:03:35 +0700
Subject: [PATCH] fix tiktok

Because apkmirror prevent US download tiktok, lead github action (ip in US) can't download apk file. So I switch to source uptodown.
---
 src/build/Revanced-Beta.sh | 12 +++++++-----
 src/build/Revanced.sh      | 12 +++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/build/Revanced-Beta.sh b/src/build/Revanced-Beta.sh
index d9490d5..c7d7b40 100644
--- a/src/build/Revanced-Beta.sh
+++ b/src/build/Revanced-Beta.sh
@@ -62,13 +62,15 @@ revanced_dl(){
 	dl_gh "revanced-cli" "revanced" "latest"
 	# Patch Tiktok:
 	get_patches_key "tiktok"
-	version="37.0.4" #Force this version beacause warning on old version but missing settings menu https://github.com/ReVanced/revanced-patches/issues/4221#issuecomment-2564776573
-	get_apk "com.zhiliaoapp.musically" "tiktok-beta" "tik-tok-including-musical-ly" "tiktok-pte-ltd/tik-tok-including-musical-ly/tik-tok-including-musical-ly" "Bundle_extract"
-	split_editor "tiktok-beta" "tiktok-beta"
+	#get_apk "com.zhiliaoapp.musically" "tiktok-beta" "tik-tok-including-musical-ly" "tiktok-pte-ltd/tik-tok-including-musical-ly/tik-tok-including-musical-ly" "Bundle_extract"
+	#split_editor "tiktok-beta" "tiktok-beta"
+    url="https://tiktok.en.uptodown.com/android/download/1032081983" #Use uptodown because apkmirror ban tiktok in US lead github action can't download apk file
+    url="https://dw.uptodown.com/dwn/$(req "$url" - | $pup -p --charset utf-8 'button#detail-download-button attr{data-url}')"
+    req "$url" "tiktok-beta.apk"
 	patch "tiktok-beta" "revanced"
  	# Patch Tiktok Arm64-v8a:
- 	split_editor "tiktok-beta" "tiktok-beta-arm64-v8a" "exclude" "split_config.armeabi_v7a"
-  	patch "tiktok-beta-arm64-v8a" "revanced"
+ 	#split_editor "tiktok-beta" "tiktok-beta-arm64-v8a" "exclude" "split_config.armeabi_v7a"
+  	#patch "tiktok-beta-arm64-v8a" "revanced"
 	rm -f *.rvp *.jar
 	revanced_dl
 	# Patch Instagram:
diff --git a/src/build/Revanced.sh b/src/build/Revanced.sh
index 02e58ba..101418c 100644
--- a/src/build/Revanced.sh
+++ b/src/build/Revanced.sh
@@ -61,13 +61,15 @@ revanced_dl(){
 	dl_gh "revanced-cli" "revanced" "latest"
 	# Patch Tiktok:
 	get_patches_key "tiktok"
-	version="37.0.4" #Force this version but missing settings https://github.com/ReVanced/revanced-patches/issues/4221#issuecomment-2564776573
-	get_apk "com.zhiliaoapp.musically" "tiktok" "tik-tok-including-musical-ly" "tiktok-pte-ltd/tik-tok-including-musical-ly/tik-tok-including-musical-ly" "Bundle_extract"
-	split_editor "tiktok" "tiktok"
+    url="https://tiktok.en.uptodown.com/android/download/1032081983" #Use uptodown because apkmirror ban tiktok in US lead github action can't download apk file
+    url="https://dw.uptodown.com/dwn/$(req "$url" - | $pup -p --charset utf-8 'button#detail-download-button attr{data-url}')"
+    req "$url" "tiktok.apk"
+	#get_apk "com.zhiliaoapp.musically" "tiktok" "tik-tok-including-musical-ly" "tiktok-pte-ltd/tik-tok-including-musical-ly/tik-tok-including-musical-ly" "Bundle_extract"
+	#split_editor "tiktok" "tiktok"
 	patch "tiktok" "revanced"
  	# Patch Tiktok Arm64-v8a:
- 	split_editor "tiktok" "tiktok-arm64-v8a" "exclude" "split_config.armeabi_v7a"
-  	patch "tiktok-arm64-v8a" "revanced"
+ 	#split_editor "tiktok" "tiktok-arm64-v8a" "exclude" "split_config.armeabi_v7a"
+  	#patch "tiktok-arm64-v8a" "revanced"
 	rm -f *.rvp *.jar
 	revanced_dl
 	# Patch Instagram: