From d4c0cbc78dc0c180dcf7bee868af08270fc92c11 Mon Sep 17 00:00:00 2001 From: siritami <102145692+FiorenMas@users.noreply.github.com> Date: Sun, 19 Nov 2023 23:36:31 +0700 Subject: [PATCH] added Facebook - added facebook - added method choose dpi, android version - fix bug can't skip beta, alpha version --- README.md | 8 ++++++++ src/build/Revanced-1.sh | 8 ++++++++ src/build/Revanced-2.sh | 2 +- src/build/Revanced-3.sh | 1 - src/build/utils.sh | 30 ++++++++++++++++++---------- src/patches/facebook/exclude-patches | 1 + src/patches/facebook/include-patches | 1 + 7 files changed, 38 insertions(+), 13 deletions(-) create mode 100644 src/patches/facebook/exclude-patches create mode 100644 src/patches/facebook/include-patches diff --git a/README.md b/README.md index 59d1b9a..f863366 100644 --- a/README.md +++ b/README.md @@ -119,6 +119,14 @@ Download --- +[![Facebook](https://img.shields.io/badge/Facebook-%231877F2.svg?style=for-the-badge&logo=Facebook&logoColor=white)](https://play.google.com/store/apps/details?id=com.facebook.katana&hl) + +### Revanced: + +[Arm64-v8a & Android 11+](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/facebook-revanced.apk) + +--- + [![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: diff --git a/src/build/Revanced-1.sh b/src/build/Revanced-1.sh index c3d00fd..c4d1a70 100644 --- a/src/build/Revanced-1.sh +++ b/src/build/Revanced-1.sh @@ -29,6 +29,14 @@ patch "youtube-music-armeabi-v7a" "revanced" ################################################# +# Patch Facebook: +# Arm64-v8a +get_patches_key "facebook" +get_apk "facebook-arm64-v8a" "facebook" "facebook-2/facebook/facebook" "arm64-v8a" "nodpi" "Android 11+" +patch "facebook-arm64-v8a" "revanced" + +################################################# + # Split architecture: rm -f revanced-cli* revanced-patches*.jar patches.json dl_gh "revanced-cli" "j-hc" "latest" diff --git a/src/build/Revanced-2.sh b/src/build/Revanced-2.sh index 1b354c4..d19fee2 100644 --- a/src/build/Revanced-2.sh +++ b/src/build/Revanced-2.sh @@ -21,7 +21,7 @@ patch "instagram-arm64-v8a" "revanced" # Patch Messenger: # Arm64-v8a get_patches_key "messenger" -get_apk "messenger-arm64-v8a" "messenger" "facebook-2/messenger/messenger" "arm64-v8a" +get_apk "messenger-arm64-v8a" "messenger" "facebook-2/messenger/messenger" "arm64-v8a" "nodpi" patch "messenger-arm64-v8a" "revanced" ################################################# diff --git a/src/build/Revanced-3.sh b/src/build/Revanced-3.sh index 8a4ba42..879cafc 100644 --- a/src/build/Revanced-3.sh +++ b/src/build/Revanced-3.sh @@ -32,7 +32,6 @@ patch "windy" "revanced" # Patch Tumblr: get_patches_key "tumblr" -version=31.5.0.110 get_apk "tumblr" "tumblr" "tumblr-inc/tumblr/tumblr" patch "tumblr" "revanced" diff --git a/src/build/utils.sh b/src/build/utils.sh index e018311..48e6a13 100644 --- a/src/build/utils.sh +++ b/src/build/utils.sh @@ -68,7 +68,6 @@ req() { _req "$1" "$2" "$random_user_agent" } - dl_apk() { local url=$1 regexp=$2 output=$3 url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n "s/href=\"/@/g; s;.*${regexp}.*;\1;p")" @@ -86,24 +85,33 @@ get_apk() { if [[ -z $4 ]]; then url_regexp='APK[^@]*@\([^#]*\)' else + local os dpi + [[ -f $5 ]] && dpi="[^@]*$5" + [[ -f $6 ]] && os="[^@]*$6" case $4 in - arm64-v8a) url_regexp='arm64-v8a[^@]*@\([^"]*\)' ;; - armeabi-v7a) url_regexp='armeabi-v7a[^@]*@\([^"]*\)' ;; - x86) url_regexp='x86[^@]*@\([^"]*\)' ;; - x86_64) url_regexp='x86_64[^@]*@\([^"]*\)' ;; + arm64-v8a) url_regexp='arm64-v8a'"$os"''"$dpi"'[^@]*@\([^"]*\)' ;; + armeabi-v7a) url_regexp='armeabi-v7a'"$os"''"$dpi"'[^@]*@\([^"]*\)' ;; + x86) url_regexp='x86'"$os"''"$dpi"'[^@]*@\([^"]*\)' ;; + x86_64) url_regexp='x86_64'"$os"''"$dpi"'[^@]*@\([^"]*\)' ;; *) return 1 ;; esac fi export version="$version" if [[ -z $version ]]; then - local list_ver - list_ver=$(req "https://www.apkmirror.com/uploads/?appcategory=$2" -) - version=$(sed -n 's;.*Version:\(.*\) .*;\1;p' <<<"$list_ver" | grep -v 'beta\|alpha' | head -n 1) + local list_vers v versions=() + list_vers=$(req "https://www.apkmirror.com/uploads/?appcategory=$2" -) + version=$(sed -n 's;.*Version:\(.*\) .*;\1;p' <<<"$list_vers") + version=$(grep -iv "\(beta\|alpha\)" <<<"$version") + for v in $version; do + grep -iq "${v} \(beta\|alpha\)" <<<"$list_vers" || versions+=("$v") + done + version=$(head -1 <<<"$versions") fi + echo "Downloading $2 $4 version: $version $5 $6" local base_apk="$1.apk" local dl_url=$(dl_apk "https://www.apkmirror.com/apk/$3-${version//./-}-release/" \ - "$url_regexp" \ - "$base_apk") + "$url_regexp" \ + "$base_apk") } ################################################# @@ -176,4 +184,4 @@ split_arch() { fi } -################################################# +################################################# \ No newline at end of file diff --git a/src/patches/facebook/exclude-patches b/src/patches/facebook/exclude-patches new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/patches/facebook/exclude-patches @@ -0,0 +1 @@ + diff --git a/src/patches/facebook/include-patches b/src/patches/facebook/include-patches new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/patches/facebook/include-patches @@ -0,0 +1 @@ +