From 8158f02cca1b47eea95e855d6b7f6b5605e2e81a Mon Sep 17 00:00:00 2001
From: Fioren <102145692+FiorenMas@users.noreply.github.com>
Date: Thu, 25 May 2023 14:27:50 +0700
Subject: [PATCH] Fix bugs: Instagram, Twitter, Tiktok + More Architecture +
 Added Split Architecture

---
 .github/workflows/patch.yml                   |  10 +-
 README.md                                     |  90 ++++++++++---
 ...-7.sh => Revanced-Extended-Android-6-7.sh} |  11 +-
 .../{build-rve.sh => Revanced-Extended.sh}    |  32 +++--
 src/build/Revanced.sh                         | 122 ++++++++++++++++++
 src/build/build-rv.sh                         |  83 ------------
 src/build/{tools.sh => utils.sh}              |  15 ++-
 7 files changed, 236 insertions(+), 127 deletions(-)
 rename src/build/{build-rve-android-6-7.sh => Revanced-Extended-Android-6-7.sh} (83%)
 rename src/build/{build-rve.sh => Revanced-Extended.sh} (57%)
 create mode 100644 src/build/Revanced.sh
 delete mode 100644 src/build/build-rv.sh
 rename src/build/{tools.sh => utils.sh} (93%)

diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml
index fa396b2..642cc63 100644
--- a/.github/workflows/patch.yml
+++ b/.github/workflows/patch.yml
@@ -1,8 +1,8 @@
 name: Patch
 on:
 #  push:
-  schedule:
-    - cron: "0 9 * * *"
+#  schedule:
+#    - cron: "0 9 * * *"
   workflow_dispatch:
 jobs:
   patch1:
@@ -19,7 +19,7 @@ jobs:
           java-version: '17'
         
       - name: Patch apk
-        run: bash src/build/build-rv.sh  
+        run: bash src/build/Revanced.sh  
         env:
           repository: ${{ github.repository }}
 
@@ -74,7 +74,7 @@ jobs:
           java-version: '17'
 
       - name: Patch apk
-        run: bash src/build/build-rve.sh  
+        run: bash src/build/Revanced-Extended.sh  
         env:
           repository: ${{ github.repository }}
 
@@ -129,7 +129,7 @@ jobs:
           java-version: '17'
 
       - name: Patch apk
-        run: bash src/build/build-rve-android-6-7.sh  
+        run: bash src/build/Revanced-Extended-Android-6-7.sh  
         env:
           repository: ${{ github.repository }}
 
diff --git a/README.md b/README.md
index a9efe00..05a57ff 100644
--- a/README.md
+++ b/README.md
@@ -36,45 +36,57 @@ Download
 
 [All Architecture](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-revanced.apk)
 
-[Arm64-v8a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-revanced-arm64-v8a.apk)
+[Arm64-v8a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-arm64-v8a-revanced.apk)
 
-[Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-revanced-armeabi-v7a.apk)
+[Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-armeabi-v7a-revanced.apk)
 
-[x86](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-revanced-x86.apk)
+[x86](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-x86-revanced.apk)
 
-[x86_64](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-revanced-x86_64.apk)
+[x86_64](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-x86_64-revanced.apk)
 
 ## Revanced Extended: [Support dropped on 14/05/2023](https://t.me/revanced_extended/225)
 
 [All Architecture](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-revanced-extended.apk)
 
-[Arm64-v8a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-revanced-extended-arm64-v8a.apk)
+[Arm64-v8a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-arm64-v8a-revanced-extended.apk)
 
-[Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-revanced-extended-armeabi-v7a.apk)
+[Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-armeabi-v7a-revanced-extended.apk)
 
-[x86](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-revanced-extended-x86.apk)
+[x86](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-x86-revanced-extended.apk)
 
-[x86_64](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-revanced-extended-x86_64.apk)
+[x86_64](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-x86_64-revanced-extended.apk)
 
 ## Revanced Extended For Android 6 & 7:
 
 [All Architecture](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-revanced-extended-android-6-7.apk)
 
-[Arm64-v8a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-revanced-extended-android-6-7-arm64-v8a.apk)
+[Arm64-v8a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-arm64-v8a-revanced-extended-android-6-7.apk)
 
-[Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-revanced-extended-android-6-7-armeabi-v7a.apk)
+[Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-armeabi-v7a-revanced-extended-android-6-7.apk)
 
