update code

.github/workflows/BETA-patch.yml

@@ -1,57 +0,0 @@
-name: Patch Twitter
-on:
-  workflow_dispatch:
-jobs:
-  Twitter:
-    name: Patch Revanced 
-    permissions: write-all
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up jdk
-        uses: actions/setup-java@v3.11.0
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-
-      - name: Patch Twitter
-        run: bash src/build/twitter.sh
-
-      - name: Generate release info
-        run: | 
-          echo "
-          [![](https://visitcount.itsvg.in/api?id=Fioren&label=Visitors&color=6&icon=5&pretty=true)](https://visitcount.itsvg.in)
-          **Change log** :point_down:
-          [Revanced](https://github.com/revanced/revanced-patches/releases/latest)
-          [Revanced Extended](https://github.com/inotia00/revanced-patches/releases/latest)
-          [Revanced Extended for Android 6 & 7](https://github.com/kitadai31/revanced-patches-android6-7/releases/latest)
-          "> ${{ github.workspace }}-CHANGELOG.txt
-
-      - name: Release
-        uses: softprops/action-gh-release@v0.1.15
-        with:
-          files: |
-            ./build/*
-            revanced-version.txt
-          name: Revanced & Revanced Extended
-          tag_name: all
-          body_path: ${{ github.workspace }}-CHANGELOG.txt
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}   
-
-      - name: Delete older releases
-        uses: dev-drprasad/delete-older-releases@v0.2.1
-        with:
-          keep_latest: 1
-          delete_tags: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Delete workflow runs
-        uses: Mattraks/delete-workflow-runs@v2
-        with:
-          token: ${{ github.token }}
-          repository: ${{ github.repository }}
-          retain_days: 0
-          keep_minimum_runs: 10

src/build/build-rv.sh

@@ -16,13 +16,7 @@ exit 0
 else
 rm -f *.txt
 
-dl_gh "revanced" 
+dl_gh "revanced-patches revanced-cli revanced-integrations" "revanced" "latest"
-
-# 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 Instagram
 get_patches_key "instagram"
@@ -70,5 +64,13 @@ get_ver "hide-get-premium" "com.google.android.apps.youtube.music"
 get_apk_arch "youtube-music" "youtube-music" "google-inc/youtube-music/youtube-music"
 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"
+
 ls revanced-patches*.jar >> revanced-version.txt
 fi

src/build/build-rve-android-6-7.sh

@@ -16,8 +16,8 @@ exit 0
 else
 rm -f *.tx
 
-dl_gh2 "kitadai31"
+dl_gh "revanced-patches-android6-7 revanced-integrations" "kitadai31" "latest"
-dl_gh3 "inotia00"
+dl_gh "revanced-cli" "inotia00" "latest"
 
 # Patch YouTube Extended
 get_patches_key "youtube-revanced-extended-6-7"

src/build/build-rve.sh

@@ -16,7 +16,7 @@ exit 0
 else
 rm -f *.txt
 
-dl_gh "inotia00"
+dl_gh "revanced-patches revanced-cli revanced-integrations" "inotia00" "latest"
 
 # Patch YouTube Extended
 get_patches_key "youtube-revanced-extended"

src/build/tools.sh

@@ -1,6 +1,6 @@
 dl_gh() {
-    for repo in revanced-patches revanced-cli revanced-integrations ; do
+    for repo in $1 ; do
-    asset_urls=$(wget -qO- "https://api.github.com/repos/$1/$repo/releases/latest" \
+    asset_urls=$(wget -qO- "https://api.github.com/repos/$2/$repo/releases/$3" \
                  | jq -r '.assets[] | "\(.browser_download_url) \(.name)"')
         while read -r url names
         do
@@ -10,45 +10,6 @@ dl_gh() {
     done
 echo "All assets downloaded"
 }
-dl_gh1() {
-    for repo in revanced-patches revanced-cli ; do
-    asset_urls=$(wget -qO- "https://api.github.com/repos/$1/$repo/releases/latest" \
-                 | jq -r '.assets[] | "\(.browser_download_url) \(.name)"')
-        while read -r url names
-        do
-            echo "Downloading $names from $url"
-            wget -q -O "$names" $url
-        done <<< "$asset_urls"
-    done
-echo "All assets downloaded"
-}
-dl_gh2() {
-    for repo in revanced-patches-android6-7 revanced-integrations ; do
-    asset_urls=$(wget -qO- "https://api.github.com/repos/$1/$repo/releases/latest" \
-                 | jq -r '.assets[] | "\(.browser_download_url) \(.name)"')
-        while read -r url names
-        do
-            echo "Downloading $names from $url"
-            wget -q -O "$names" $url
-        done <<< "$asset_urls"
-    done
-echo "All assets downloaded"
-}
-dl_gh3() {
-    for repo in revanced-cli ; do
-    asset_urls=$(wget -qO- "https://api.github.com/repos/$1/$repo/releases/latest" \
-                 | jq -r '.assets[] | "\(.browser_download_url) \(.name)"')
-        while read -r url names
-        do
-            echo "Downloading $names from $url"
-            wget -q -O "$names" $url
-        done <<< "$asset_urls"
-    done
-echo "All assets downloaded"
-}
-dl_revanced_integrations() {
-	curl --retry 10 --retry-max-time 60 -H "Cache-Control: no-cache" -fsSL github.com/$1/revanced-integrations/releases/download/v$2/revanced-integrations-$2.apk -o revanced-integrations-$2.apk
-}
 get_patches_key() {
     EXCLUDE_PATCHES=()
         for word in $(cat src/patches/$1/exclude-patches) ; do

src/build/twitter.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-# Revanced build
-source src/build/tools.sh
-
-dl_gh1 "revanced" 
-dl_revanced_integrations "revanced" "0.103.0"
-
-# Patch Twitter
-get_patches_key "twitter"
-version="9.87.0-release.0"
-get_apk "twitter" "twitter" "twitter-inc/twitter/twitter"
-patch "twitter" "twitter-revanced"