From 987b2f5473fe5782f9bd738f8cd249103a71488d Mon Sep 17 00:00:00 2001
From: siritami <102145692+FiorenMas@users.noreply.github.com>
Date: Thu, 9 May 2024 07:40:45 +0700
Subject: [PATCH] fix bug + added beta rve

---
 .github/workflows/ci.yml                      | 14 +++++-
 .github/workflows/manual-patch.yml            | 26 +++++++++-
 src/build/Revanced-Extended-Beta.sh           | 50 +++++++++++++++++++
 src/build/Revanced-Extended.sh                |  8 +--
 src/build/utils.sh                            |  4 +-
 .../youtube-revanced-extended/exclude-patches |  1 +
 6 files changed, 95 insertions(+), 8 deletions(-)
 create mode 100644 src/build/Revanced-Extended-Beta.sh

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9fa2135..9decc38 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -49,6 +49,10 @@ jobs:
         id: check-rve
         if: steps.check-gh.outputs.internet_error == '0'
         run: bash src/etc/ci.sh inotia00/revanced-patches latest youtube-revanced-extended.apk
+      - name: Check new patch Revanced Extended Beta
+        id: check-rve-beta
+        if: steps.check-gh.outputs.internet_error == '0'
+        run: bash src/etc/ci.sh inotia00/revanced-patches prerelease youtube-revanced-beta-extended.apk
       - name: Check new patch Twitter Piko Stable
         id: check-twitter-piko-stable
         if: steps.check-gh.outputs.internet_error == '0'
@@ -99,6 +103,7 @@ jobs:
       check_rve_anddea_beta: ${{ steps.check-rve-anddea-beta.outputs.new_patch }}
       check_rve_rufusin: ${{ steps.check-rve-rufusin.outputs.new_patch }}
       check_rve: ${{ steps.check-rve.outputs.new_patch }}
+      check_rve_beta: ${{ steps.check-rve-beta.outputs.new_patch }}
       check_twitter_piko_stable: ${{ steps.check-twitter-piko-stable.outputs.new_patch }}
       check_twitter_piko_beta: ${{ steps.check-twitter-piko-beta.outputs.new_patch }}
       check_rve67: ${{ steps.check-rve67.outputs.new_patch }}
@@ -153,6 +158,13 @@ jobs:
     uses: ./.github/workflows/manual-patch.yml
     with:
       org: "Revanced Extended"
+  Patch-Revanced-Extended-Beta:
+    name: Patch Revanced Extended Beta
+    needs: check
+    if: ${{ needs.check.outputs.check_rve_beta == 1 }}
+    uses: ./.github/workflows/manual-patch.yml
+    with:
+      org: "Revanced Extended Beta"
   Patch-Twitter-Piko-Stable:
     name: Patch Twitter Piko Stable
     needs: check
@@ -180,4 +192,4 @@ jobs:
     if: ${{ needs.check.outputs.check_rve5 == 1 }}
     uses: ./.github/workflows/manual-patch.yml
     with:
-      org: "Revanced Extended Android 5"
+      org: "Revanced Extended Android 5"
\ No newline at end of file
diff --git a/.github/workflows/manual-patch.yml b/.github/workflows/manual-patch.yml
index 2423335..2fcf969 100644
--- a/.github/workflows/manual-patch.yml
+++ b/.github/workflows/manual-patch.yml
@@ -19,11 +19,12 @@ on:
           - 'All'
           - 'Revanced'
           - 'Revanced Beta'
+          - 'Revanced Extended'
+          - 'Revanced Extended Beta'
           - 'ReX'
           - 'RVE-anddea-stable'
           - 'RVE-anddea-beta'
           - 'RVE-rufusin'
-          - 'Revanced Extended'
           - 'Twitter Piko Stable'
           - 'Twitter Piko Beta'
           - 'Revanced Extended Android 6,7'
@@ -217,6 +218,29 @@ jobs:
       - name: Re-run workflow if github connection not stable
         if: always() && steps.patch-rve.outcome == 'skipped' || steps.release-rve.outcome == 'skipped' && env.retry_count < env.max_retries
         uses: ./.github/actions/re-run