-[x86](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-revanced-extended-android-6-7-x86.apk)
+[x86](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-x86-revanced-extended-android-6-7.apk)
 
-[x86_64](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-revanced-extended-android-6-7-x86_64.apk)
+[x86_64](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-x86_64-revanced-extended-android-6-7.apk)
 
 ---
 
 ## [![YouTube Music](https://img.shields.io/badge/YouTube_Music-FF0000?style=for-the-badge&logo=youtube-music&logoColor=white)](https://play.google.com/store/apps/details?id=com.google.android.apps.youtube.music)
 
-[Revanced Extended](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-music-revanced-extended.apk) 
+## Revanced:
 
-[Revanced](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-music-revanced.apk)
+[All Architecture](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-music-revanced.apk)
+
+[Arm64-v8a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-music-arm64-v8a-revanced.apk)
+
+[Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-music-armeabi-v7a-revanced.apk)
+
+## Revanced Extended: [Support dropped on 14/05/2023](https://t.me/revanced_extended/225)
+
+[All Architecture](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-music-revanced-extended.apk)
+
+[Arm64-v8a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-music-arm64-v8a-revanced-extended.apk)
+
+[Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-music-armeabi-v7a-revanced-extended.apk)
 
 ---
 
@@ -93,37 +105,73 @@ Download
 
 [![Twitter](https://img.shields.io/badge/Twitter-%231DA1F2.svg?style=for-the-badge&logo=Twitter&logoColor=white)](https://play.google.com/store/apps/details?id=com.twitter.android)
 
-#### [Revanced](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/twitter-revanced.apk)
+## Revanced:
+
+[All Architecture](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/twitter-revanced.apk)
+
+[Arm64-v8a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/twitter-arm64-v8a-revanced.apk)
+
+[Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/twitter-armeabi-v7a-revanced.apk)
 
 ---
 
 [![Instagram](https://img.shields.io/badge/Instagram-%23E4405F.svg?style=for-the-badge&logo=Instagram&logoColor=white)](https://play.google.com/store/apps/details?id=com.instagram.android)
 
-#### [Revanced](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/instagram-revanced.apk)
+## Revanced:
+
+[All Architecture](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/instagram-revanced.apk)
+
+[Arm64-v8a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/instagram-arm64-v8a-revanced.apk)
+
+[Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/instagram-armeabi-v7a-revanced.apk)
 
 ---
 
 [![Messenger](https://img.shields.io/badge/Messenger-00B2FF?style=for-the-badge&logo=messenger&logoColor=white)](https://play.google.com/store/apps/details?id=com.facebook.orca)
 
-#### [Revanced](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/messenger-revanced.apk)
+## Revanced:
+
+[All Architecture](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/messenger-revanced.apk)
+
+[Arm64-v8a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/messenger-arm64-v8a-revanced.apk)
+
+[Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/messenger-armeabi-v7a-revanced.apk)
 
 ---
 
 [![TikTok](https://img.shields.io/badge/TikTok-%23000000.svg?style=for-the-badge&logo=TikTok&logoColor=white)](https://play.google.com/store/apps/details?id=com.ss.android.ugc.trill)
 
-#### [Revanced](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/tiktok-revanced.apk)
+## Revanced:
+
+[All Architecture](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/tiktok-revanced.apk)
+
+[Arm64-v8a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/tiktok-arm64-v8a-revanced.apk)
+
+[Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/tiktok-armeabi-v7a-revanced.apk)
 
 ---
 
 [![Twitch](https://img.shields.io/badge/Twitch-%239146FF.svg?style=for-the-badge&logo=Twitch&logoColor=white)](https://play.google.com/store/apps/details?id=tv.twitch.android.app)
 
-#### [Revanced](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/twitch-revanced.apk)
+## Revanced:
+
+[All Architecture](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/twitch-revanced.apk)
+
+[Arm64-v8a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/twitch-arm64-v8a-revanced.apk)
+
+[Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/twitch-armeabi-v7a-revanced.apk)
 
 ---
 
 [![Reddit](https://img.shields.io/badge/Reddit-%23FF4500.svg?style=for-the-badge&logo=Reddit&logoColor=white)](https://play.google.com/store/apps/details?id=com.reddit.frontpage)
 
-#### [Revanced](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/reddit-revanced.apk)
+## Revanced:
+
+[All Architecture](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/reddit-revanced.apk)
+
+[Arm64-v8a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/reddit-arm64-v8a-revanced.apk)
+
+[Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/reddit-armeabi-v7a-revanced.apk)
 
 ---
 
@@ -153,4 +201,6 @@ Download
 
 [Revanced Extended for Android 6 & 7 Integrations](https://github.com/kitadai31/revanced-integrations) - [GPL-3.0](https://github.com/kitadai31/revanced-integrations/blob/revanced-extended/LICENSE)
 
+[APKEditor](https://github.com/REAndroid/APKEdito) - [Apache-2.0](https://github.com/REAndroid/APKEditor/blob/master/LICENSE)
+
 [Revanced CLI - j-hc](https://github.com/j-hc/revanced-cli) - [GPL-3.0](https://github.com/j-hc/revanced-cli/blob/main/LICENSE)
diff --git a/src/build/build-rve-android-6-7.sh b/src/build/Revanced-Extended-Android-6-7.sh
similarity index 83%
rename from src/build/build-rve-android-6-7.sh
rename to src/build/Revanced-Extended-Android-6-7.sh
index a59a31f..6df3005 100644
--- a/src/build/build-rve-android-6-7.sh
+++ b/src/build/Revanced-Extended-Android-6-7.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Revanced Extended for android 6 & 7 build
-source src/build/tools.sh
+source src/build/utils.sh
 
 release=$(curl -s "https://api.github.com/repos/kitadai31/revanced-patches-android6-7/releases/latest")
 asset=$(echo "$release" | jq -r '.assets[] | select(.name | test("revanced-patches.*\\.jar$")) | .browser_download_url')
@@ -19,19 +19,20 @@ rm -f *.txt
 dl_gh "revanced-patches-android6-7 revanced-integrations" "kitadai31" "latest"
 dl_gh "revanced-cli" "inotia00" "latest"
 
-# Patch YouTube Extended
+# Patch YouTube Extended:
 get_patches_key "youtube-revanced-extended-6-7"
 version="17.34.36"
 #get_ver "hide-general-ads" "com.google.android.youtube"
 get_apk "youtube" "youtube" "google-inc/youtube/youtube"
 patch "youtube" "youtube-revanced-extended-android-6-7"
 
-# Change architecture
+# Split architecture:
 rm -f revanced-cli*
 dl_gh "revanced-cli" "j-hc" "latest"
+# Split architecture Youtube:
 for i in {0..3}; do
-    change_arch "youtube-revanced-extended-android-6-7" "youtube-revanced-extended-android-6-7-${archs[i]}" "$(gen_rip_libs ${libs[i]})"
+    split_arch "youtube-revanced-extended-android-6-7" "youtube-${archs[i]}-revanced-extended-android-6-7" "$(gen_rip_libs ${libs[i]})"
 done
 
 ls revanced-patches*.jar >> revanced-extended-android-6-7-version.txt
-fi
+fi
\ No newline at end of file
diff --git a/src/build/build-rve.sh b/src/build/Revanced-Extended.sh
similarity index 57%
rename from src/build/build-rve.sh
rename to src/build/Revanced-Extended.sh
index 37e7af6..08afc80 100644
--- a/src/build/build-rve.sh
+++ b/src/build/Revanced-Extended.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Revanced Extended build
-source src/build/tools.sh
+source src/build/utils.sh
 
 release=$(curl -s "https://api.github.com/repos/inotia00/revanced-patches/releases/latest")
 asset=$(echo "$release" | jq -r '.assets[] | select(.name | test("revanced-patches.*\\.jar$")) | .browser_download_url')
@@ -18,25 +18,35 @@ rm -f *.txt
 
 dl_gh "revanced-patches revanced-cli revanced-integrations" "inotia00" "latest"
 
-# Patch YouTube Extended
+# Patch YouTube Music Extended:
+get_patches_key "youtube-music-revanced-extended"
+version="6.01.55"
+get_apk "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a"
+patch "youtube-music-arm64-v8a" "youtube-music/youtube-music-arm64-v8a-revanced-extended"
+get_patches_key "youtube-music-revanced-extended"
+version="6.01.55"
+get_apk "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a"
+patch "youtube-music-armeabi-v7a" "youtube-music/youtube-music-armeabi-v7a-revanced-extended"
+
+# Patch YouTube Extended:
 get_patches_key "youtube-revanced-extended"
 version="18.17.43"
 #get_ver "hide-general-ads" "com.google.android.youtube"
 get_apk "youtube" "youtube" "google-inc/youtube/youtube"
 patch "youtube" "youtube-revanced-extended"
 
-# Patch YouTube Music Extended 
-get_patches_key "youtube-music-revanced-extended"
-version="6.01.55"
-get_apk "youtube-music" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a"
-patch "youtube-music" "youtube-music-revanced-extended"
-
-# Change architecture
+# Split architecture Youtube:
 rm -f revanced-cli*
 dl_gh "revanced-cli" "j-hc" "latest"
+# Split architecture Youtube:
 for i in {0..3}; do
-    change_arch "youtube-revanced-extended" "youtube-revanced-extended-${archs[i]}" "$(gen_rip_libs ${libs[i]})"
+    split_arch "youtube-revanced-extended" "youtube-${archs[i]}-revanced-extended" "$(gen_rip_libs ${libs[i]})"
 done
 
+# Merge architecture:
+dl_gh "APKEditor" "REAndroid" "latest"
+# Merge architecture YouTube Music:
+merge_arch "youtube-music" "revanced-extended"
+
 ls revanced-patches*.jar >> revanced-extended-version.txt
-fi
+fi
\ No newline at end of file
diff --git a/src/build/Revanced.sh b/src/build/Revanced.sh
new file mode 100644
index 0000000..d93602c
--- /dev/null
+++ b/src/build/Revanced.sh
@@ -0,0 +1,122 @@
+#!/bin/bash
+# Revanced build
+source src/build/utils.sh
+
+release=$(curl -s "https://api.github.com/repos/revanced/revanced-patches/releases/latest")
+asset=$(echo "$release" | jq -r '.assets[] | select(.name | test("revanced-patches.*\\.jar$")) | .browser_download_url')
+curl -sL -O "$asset"
+ls revanced-patches*.jar >> new.txt
+rm -f revanced-patches*.jar
+release=$(curl -s "https://api.github.com/repos/$repository/releases/latest")
+asset=$(echo "$release" | jq -r '.assets[] | select(.name == "revanced-version.txt") | .browser_download_url')
+curl -sL -O "$asset"
+if diff -q revanced-version.txt new.txt >/dev/null ; then
+echo "Old patch!!! Not build"
+exit 0
+else
+rm -f *.txt
+
+dl_gh "revanced-patches revanced-cli revanced-integrations" "revanced" "latest"
+
+# Patch Instagram:
+get_patches_key "instagram"
+version="271.1.0.21.84"
+get_apk "instagram-arm64-v8a" "instagram-instagram" "instagram/instagram-instagram/instagram-instagram" "arm64-v8a"
+patch "instagram-arm64-v8a" "instagram/instagram-arm64-v8a-revanced"
+get_patches_key "instagram"
+version="271.1.0.21.84"
+get_apk "instagram-armeabi-v7a" "instagram-instagram" "instagram/instagram-instagram/instagram-instagram" "armeabi-v7a"
+patch "instagram-armeabi-v7a" "instagram/instagram-armeabi-v7a-revanced"
+
+# Patch Messenger:
+get_patches_key "messenger"
+get_apk "messenger-arm64-v8a" "messenger" "facebook-2/messenger/messenger" "arm64-v8a"
+patch "messenger-arm64-v8a" "messenger/messenger-arm64-v8a-revanced"
+get_patches_key "messenger"
+get_apk "messenger-armeabi-v7a" "messenger" "facebook-2/messenger/messenger" "armeabi-v7a"
+patch "messenger-armeabi-v7a" "messenger/messenger-armeabi-v7a-revanced"
+
+# Patch YouTube Music:
+get_patches_key "youtube-music-revanced"
+get_ver "hide-get-premium" "com.google.android.apps.youtube.music"
+get_apk "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a"
+patch "youtube-music-arm64-v8a" "youtube-music/youtube-music-arm64-v8a-revanced"
+get_ver "hide-get-premium" "com.google.android.apps.youtube.music"
+get_patches_key "youtube-music-revanced"
+get_apk "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a"
+patch "youtube-music-armeabi-v7a" "youtube-music/youtube-music-armeabi-v7a-revanced"
+
+# Patch YouTube:
+get_patches_key "youtube-revanced"
+get_ver "video-ads" "com.google.android.youtube"
+get_apk "youtube" "youtube" "google-inc/youtube/youtube"
+patch "youtube" "youtube-revanced"
+
+# Patch Twitter:
+get_patches_key "twitter"
+version="9.86.0-release.0"
+get_apk "twitter" "twitter" "twitter-inc/twitter/twitter"
+patch "twitter" "twitter-revanced"
+
+# Patch Reddit:
+get_patches_key "reddit"
+get_ver "general-reddit-ads" "com.reddit.frontpage"
+get_apk "reddit" "reddit" "redditinc/reddit/reddit"
+patch "reddit" "reddit-revanced"
+
+# Patch Twitch:
+get_patches_key "twitch"
+get_ver "block-video-ads" "tv.twitch.android.app"
+get_apk "twitch" "twitch" "twitch-interactive-inc/twitch/twitch"
+patch "twitch" "twitch-revanced"
+
+# Patch Windy:
+get_patches_key "windy"
+get_apk "windy" "windy-wind-weather-forecast" "windy-weather-world-inc/windy-wind-weather-forecast/windy-wind-weather-forecast"
+patch "windy" "windy-revanced"
+
+# Patch Tiktok:
+rm -f patches*.json revanced-patches*.jar revanced-integrations*.apk revanced-cli*.jar
+dl_gh "revanced-patches" "revanced" "tags/v2.173.0"
+dl_gh "revanced-integrations" "revanced" "tags/v0.107.0"
+dl_gh "revanced-cli" "revanced" "tags/v2.21.0"
+get_patches_key "tiktok"
+version="27.8.3"
+get_apk "tiktok" "tik-tok-including-musical-ly" "tiktok-pte-ltd/tik-tok-including-musical-ly/tik-tok-including-musical-ly"
+patch "tiktok" "tiktok-revanced"
+
+# Split architecture:
+rm -f revanced-cli*
+dl_gh "revanced-cli" "j-hc" "latest"
+# Split architecture Youtube:
+for i in {0..3}; do
+    split_arch "youtube-revanced" "youtube-${archs[i]}-revanced" "$(gen_rip_libs ${libs[i]})"
+done
+# Split architecture Reddit:
+#for i in 0 1; do
+#    split_arch "reddit-revanced" "reddit-${archs[i]}-revanced" "$(gen_rip_libs ${libs[i]})"
+#done
+# Split architecture Twitch:
+#for i in 0 1; do
+#    split_arch "twitch-revanced" "twitch-${archs[i]}-revanced" "$(gen_rip_libs ${libs[i]})"
+#done
+# Split architecture Tiktok:
+#for i in 0 1; do
+#    split_arch "tiktok-revanced" "tiktok-${archs[i]}-revanced" "$(gen_rip_libs ${libs[i]})"
+#done
+# Split architecture Twitter:
+#for i in 0 1; do
+#    split_arch "twitter-revanced" "twitter-${archs[i]}-revanced" "$(gen_rip_libs ${libs[i]})"
+#done
+
+# Merge architecture:
+dl_gh "APKEditor" "REAndroid" "latest"
+# Merge architecture Messenger:
+merge_arch "messenger" "revanced"
+# Merge architecture Instagram:
+merge_arch "instagram" "revanced"
+# Merge architecture YouTube Music:
+merge_arch "youtube-music" "revanced"
+
+ls revanced-patches*.jar >> revanced-version.txt
+fi
\ No newline at end of file
diff --git a/src/build/build-rv.sh b/src/build/build-rv.sh
deleted file mode 100644
index 071617b..0000000
--- a/src/build/build-rv.sh
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/bash
-# Revanced build
-source src/build/tools.sh
-
-release=$(curl -s "https://api.github.com/repos/revanced/revanced-patches/releases/latest")
-asset=$(echo "$release" | jq -r '.assets[] | select(.name | test("revanced-patches.*\\.jar$")) | .browser_download_url')
-curl -sL -O "$asset"
-ls revanced-patches*.jar >> new.txt
-rm -f revanced-patches*.jar
-release=$(curl -s "https://api.github.com/repos/$repository/releases/latest")
-asset=$(echo "$release" | jq -r '.assets[] | select(.name == "revanced-version.txt") | .browser_download_url')
-curl -sL -O "$asset"
-if diff -q revanced-version.txt new.txt >/dev/null ; then
-echo "Old patch!!! Not build"
-exit 0
-else
-rm -f *.txt
-
-dl_gh "revanced-patches revanced-cli revanced-integrations" "revanced" "latest"
-
-# Patch YouTube 
-get_patches_key "youtube-revanced"
-get_ver "video-ads" "com.google.android.youtube"
-get_apk "youtube" "youtube" "google-inc/youtube/youtube"
-patch "youtube" "youtube-revanced"
-
-# Patch Instagram
-get_patches_key "instagram"
-version="271.1.0.21.84"
-get_apk "instagram" "instagram-instagram" "instagram/instagram-instagram/instagram-instagram" "arm64-v8a"
-patch "instagram" "instagram-revanced"
-
-# Patch Messenger
-get_patches_key "messenger"
-get_apk "messenger" "messenger" "facebook-2/messenger/messenger" "arm64-v8a"
-patch "messenger" "messenger-revanced"
-
-# Patch Windy
-get_patches_key "windy"
-get_apk "windy" "windy-wind-weather-forecast" "windy-weather-world-inc/windy-wind-weather-forecast/windy-wind-weather-forecast"
-patch "windy" "windy-revanced"
-
-# Patch Reddit
-get_patches_key "reddit"
-get_ver "general-reddit-ads" "com.reddit.frontpage"
-get_apk "reddit" "reddit" "redditinc/reddit/reddit"
-patch "reddit" "reddit-revanced"
-
-# Patch Twitch 
-get_patches_key "twitch"
-get_ver "block-video-ads" "tv.twitch.android.app"
-get_apk "twitch" "twitch" "twitch-interactive-inc/twitch/twitch"
-patch "twitch" "twitch-revanced"
-
-# Patch Tiktok 
-get_patches_key "tiktok"
-get_ver "sim-spoof" "com.ss.android.ugc.trill"
-get_apk "tiktok" "tik-tok-including-musical-ly" "tiktok-pte-ltd/tik-tok-including-musical-ly/tik-tok-including-musical-ly"
-patch "tiktok" "tiktok-revanced"
-
-# Patch YouTube Music 
-get_patches_key "youtube-music-revanced"
-get_ver "hide-get-premium" "com.google.android.apps.youtube.music"
-get_apk "youtube-music" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a"
-patch "youtube-music" "youtube-music-revanced"
-
-# Patch Twitter
-rm -f revanced-integrations*.apk
-dl_gh "revanced-integrations" "revanced" "tags/v0.103.0"
-get_patches_key "twitter"
-version="9.86.0-release.0"
-get_apk "twitter" "twitter" "twitter-inc/twitter/twitter"
-patch "twitter" "twitter-revanced"
-
-# Change architecture
-rm -f revanced-cli*
-dl_gh "revanced-cli" "j-hc" "latest"
-for i in {0..3}; do
-    change_arch "youtube-revanced" "youtube-revanced-${archs[i]}" "$(gen_rip_libs ${libs[i]})"
-done
-
-ls revanced-patches*.jar >> revanced-version.txt
-fi
diff --git a/src/build/tools.sh b/src/build/utils.sh
similarity index 93%
rename from src/build/tools.sh
rename to src/build/utils.sh
index cfc5697..fad6327 100644
--- a/src/build/tools.sh
+++ b/src/build/utils.sh
@@ -88,6 +88,10 @@ patch() {
     ${INCLUDE_PATCHES[@]} \
     --keystore=./src/ks.keystore \
     -o ./build/$2.apk
+	if grep -q "/" <<< "$2"; then
+		local name=$(basename “$2”)
+		cp ./build/$2.apk ./build/$name.apk
+	fi
     unset version
     unset EXCLUDE_PATCHES
     unset INCLUDE_PATCHES
@@ -96,6 +100,12 @@ patch() {
     fi
 }
 
+merge_arch() {
+    java -jar APKEditor*.jar m \
+    -i ./build/$1
+	mv -i ./build/"$1"_merged.apk ./build/"$1"-"$2".apk
+}
+
 archs=("arm64-v8a" "armeabi-v7a" "x86_64" "x86")
 libs=("x86_64 x86 armeabi-v7a" "x86_64 x86 arm64-v8a" "x86 armeabi-v7a arm64-v8a" "x86_64 armeabi-v7a arm64-v8a")
 gen_rip_libs() {
@@ -103,7 +113,7 @@ gen_rip_libs() {
         echo -n "--rip-lib $lib "
     done
 }
-change_arch() {
+split_arch() {
     if [ -f "./build/$1.apk" ]; then
     java -jar revanced-cli*.jar \
 	-b revanced-patches*.jar \
@@ -114,5 +124,4 @@ change_arch() {
     else 
         exit 1
     fi
-}
-
+}
\ No newline at end of file