diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b465454c..178b0d27 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -9,7 +9,7 @@ // Update 'VARIANT' to pick a Python version: 3, 3.10, 3.9, 3.8, 3.7, 3.6 // Append -bullseye or -buster to pin to an OS version. // Use -bullseye variants on local on arm64/Apple Silicon. - "VARIANT": "3.9", + "VARIANT": "3.9" // Options // "NODE_VERSION": "lts/*" } diff --git a/requirements.txt b/requirements.txt index 3237a583..e97968d0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ prometheus-client==0.14.1 pyparsing==3.0.9 python-pushsafer==1.0 python-telegram-bot==13.14 -pytz==2022.2.1 +pytz==2022.4 pytz-deprecation-shim==0.1.0.post0 requests==2.28.1 six==1.16.0 diff --git a/src/scanner.py b/src/scanner.py index b45a4fc0..cffb3794 100644 --- a/src/scanner.py +++ b/src/scanner.py @@ -13,7 +13,7 @@ from tgtg import TgtgClient VERSION_URL = 'https://api.github.com/repos/Der-Henning/tgtg/releases/latest' -VERSION = "1.12.1" +VERSION = "1.13.0" prog_folder = path.dirname(sys.executable) if getattr( sys, '_MEIPASS', False) else path.dirname(path.abspath(__file__)) diff --git a/src/tgtg/tgtg_client.py b/src/tgtg/tgtg_client.py index 8850599a..767c35ea 100644 --- a/src/tgtg/tgtg_client.py +++ b/src/tgtg/tgtg_client.py @@ -36,7 +36,7 @@ DEFAULT_ACCESS_TOKEN_LIFETIME = 3600 * 4 # 4 hours DEFAULT_MAX_POLLING_TRIES = 24 # 24 * POLLING_WAIT_TIME = 2 minutes DEFAULT_POLLING_WAIT_TIME = 5 # Seconds -DEFAULT_APK_VERSION = "22.8.0" +DEFAULT_APK_VERSION = "22.9.10" APK_RE_SCRIPT = re.compile( r"AF_initDataCallback\({key:\s*'ds:5'.*?data:([\s\S]*?), sideChannel:.+<\/script" @@ -145,8 +145,8 @@ def _get_user_agent(self) -> str: @staticmethod def get_latest_apk_version() -> str: response = requests.get( - "https://play.google.com/store/apps/details?id=com.app.tgtg&hl=en&gl=US" - ) + "https://play.google.com/store/apps/details?id=com.app.tgtg&hl=en&gl=US", + timeout=30) match = APK_RE_SCRIPT.search(response.text) data = json.loads(match.group(1)) return data[1][2][140][0][0][0]