added Facebook

- added facebook
- added method choose dpi, android version
- fix bug can't skip beta, alpha version

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:

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"

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"
 
 #################################################

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"
 

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</span>[^@]*@\([^#]*\)'
 	else
+		local os dpi
+		[[ -f $5 ]] && dpi="[^@]*$5"
+		[[ -f $6 ]] && os="[^@]*$6"
 		case $4 in
-			arm64-v8a) url_regexp='arm64-v8a</div>[^@]*@\([^"]*\)' ;;
-			armeabi-v7a) url_regexp='armeabi-v7a</div>[^@]*@\([^"]*\)' ;;
-			x86) url_regexp='x86</div>[^@]*@\([^"]*\)' ;;
-			x86_64) url_regexp='x86_64</div>[^@]*@\([^"]*\)' ;;
+			arm64-v8a) url_regexp='arm64-v8a'"$os"''"$dpi"'</div>[^@]*@\([^"]*\)' ;;
+			armeabi-v7a) url_regexp='armeabi-v7a'"$os"''"$dpi"'</div>[^@]*@\([^"]*\)' ;;
+			x86) url_regexp='x86'"$os"''"$dpi"'</div>[^@]*@\([^"]*\)' ;;
+			x86_64) url_regexp='x86_64'"$os"''"$dpi"'</div>[^@]*@\([^"]*\)' ;;
 			*) 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:</span><span class="infoSlide-value">\(.*\) </span>.*;\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:</span><span class="infoSlide-value">\(.*\) </span>.*;\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
 }
 
-#################################################
+#################################################

src/patches/facebook/exclude-patches

@@ -0,0 +1 @@
+

src/patches/facebook/include-patches

@@ -0,0 +1 @@
+