diff --git a/pagermaid/__init__.py b/pagermaid/__init__.py index e23c5f3..d4ff649 100644 --- a/pagermaid/__init__.py +++ b/pagermaid/__init__.py @@ -13,7 +13,7 @@ from pagermaid.scheduler import scheduler import pyromod.listen from pyrogram import Client -pgm_version = "1.2.12" +pgm_version = "1.2.13" CMD_LIST = {} module_dir = __path__[0] working_dir = getcwd() @@ -41,12 +41,10 @@ basicConfig(level=DEBUG if Config.DEBUG else INFO) logs.setLevel(DEBUG if Config.DEBUG else INFO) # easy check -if not Config.API_ID: - logs.error("Api-ID Not Found!") - sys.exit(1) -elif not Config.API_HASH: - logs.error("Api-Hash Not Found!") - sys.exit(1) +if not Config.API_ID or not Config.API_HASH: + logs.warning("Api-ID or Api-HASH Not Found!") + Config.API_ID = Config.DEFAULT_API_ID + Config.API_HASH = Config.DEFAULT_API_HASH start_time = datetime.now(timezone.utc) diff --git a/pagermaid/config.py b/pagermaid/config.py index b874849..3439c80 100644 --- a/pagermaid/config.py +++ b/pagermaid/config.py @@ -32,8 +32,15 @@ except FileNotFoundError: class Config: try: - API_ID = int(os.environ.get("API_ID", config["api_id"])) - API_HASH = os.environ.get("API_HASH", config["api_hash"]) + DEFAULT_API_ID = 21724 + DEFAULT_API_HASH = "3e0cb5efcd52300aec5994fdfc5bdc16" + try: + API_ID = int(os.environ.get("API_ID", config["api_id"])) + API_HASH = os.environ.get("API_HASH", config["api_hash"]) + except (ValueError, KeyError): + # TGX + API_ID = DEFAULT_API_ID + API_HASH = DEFAULT_API_HASH STRING_SESSION = os.environ.get("STRING_SESSION") DEBUG = strtobool(os.environ.get("PGM_DEBUG", config["debug"])) ERROR_REPORT = strtobool(os.environ.get("PGM_ERROR_REPORT", config["error_report"]), True) @@ -44,7 +51,7 @@ class Config: LOG_ID = int(os.environ.get("PGM_LOG_ID", config["log_chatid"])) IPV6 = strtobool(os.environ.get("PGM_IPV6", config["ipv6"])) ALLOW_ANALYTIC = strtobool(os.environ.get("PGM_ALLOW_ANALYTIC", config["allow_analytic"]), True) - SENTRY_API = "https://0785960e63e04279a694d0486d47d9ea@o1342815.ingest.sentry.io/6617119" + SENTRY_API = "https://262b310907314998ba2931fa8b3b3624@o1342815.ingest.sentry.io/6617119" MIXPANEL_API = "c79162511383b0fa1e9c062a2a86c855" TIME_FORM = os.environ.get("PGM_TIME_FORM", config["time_form"]) DATE_FORM = os.environ.get("PGM_DATE_FORM", config["date_form"]) diff --git a/requirements.txt b/requirements.txt index a47b3d6..5f1c1fc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -pyrogram==2.0.55 -TgCrypto>=1.2.3 +pyrogram==2.0.59 +TgCrypto>=1.2.4 Pillow>=8.4.0 pytz>=2021.3 PyYAML>=6.0 @@ -8,5 +8,5 @@ psutil>=5.8.0 httpx apscheduler sqlitedict -casbin>=1.17.1 -sentry-sdk>=1.9.8 +casbin>=1.17.2 +sentry-sdk>=1.10.1