TeamPGM/PagerMaid-Pyro
2
0
Fork 0
mirror of https://github.com/TeamPGM/PagerMaid-Pyro.git synced 2024-11-16 14:21:11 +00:00
Code Issues Actions Projects Releases Wiki Activity

🔖 Update to v1.2.13

Browse Source
This commit is contained in:
xtaodada 2022-10-22 00:51:56 +08:00
parent 513cdd4093
commit e311b57b8e
Signed by: xtaodada
GPG Key ID: 4CBB3F4FA8C85659
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pagermaid/__init__.py
View File

@ -13,7 +13,7 @@ from pagermaid.scheduler import scheduler
import pyromod.listen import pyromod.listen
from pyrogram import Client from pyrogram import Client
pgm_version = "1.2.12" pgm_version = "1.2.13"
CMD_LIST = {} CMD_LIST = {}
module_dir = __path__[0] module_dir = __path__[0]
working_dir = getcwd() working_dir = getcwd()
@ -41,12 +41,10 @@ basicConfig(level=DEBUG if Config.DEBUG else INFO)
logs.setLevel(DEBUG if Config.DEBUG else INFO) logs.setLevel(DEBUG if Config.DEBUG else INFO)
# easy check # easy check
if not Config.API_ID: if not Config.API_ID or not Config.API_HASH:
logs.error("Api-ID Not Found!") logs.warning("Api-ID or Api-HASH Not Found!")
sys.exit(1) Config.API_ID = Config.DEFAULT_API_ID
elif not Config.API_HASH: Config.API_HASH = Config.DEFAULT_API_HASH
logs.error("Api-Hash Not Found!")
sys.exit(1)
start_time = datetime.now(timezone.utc) start_time = datetime.now(timezone.utc)

13
pagermaid/config.py
View File

@ -32,8 +32,15 @@ except FileNotFoundError:
class Config: class Config:
try: try:
API_ID = int(os.environ.get("API_ID", config["api_id"])) DEFAULT_API_ID = 21724
API_HASH = os.environ.get("API_HASH", config["api_hash"]) 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") STRING_SESSION = os.environ.get("STRING_SESSION")
DEBUG = strtobool(os.environ.get("PGM_DEBUG", config["debug"])) DEBUG = strtobool(os.environ.get("PGM_DEBUG", config["debug"]))
ERROR_REPORT = strtobool(os.environ.get("PGM_ERROR_REPORT", config["error_report"]), True) 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"])) LOG_ID = int(os.environ.get("PGM_LOG_ID", config["log_chatid"]))
IPV6 = strtobool(os.environ.get("PGM_IPV6", config["ipv6"])) IPV6 = strtobool(os.environ.get("PGM_IPV6", config["ipv6"]))
ALLOW_ANALYTIC = strtobool(os.environ.get("PGM_ALLOW_ANALYTIC", config["allow_analytic"]), True) 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" MIXPANEL_API = "c79162511383b0fa1e9c062a2a86c855"
TIME_FORM = os.environ.get("PGM_TIME_FORM", config["time_form"]) TIME_FORM = os.environ.get("PGM_TIME_FORM", config["time_form"])
DATE_FORM = os.environ.get("PGM_DATE_FORM", config["date_form"]) DATE_FORM = os.environ.get("PGM_DATE_FORM", config["date_form"])

8
requirements.txt
View File

@ -1,5 +1,5 @@
pyrogram==2.0.55 pyrogram==2.0.59
TgCrypto>=1.2.3 TgCrypto>=1.2.4
Pillow>=8.4.0 Pillow>=8.4.0
pytz>=2021.3 pytz>=2021.3
PyYAML>=6.0 PyYAML>=6.0
@ -8,5 +8,5 @@ psutil>=5.8.0
httpx httpx
apscheduler apscheduler
sqlitedict sqlitedict
casbin>=1.17.1 casbin>=1.17.2
sentry-sdk>=1.9.8 sentry-sdk>=1.10.1