Merge branch 'nikhilbadyal:main' into main

.github/workflows/build-apk.yml

@@ -114,7 +114,6 @@ jobs:
       TELEGRAM_CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }}
       TELEGRAM_STICKER_ID: ${{ secrets.TELEGRAM_STICKER_ID }}
       MESSAGE: ${{ secrets.MESSAGE_NON_ROOT }}
-      SEND_STICKER: ${{ secrets.SEND_STICKER }}
 
   upload-to-telegram-root:
     needs: [ upload-to-telegram ]

.gitignore

@@ -2,10 +2,8 @@
 *.jar
 *.keystore
 *venv
-*/__pycache__*
 *.pyc
-/revanced-cache/
-/revanced-resource-cache/
+**cache**
 changelog.md
 .idea
 *.json

.pre-commit-config.yaml

@@ -23,15 +23,15 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.0.292'
+    rev: 'v0.1.6'
     hooks:
       - id: ruff
         args:
           - "--config=pyproject.toml"
           - "--fix"
 
   - repo: https://github.com/psf/black
-    rev: 23.9.1
+    rev: 23.11.0
     hooks:
       - id: black
         args:
@@ -45,7 +45,7 @@ repos:
           - "--settings-path=pyproject.toml"
 
   - repo: https://github.com/hadialqattan/pycln
-    rev: v2.2.2
+    rev: v2.4.0
     hooks:
       - id: pycln
         args:
@@ -61,7 +61,7 @@ repos:
 
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.5.1
+    rev: v1.7.1
     hooks:
       - id: mypy
         args:

README.md

@@ -191,7 +191,7 @@ You can use any of the following methods to build.
     - [infinity](https://www.apkmirror.com/apk/red-apps-ltd/sync-for-reddit/)
     - [slide](https://www.apkmirror.com/apk/haptic-apps/slide-for-reddit/)
     - [bacon](https://www.apkmirror.com/apk/onelouder-apps/baconreader-for-reddit/)
-    - [microg](https://github.com/inotia-/mMicroG/releases)
+    - [microg](https://github.com/inotia00/mMicroG/releases/)
     - [pixiv](https://www.apkmirror.com/apk/pixiv-inc/pixiv/)
     - [strava](https://www.apkmirror.com/apk/strava-inc/strava-running-and-cycling-gps/)
     - [solidexplorer](https://www.apkmirror.com/apk/neatbytes/solid-explorer-beta/)
@@ -206,6 +206,7 @@ You can use any of the following methods to build.
     - [scbeasy](https://www.apkmonk.com/app/com.scb.phone/)
     - [reddit-news](https://m.apkpure.com/relay-for-reddit/reddit.news)
     - [finanz-online](https://apksos.com/app/at.gv.bmf.bmf2go)
+    - [tumblr](https://www.apkmirror.com/apk/tumblr-inc/tumblr/)
 
     <br>`**` - You can also patch any other app which is **not** supported officially.To do so, you need to provide
    few more inputs to the tool which are mentioned below. These config will override the sources config from the tool.

main.py

@@ -6,6 +6,7 @@
 
 from src.app import APP
 from src.config import RevancedConfig
+from src.downloader.download import Downloader
 from src.exceptions import AppNotFoundError, BuilderError, PatchesJsonLoadError, PatchingFailedError
 from src.parser import Parser
 from src.patches import Patches
@@ -24,6 +25,7 @@ def main() -> None:
     env = Env()
     env.read_env()
     config = RevancedConfig(env)
+    Downloader.extra_downloads(config)
     if not config.dry_run:
         check_java()
 

requirements.txt

@@ -2,7 +2,7 @@ beautifulsoup4==4.12.2
 environs==9.5.0
 gdown @ git+https://github.com/nikhilbadyal/gdown
 google-play-scraper==1.2.4
-lastversion==3.3.2
+lastversion==3.4.1
 loguru==0.7.2
 pre-commit==3.5.0
 requests==2.31.0

scripts/status_check.py

@@ -195,8 +195,9 @@ def main() -> None:
 
     possible_apps = set()
     for patch in patches:
-        for compatible_package in patch["compatiblePackages"]:
-            possible_apps.add(compatible_package["name"])
+        if patch.get("compatiblePackages", None):
+            for compatible_package in patch["compatiblePackages"]:
+                possible_apps.add(compatible_package["name"])
 
     supported_app = set(Patches.support_app().keys())
     missing_support = sorted(possible_apps.difference(supported_app))

src/downloader/sources.py

@@ -65,6 +65,7 @@
     "yuka": f"{APK_MIRROR_BASE_APK_URL}/yuka-apps/yuka-food-cosmetic-scan/",
     "strava": f"{APK_MIRROR_BASE_APK_URL}/strava-inc/strava-running-and-cycling-gps/",
     "vanced": f"{APK_MIRROR_BASE_APK_URL}/team-vanced/youtube-vanced/",
+    "tumblr": f"{APK_MIRROR_BASE_APK_URL}/tumblr-inc/tumblr/",
     "my-expenses": UPTODOWN_BASE_URL.format("my-expenses"),
     "spotify": UPTODOWN_BASE_URL.format("spotify"),
     "androidtwelvewidgets": APK_PURE_URL,

src/patches.py

@@ -69,6 +69,7 @@ class Patches(object):
         "com.scb.phone": "scbeasy",
         "reddit.news": "reddit-news",
         "at.gv.bmf.bmf2go": "finanz-online",
+        "com.tumblr": "tumblr",
     }
 
     @staticmethod