From cd934330da1adb33f79439a897b90d4af162cf2d Mon Sep 17 00:00:00 2001
From: yasirarism <github@yasir.eu.org>
Date: Mon, 4 Sep 2023 11:36:28 +0700
Subject: [PATCH] Try test for config.env

---
 misskaty/vars.py | 42 +++++++++++++++++++++++++-----------------
 update.py        |  2 +-
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/misskaty/vars.py b/misskaty/vars.py
index af8880da..abca200e 100644
--- a/misskaty/vars.py
+++ b/misskaty/vars.py
@@ -9,25 +9,33 @@ from os import environ
 LOGGER = getLogger("MissKaty")
 
 
-def getConfig(name: str):
-    try:
-        return environ[name]
-    except:
-        return ""
-
-
 # Required ENV
-try:
-    BOT_TOKEN = getConfig("BOT_TOKEN")
-    API_ID = getConfig("API_ID")
-    API_HASH = getConfig("API_HASH")
-    # MongoDB information
-    DATABASE_URI = getConfig("DATABASE_URI")
-    LOG_CHANNEL = int(environ.get("LOG_CHANNEL"))
-except Exception as e:
-    LOGGER.error(f"One or more env variables missing! Exiting now.\n{e}")
+TELEGRAM_API = environ.get("TELEGRAM_API", "")
+if not TELEGRAM_API:
+    LOGGER.error("TELEGRAM_API variable is missing! Exiting now")
     sys.exit(1)
+else:
+    TELEGRAM_API = int(TELEGRAM_API)
+TELEGRAM_HASH = environ.get("TELEGRAM_HASH", "")
+if not TELEGRAM_HASH:
+    LOGGER.error("TELEGRAM_HASH variable is missing! Exiting now")
+    sys.exit(1)
+BOT_TOKEN = environ.get("BOT_TOKEN", "")
+if not BOT_TOKEN:
+    LOGGER.error("BOT_TOKEN variable is missing! Exiting now")
+    sys.exit(1)
+DATABASE_URI = environ.get("DATABASE_URI", "")
+if not DATABASE_URI:
+    LOGGER.error("DATABASE_URI variable is missing! Exiting now")
+    sys.exit(1)
+LOG_CHANNEL = environ.get("LOG_CHANNEL", "")
+if not LOG_CHANNEL:
+    LOGGER.error("LOG_CHANNEL variable is missing! Exiting now")
+    sys.exit(1)
+else:
+    LOG_CHANNEL = int(LOG_CHANNEL)
 
+# Optional ENV
 USER_SESSION = environ.get("USER_SESSION")
 DATABASE_NAME = environ.get("DATABASE_NAME", "MissKatyDB")
 TZ = environ.get("TZ", "Asia/Jakarta")
@@ -43,7 +51,7 @@ SUDO = list(
 )
 SUPPORT_CHAT = environ.get("SUPPORT_CHAT", "YasirPediaChannel")
 AUTO_RESTART = environ.get("AUTO_RESTART", False)
-OPENAI_API = getConfig("OPENAI_API")
+OPENAI_API = environ.get("OPENAI_API")
 
 ## Config For AUtoForwarder
 # Forward From Chat ID
diff --git a/update.py b/update.py
index fb25aff0..6d58c72b 100644
--- a/update.py
+++ b/update.py
@@ -29,7 +29,7 @@ try:
     try:
         res = requests.get(ENV_URL)
         if res.status_code == 200:
-            with open(".env", "wb+") as f:
+            with open("config.env", "wb+") as f:
                 f.write(res.content)
         else:
             LOGGER.error(f"config.env err: {res.status_code}")