+  patch_rve_beta:
+    name: Patch Revanced Extended Beta
+    if: ${{ github.event.inputs.org == 'Revanced Extended Beta' || github.event.inputs.org == 'All' || inputs.org == 'Revanced Extended Beta' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4.1.1
+      - name: Preparing to patch
+        uses: ./.github/actions/preparing
+      - name: Check github connection
+        id: check-gh-rve-beta
+        run: bash src/etc/connection.sh
+      - name: Patch apk
+        id: patch-rve-beta
+        if: steps.check-gh-rve-beta.outputs.internet_error == '0'
+        run: bash src/build/Revanced-Extended-Beta.sh
+      - name: Releasing APK files
+        id: release-rve-beta
+        if: steps.check-gh-rve-beta.outputs.internet_error == '0'
+        uses: ./.github/actions/release
+      - name: Re-run workflow if github connection not stable
+        if: always() && steps.patch-rve-beta.outcome == 'skipped' || steps.release-rve-beta.outcome == 'skipped' && env.retry_count < env.max_retries
+        uses: ./.github/actions/re-run
   patch_twitter_piko_stable:
     name: Patch Twitter Piko Stable
     if: ${{ github.event.inputs.org == 'Twitter Piko Stable' || github.event.inputs.org == 'All' || inputs.org == 'Twitter Piko Stable' }}
diff --git a/src/build/Revanced-Extended-Beta.sh b/src/build/Revanced-Extended-Beta.sh
new file mode 100644
index 0000000..19de0a6
--- /dev/null
+++ b/src/build/Revanced-Extended-Beta.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+# Revanced Extended build
+source src/build/utils.sh
+
+#################################################
+
+# Download requirements
+dl_gh "revanced-patches" "inotia00" "prerelease"
+dl_gh "revanced-integrations revanced-cli" "inotia00" "latest"
+
+#################################################
+
+# Patch YouTube Extended:
+get_patches_key "youtube-revanced-extended"
+get_ver "Video playback" "com.google.android.youtube"
+get_apk "youtube-beta" "youtube" "google-inc/youtube/youtube"
+patch "youtube-beta" "revanced-extended" "inotia"
+
+#################################################
+
+# Patch YouTube Music Extended:
+# Arm64-v8a
+get_patches_key "youtube-music-revanced-extended"
+get_ver "Video playback" "com.google.android.apps.youtube.music"
+get_apk "youtube-music-beta-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a"
+patch "youtube-music-beta-arm64-v8a" "revanced-extended" "inotia"
+# Armeabi-v7a
+get_patches_key "youtube-music-revanced-extended"
+get_ver "Video playback" "com.google.android.apps.youtube.music"
+get_apk "youtube-music-beta-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a"
+patch "youtube-music-beta-armeabi-v7a" "revanced-extended" "inotia"
+
+#################################################
+
+# Split architecture Youtube:
+for i in {0..3}; do
+    split_arch "youtube-beta-revanced-extended" "youtube-beta-${archs[i]}-revanced-extended" "$(gen_rip_libs ${libs[i]})"
+done
+
+#################################################
+# Patch Reddit:
+rm -f revanced-cli* revanced-patches*
+dl_gh "revanced-cli" "inotia00" "v2.21.2-arsclib"
+dl_gh "revanced-patches" "inotia00" "v2.174.0-arsclib"
+get_patches_key "reddit-rve"
+get_apk "reddit-beta" "reddit" "redditinc/reddit/reddit"
+patch "reddit-beta" "revanced-extended"
+mv ./release/reddit-beta-revanced-extended.apk/base.apk ./reddit-beta-revanced-extended.apk
+rm -f -d ./release/reddit-beta-revanced-extended.apk
+mv ./reddit-beta-revanced-extended.apk ./release/reddit-beta-revanced-extended.apk
\ No newline at end of file
diff --git a/src/build/Revanced-Extended.sh b/src/build/Revanced-Extended.sh
index 1939eda..dbca19d 100644
--- a/src/build/Revanced-Extended.sh
+++ b/src/build/Revanced-Extended.sh
@@ -37,13 +37,13 @@ for i in {0..3}; do
 done
 
 #################################################
-
 # Patch Reddit:
-rm -f revanced-cli*
+rm -f revanced-cli* revanced-patches*
 dl_gh "revanced-cli" "inotia00" "v2.21.2-arsclib"
 dl_gh "revanced-patches" "inotia00" "v2.174.0-arsclib"
 get_patches_key "reddit-rve"
 get_apk "reddit" "reddit" "redditinc/reddit/reddit"
 patch "reddit" "revanced-extended"
-
-#################################################
+mv ./release/reddit-revanced-extended.apk/base.apk ./reddit-revanced-extended.apk
+rm -f -d ./release/reddit-revanced-extended.apk
+mv ./reddit-revanced-extended.apk ./release/reddit-revanced-extended.apk
\ No newline at end of file
diff --git a/src/build/utils.sh b/src/build/utils.sh
index e5f6007..48b7b70 100644
--- a/src/build/utils.sh
+++ b/src/build/utils.sh
@@ -185,7 +185,7 @@ patch() {
 	if [ -f "./download/$1.apk" ]; then
 		local p b m ks a pu
 		if [ "$3" = inotia ]; then
-			p="patch " b="--patch-bundle" m="--merge" a="" ks="_ks"
+			p="patch " b="--patch-bundle" m="--merge" a="" ks="_ks" pu="--purge=true"
 			echo "Patching with Revanced-cli inotia"
 		else
 			if [[ $(ls revanced-cli-*.jar) =~ revanced-cli-([0-9]+) ]]; then
@@ -197,7 +197,7 @@ patch() {
 					p="patch " b="--patch-bundle" m="--merge" a="" ks="_ks" pu="--purge=true"
 					echo "Patching with Revanced-cli version 3"
 				elif [ $num -eq 2 ]; then
-					p="" b="-b" m="-m" a="-a " ks="_ks" pu="--clean"
+					p="" b="--bundle" m="--merge" a="--apk " ks="_ks" pu="--clean"
 					echo "Patching with Revanced-cli version 2"
 				fi
 			fi
diff --git a/src/patches/youtube-revanced-extended/exclude-patches b/src/patches/youtube-revanced-extended/exclude-patches
index b86964d..273a268 100644
--- a/src/patches/youtube-revanced-extended/exclude-patches
+++ b/src/patches/youtube-revanced-extended/exclude-patches
@@ -1,5 +1,6 @@
 Custom branding icon YouTube
 Enable compact controls overlay
+Translations
 Disable QUIC protocol
 Disable auto captions
 Disable HDR video