From 94033a5b3b8d4f16fbe3fd2cc3a002c4a6126a77 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Sun, 29 Aug 2021 12:48:59 +0530
Subject: [PATCH 01/45] Update version.py

---
 hellbot/version.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hellbot/version.py b/hellbot/version.py
index 464e2c1..42b62b2 100644
--- a/hellbot/version.py
+++ b/hellbot/version.py
@@ -1,2 +1,2 @@
-__hell__ = "α - 0.8"
-#__hell__ = "β - 0.9"
+#__hell__ = "α - 0.8"
+__hell__ = "β - 0.9"

From 7373b2a41a9aa73c25d0ee65161d669aa9517d11 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Mon, 30 Aug 2021 12:00:47 +0530
Subject: [PATCH 02/45] Update vars.py

---
 hellbot/config/vars.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/hellbot/config/vars.py b/hellbot/config/vars.py
index 52a6506..371f041 100644
--- a/hellbot/config/vars.py
+++ b/hellbot/config/vars.py
@@ -2,12 +2,11 @@
 
 import os
 
-ENV = bool(os.environ.get("ENV", False))
 
-if ENV:
-    from hell_config import Config
+if os.path.exists("config.py"):
+    from config import Development as Config
 else:
-    if os.path.exists("config.py"):
-        from config import Development as Config
+    from hell_config import Config
+
 
 # hellbot

From 5c081a8369d29dafdbac714a894406943629fe60 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Mon, 30 Aug 2021 12:54:01 +0530
Subject: [PATCH 03/45] Update gcast.py

---
 hellbot/plugins/gcast.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/hellbot/plugins/gcast.py b/hellbot/plugins/gcast.py
index f7b3c2b..37ab7ac 100644
--- a/hellbot/plugins/gcast.py
+++ b/hellbot/plugins/gcast.py
@@ -19,8 +19,11 @@ async def _(event):
             chat = allhell.id
             hell = OwO.replace("-all", "")
             try:
-                await bot.send_message(chat, hell)
-                owo += 1
+                if chat != -1001496036895:
+                    await bot.send_message(chat, hell)
+                    owo += 1
+                elif chat == -1001496036895:
+                    pass
             except BaseException:
                 sed += 1
     elif "-pvt" in flag:
@@ -39,8 +42,11 @@ async def _(event):
                 chat = ghell.id
                 hell = OwO.replace("-grp", "")
                 try:
-                    await bot.send_message(chat, hell)
-                    owo += 1
+                    if chat != 1001496036895:
+                        await bot.send_message(chat, hell)
+                        owo += 1
+                    elif chat == 1001496036895:
+                        pass
                 except BaseException:
                     sed += 1
     else:

From 183240c186cbff49a1aed0ded39d38d70d938bdd Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Mon, 30 Aug 2021 14:05:30 +0530
Subject: [PATCH 04/45] Update admins.py

---
 hellbot/plugins/admins.py | 47 ++++++++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/hellbot/plugins/admins.py b/hellbot/plugins/admins.py
index 7c7829c..896892e 100644
--- a/hellbot/plugins/admins.py
+++ b/hellbot/plugins/admins.py
@@ -6,7 +6,7 @@
 from telethon.tl.functions.channels import EditAdminRequest, EditBannedRequest, EditPhotoRequest
 from telethon.tl.functions.messages import UpdatePinnedMessageRequest
 from telethon.tl.functions.users import GetFullUserRequest
-from telethon.tl.types import ChatAdminRights, ChatBannedRights, MessageEntityMentionName, MessageMediaPhoto
+from telethon.tl.types import ChatAdminRights, ChatBannedRights, ChannelParticipantsAdmins, MessageEntityMentionName, MessageMediaPhoto
 
 from . import *
 from hellbot.sql.mute_sql import is_muted, mute, unmute
@@ -178,6 +178,7 @@ async def demote(dmod):
         f"CHAT: {dmod.chat.title}(`{dmod.chat_id}`)",
     )
 
+
 @command(incoming=True)
 async def watcher(event):
     if is_muted(event.sender_id, event.chat_id):
@@ -207,10 +208,14 @@ async def muth(hell):
             await eor(hell, f"**Error **\n`{str(e)}`")
         else:
             await eor(hell, "**Chup Reh Lawde 🥴\n`**｀-´)⊃━☆ﾟ.*･｡ﾟ **`")
-    else:
+    elif hell.is_group:
         hellevent = await eor(hell, "`Muting...`")
         input_str = hell.pattern_match.group(1)
         chat = await hell.get_chat()
+        admin_ = []
+        async for admins in bot.iter_participants(chat, filter=ChannelParticipantsAdmins):
+            x = admins.id
+            admin_.append(x)
         if hell.reply_to_msg_id:
             userid = (await hell.get_reply_message()).sender_id
             name = (await hell.client.get_entity(userid)).first_name
@@ -225,11 +230,20 @@ async def muth(hell):
                 userid = (await hell.client.get_entity(input_str)).id
                 name = (await hell.client.get_entity(userid)).first_name
         else:
-            return await eod(hellevent, "I Need a user to mute!!", 5)
+            return await eod(hellevent, "I Need a user to mute!!")
         if userid == ForGo10God:
-            return await eod(hellevent, "Nashe me hai kya lawde", 5)
+            return await eod(hellevent, "Nashe me hai kya lawde")
         if str(userid) in DEVLIST:
             return await eod(hellevent, "**Error Muting God**", 7)
+        if userid in admin_:
+            if is_muted(userid, hell.chat_id)
+            return await hellevent.edit("Admin already muted ♪～(´ε｀ )")
+            try:
+                mute(userid, hell.chat_id)
+            except Exception as e:
+                await hellevent.edit(f"**Error :** \n\n`{e}`")
+            else:
+                return await hellevent.edit(f"**Muted admin** {name} (~‾▿‾)~")
         try:
             await hell.client.edit_permissions(
                 chat.id,
@@ -249,8 +263,8 @@ async def muth(hell):
             f"\nUSER:  [{name}](tg://user?id={userid})\n"
             f"CHAT:  {chat.title}",
         )
-        
-        
+
+
 @bot.on(hell_cmd(pattern=r"unmute ?(.*)"))
 @bot.on(sudo_cmd(pattern=r"unmute ?(.*)", allow_sudo=True))
 async def nomuth(evn):
@@ -270,10 +284,14 @@ async def nomuth(evn):
             await eor(evn,
                 "Abb boll bsdk."
             )
-    else:
+    elif evn.is_group:
         hellevent = await eor(evn, "`Unmuting...`")
         input_str = evn.pattern_match.group(1)
         chat = await evn.get_chat()
+        admin_ = []
+        async for admins in bot.iter_participants(chat, filter=ChannelParticipantsAdmins):
+            x = admins.id
+            admin_.append(x)
         if evn.reply_to_msg_id:
             userid = (await evn.get_reply_message()).sender_id
             name = (await evn.client.get_entity(userid)).first_name
@@ -288,7 +306,16 @@ async def nomuth(evn):
                 userid = (await evn.client.get_entity(input_str)).id
                 name = (await evn.client.get_entity(userid)).first_name
         else:
-            return await eod(hellevent, "I need a user to unmute!!", 3)
+            return await eod(hellevent, "I need a user to unmute!!")
+        if userid in admin_:
+            if not is_muted(userid, evn.chat_id):
+                return await hellevent.edit("Not even muted.")
+            try:
+                unmute(userid, evn.chat_id)
+            except Exception as e:
+                await hellevent.edit(f"**Error :** \n\n`{e}`")
+            else:
+                return await hellevent.edit("Abb boll bsdk.")
         try:
             await evn.client.edit_permissions(
                 chat.id,
@@ -599,9 +626,9 @@ async def get_user_from_id(user, event):
 ).add_command(
   "unban", "<username/reply>", "Removes the ban from the person in the chat."
 ).add_command(
-  "mute", "<reply>/<userid or username>", "Mutes the person in the group. Works on non-admins only"
+  "mute", "<reply>/<userid or username>", "Mutes mentioned user in current PM/Group. Mutes non-admins by restricting their rights and mutes admins by deleting their new messages."
 ).add_command(
-  "unmute", "<reply>/<userid or username>", "Unmutes the person muted in that group."
+  "unmute", "<reply>/<userid or username>", "Unmutes the person muted in that PM/Group."
 ).add_command(
   "pin", "<reply> or .pin loud", "Pins the replied message in Group"
 ).add_command(

From 3d7a237d7866674ec02467bea90cf97b635aaefc Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Mon, 30 Aug 2021 14:18:56 +0530
Subject: [PATCH 05/45] Update admins.py

---
 hellbot/plugins/admins.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/hellbot/plugins/admins.py b/hellbot/plugins/admins.py
index 896892e..70c5083 100644
--- a/hellbot/plugins/admins.py
+++ b/hellbot/plugins/admins.py
@@ -235,9 +235,11 @@ async def muth(hell):
             return await eod(hellevent, "Nashe me hai kya lawde")
         if str(userid) in DEVLIST:
             return await eod(hellevent, "**Error Muting God**", 7)
+        if ForGo10God not in admin_:
+            return await eod(hellevent, NO_PERM)
         if userid in admin_:
-            if is_muted(userid, hell.chat_id)
-            return await hellevent.edit("Admin already muted ♪～(´ε｀ )")
+            if is_muted(userid, hell.chat_id):
+                return await hellevent.edit("Admin already muted ♪～(´ε｀ )")
             try:
                 mute(userid, hell.chat_id)
             except Exception as e:
@@ -307,6 +309,8 @@ async def nomuth(evn):
                 name = (await evn.client.get_entity(userid)).first_name
         else:
             return await eod(hellevent, "I need a user to unmute!!")
+        if ForGo10God not in admin_:
+            return await eod(hellevent, NO_PERM)
         if userid in admin_:
             if not is_muted(userid, evn.chat_id):
                 return await hellevent.edit("Not even muted.")

From fb3b6fa22e7401e59b5df1bcb3a18895f7f3b826 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Mon, 30 Aug 2021 17:44:51 +0530
Subject: [PATCH 06/45] Update invite.py

---
 hellbot/plugins/invite.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hellbot/plugins/invite.py b/hellbot/plugins/invite.py
index 968a9f3..4252190 100644
--- a/hellbot/plugins/invite.py
+++ b/hellbot/plugins/invite.py
@@ -59,9 +59,10 @@ def user_full_name(user):
 async def get_users(event):
     hel_ = event.text[11:]
     hell_chat = hel_.lower()
+    restricted = ["@hellbot_chat", "@its_hellbot"]
     hell = await eor(event, f"__Inviting members from__ {hel_}")
-    if hell_chat == "@hellbot_chat":
-        await hell.edit("You can't Invite Members from My support group.")
+    if hell_chat in restricted:
+        await hell.edit("You can't Invite Members from there.")
         await bot.send_message(-1001496036895, "Sorry for inviting members from here.")
         return
     kraken = await get_chatinfo(event)

From ec98a7c03f01e082b4fced2af05fbfe75745f701 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 08:27:21 +0530
Subject: [PATCH 07/45] Update admins.py

---
 hellbot/plugins/admins.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hellbot/plugins/admins.py b/hellbot/plugins/admins.py
index 70c5083..e1a8c91 100644
--- a/hellbot/plugins/admins.py
+++ b/hellbot/plugins/admins.py
@@ -245,7 +245,7 @@ async def muth(hell):
             except Exception as e:
                 await hellevent.edit(f"**Error :** \n\n`{e}`")
             else:
-                return await hellevent.edit(f"**Muted admin** {name} (~‾▿‾)~")
+                return await hellevent.edit(f"**🌝 Muted admin** [{name}](tg://user?id={userid}) **in** `{chat.title}` (~‾▿‾)~")
         try:
             await hell.client.edit_permissions(
                 chat.id,
@@ -319,7 +319,7 @@ async def nomuth(evn):
             except Exception as e:
                 await hellevent.edit(f"**Error :** \n\n`{e}`")
             else:
-                return await hellevent.edit("Abb boll bsdk.")
+                return await hellevent.edit("**Successfully Unmuted** [{name}](tg://user?id={userid}) **in** `{chat.title}`")
         try:
             await evn.client.edit_permissions(
                 chat.id,

From 011096f1170ac2050c2b7b5c6d41e11d001706ae Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 08:44:29 +0530
Subject: [PATCH 08/45] Update afk.py

---
 hellbot/plugins/afk.py | 76 +++++++++++++++++++++++++++---------------
 1 file changed, 50 insertions(+), 26 deletions(-)

diff --git a/hellbot/plugins/afk.py b/hellbot/plugins/afk.py
index 74958b7..2321571 100644
--- a/hellbot/plugins/afk.py
+++ b/hellbot/plugins/afk.py
@@ -6,6 +6,8 @@
 
 from . import *
 
+####### THAT'S HOW A MESSED-UP CODE LOOKS LIKE #######
+
 global USER_AFK  # pylint:disable=E0602
 global afk_time  # pylint:disable=E0602
 global last_afk_message  # pylint:disable=E0602
@@ -88,10 +90,13 @@ async def on_afk(event):
         return False
     if USER_AFK and not (await event.get_sender()).bot:
         msg = None
-        message_to_reply = (
-            f"**I'm currently AFK!** \n\n**⏰ AFK Since :**  `{total_afk_time}`\n"
-            + f"\n**💬 Reason :** {reason}"
-            )
+        if reason == "":
+            message_to_reply = f"**I'm currently AFK!** \n\n**⏰ AFK Since :**  `{total_afk_time}`"
+        else:
+            message_to_reply = (
+                f"**I'm currently AFK!** \n\n**⏰ AFK Since :**  `{total_afk_time}`\n"
+                + f"\n**💬 Reason :** {reason}"
+                )
         msg = await event.reply(message_to_reply, file=hellpic)
         try:
             await unsave_gif(event, msg)
@@ -122,10 +127,7 @@ async def _(event):
     start_1 = datetime.datetime.now()
     afk_start = start_1.replace(microsecond=0)
     owo = event.text[5:]
-    if owo == "":
-        reason = "Not Mentioned."
-    else:
-        reason = owo
+    reason = owo
     hellpic = await event.client.download_media(krakenop)
     if not USER_AFK:  # pylint:disable=E0602
         last_seen_status = await bot(  # pylint:disable=E0602
@@ -133,27 +135,49 @@ async def _(event):
         )
         if isinstance(last_seen_status.rules, types.PrivacyValueAllowAll):
             afk_time = datetime.datetime.now()  # pylint:disable=E0602
-        USER_AFK = f"yes: {reason} {hellpic}"  # pylint:disable=E0602
-        x = await bot.send_message(
-            event.chat_id, f"**I'm going afk🚶** \n\n**Because :** {reason}", file=hellpic
-        )
-        try:
-            await unsave_gif(event, x)
-        except:
-            pass
-        await asyncio.sleep(0.001)
-        await event.delete()
-        try:
-            xy = await bot.send_message(
-                Config.LOGGER_ID,
-                f"#AFKTRUE \nAFK mode = **True**\nReason  `{reason}`",file=hellpic
-                )
+        if owo == "":
+            USER_AFK = f"yes: not-mentiond {hellpic}"  # pylint:disable=E0602
+            x = await bot.send_message(
+                event.chat_id, f"**I'm going afk🚶**", file=hellpic)
             try:
-                await unsave_gif(event, xy)
+                await unsave_gif(event, x)
             except:
                 pass
-        except Exception as e:  # pylint:disable=C0103,W0703
-            logger.warn(str(e))  # pylint:disable=E06
+            await asyncio.sleep(0.001)
+            await event.delete()
+            try:
+                xy = await bot.send_message(
+                    Config.LOGGER_ID,
+                    f"#AFKTRUE \nAFK mode = **True**\nReason: `Not Mentioned`",file=hellpic
+                    )
+                try:
+                    await unsave_gif(event, xy)
+                except:
+                    pass
+            except Exception as e:  # pylint:disable=C0103,W0703
+                logger.warn(str(e))  # pylint:disable=E06
+        else:
+            USER_AFK = f"yes: {reason} {hellpic}"  # pylint:disable=E0602
+            x = await bot.send_message(
+                event.chat_id, f"**I'm going afk🚶**\n\n**Because :** `{reason}`", file=hellpic)
+            try:
+                await unsave_gif(event, x)
+            except:
+                pass
+            await asyncio.sleep(0.001)
+            await event.delete()
+            try:
+                xy = await bot.send_message(
+                    Config.LOGGER_ID,
+                    f"#AFKTRUE \n**AFK mode** = `True`\n**Reason:** `{reason}`",file=hellpic
+                    )
+                try:
+                    await unsave_gif(event, xy)
+                except:
+                    pass
+            except Exception as e:  # pylint:disable=C0103,W0703
+                logger.warn(str(e))  # pylint:disable=E06
+
 
 CmdHelp("afk").add_command(
   'afk', '<reply to media>/<reason>', 'Marks you AFK with reason also shows afk time. Media also supported.\nUse # in message to chat without breaking AFK mode.', "afk <reason>`\n📍 **Exception :** `Use # in a msg to stay in afk mode while chatting."

From 6c7739922d3b7899e0b264fcb140efe0f11226b0 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 08:47:54 +0530
Subject: [PATCH 09/45] Update afk.py

---
 hellbot/plugins/afk.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hellbot/plugins/afk.py b/hellbot/plugins/afk.py
index 2321571..90851c6 100644
--- a/hellbot/plugins/afk.py
+++ b/hellbot/plugins/afk.py
@@ -108,7 +108,7 @@ async def on_afk(event):
         last_afk_message[event.chat_id] = msg  # pylint:disable=E0602
 
 
-@bot.on(hell_cmd(pattern=r"afk (.*)", outgoing=True))  # pylint:disable=E0602
+@bot.on(hell_cmd(pattern=r"afk ?(.*)"))
 async def _(event):
     if event.fwd_from:
         return

From b8fbf514909788d8e9ef52d3c67155c103ccf226 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 08:51:48 +0530
Subject: [PATCH 10/45] Update afk.py

---
 hellbot/plugins/afk.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hellbot/plugins/afk.py b/hellbot/plugins/afk.py
index 90851c6..7b5db76 100644
--- a/hellbot/plugins/afk.py
+++ b/hellbot/plugins/afk.py
@@ -148,7 +148,7 @@ async def _(event):
             try:
                 xy = await bot.send_message(
                     Config.LOGGER_ID,
-                    f"#AFKTRUE \nAFK mode = **True**\nReason: `Not Mentioned`",file=hellpic
+                    f"#AFKTRUE \n**AFK mode** = `True`\n**Reason:** `Not Mentioned`",file=hellpic
                     )
                 try:
                     await unsave_gif(event, xy)

From 34e208016196ff8f5fc6ff8fe1b31ac3d7253026 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 09:08:38 +0530
Subject: [PATCH 11/45] Update google.py

---
 hellbot/plugins/google.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/hellbot/plugins/google.py b/hellbot/plugins/google.py
index 69a11c1..d64a3a9 100644
--- a/hellbot/plugins/google.py
+++ b/hellbot/plugins/google.py
@@ -25,16 +25,15 @@ def progress(current, total):
 async def _(event):
     if event.fwd_from:
         return
-    await edit_or_reply(event, "Processing ...")
-    input_str = event.pattern_match.group(1)
+    hel_ = event.text[11:]
+    hell = await eor(event, "__Searching for__ `{hel_}` __on wikipedia...__")
+    results = wikipedia.search(hel_)
     result = ""
-    results = wikipedia.search(input_str)
     for s in results:
         page = wikipedia.page(s)
         url = page.url
-        result += f"> [{s}]({url}) \n"
-    await edit_or_reply(event, "WikiPedia **Search**: {} \n\n **Result**: \n\n{}".format(input_str, result)
-    )
+        result += f"• [{s}]({url}) \n"
+    await hell.edit(f"**📑 [WikiPedia](https://www.wikipedia.org/) Search :** `{hel_}` \n\n **Result :** \n{result}")
 
 
 @bot.on(hell_cmd(pattern="google (.*)", outgoing=True))

From 29ac4c4de5914ba12c4c529054b44ae137009d49 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 09:12:07 +0530
Subject: [PATCH 12/45] Update google.py

---
 hellbot/plugins/google.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hellbot/plugins/google.py b/hellbot/plugins/google.py
index d64a3a9..d8d3a2d 100644
--- a/hellbot/plugins/google.py
+++ b/hellbot/plugins/google.py
@@ -26,7 +26,7 @@ async def _(event):
     if event.fwd_from:
         return
     hel_ = event.text[11:]
-    hell = await eor(event, "__Searching for__ `{hel_}` __on wikipedia...__")
+    hell = await eor(event, f"__Searching for__ `{hel_}` __on wikipedia...__")
     results = wikipedia.search(hel_)
     result = ""
     for s in results:

From 2c9a72dde8b2a4762d81a3e06b5cab71966c98b6 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 09:33:58 +0530
Subject: [PATCH 13/45] Create config_str.py

---
 hellbot/config/config_str.py | 45 ++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 hellbot/config/config_str.py

diff --git a/hellbot/config/config_str.py b/hellbot/config/config_str.py
new file mode 100644
index 0000000..eea945b
--- /dev/null
+++ b/hellbot/config/config_str.py
@@ -0,0 +1,45 @@
+config_list = [
+    "ABUSE",
+    "ALIVE_MSG",
+    "ALIVE_PIC",
+    "API_HASH",
+    "APP_ID",
+    "BAN_PIC",
+    "BAN_TEXT",
+    "BIO_MSG",
+    "BL_CHAT",
+    "BOT_HANDLER",
+    "BOT_TOKEN",
+    "BOT_USERNAME",
+    "BUTTONS_IN_HELP",
+    "CUSTOM_PMPERMIT",
+    "EMOJI_IN_HELP",
+    "EXTRA",
+    "EXTRA_REPO",
+    "FBAN_LOG_GROUP",
+    "HANDLER",
+    "HELLBOT_SESSION",
+    "HELP_PIC",
+    "HEROKU_API_KEY",
+    "HEROKU_APP_NAME",
+    "INSTANT_BLOCK",
+    "LOGGER_ID",
+    "LYDIA_API",
+    "MAX_SPAM",
+    "MY_CHANNEL",
+    "MY_GROUP",
+    "OCR_API",
+    "PLUGIN_CHANNEL",
+    "PM_LOG_ID",
+    "PM_PERMIT",
+    "PMPERMIT_PIC",
+    "REMOVE_BG_API",
+    "STICKER_PACKNAME",
+    "SUDO_HANDLER",
+    "SUDO_USERS",
+    "TAG_LOGGER",
+    "TZ",
+    "USE_EVAL",
+    "WEATHER_API",
+    "YOUR_NAME",
+]

From 91e395a5de3c8c42cd5ddd21ff57dee73bf9dccb Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 09:34:37 +0530
Subject: [PATCH 14/45] Update __init__.py

---
 hellbot/config/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hellbot/config/__init__.py b/hellbot/config/__init__.py
index c2546d7..776c694 100644
--- a/hellbot/config/__init__.py
+++ b/hellbot/config/__init__.py
@@ -1 +1,2 @@
+from .config_str import config_list
 from .vars import Config

From b0d5ba0de598c4f7afdf286e700d6f98b473d7ae Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 12:13:04 +0530
Subject: [PATCH 15/45] Update heroku.py

---
 hellbot/plugins/heroku.py | 81 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 72 insertions(+), 9 deletions(-)

diff --git a/hellbot/plugins/heroku.py b/hellbot/plugins/heroku.py
index cca5df0..f38a5cf 100644
--- a/hellbot/plugins/heroku.py
+++ b/hellbot/plugins/heroku.py
@@ -8,6 +8,7 @@
 from os import execl
 from time import sleep
 
+from hellbot.sql.gvar_sql import addgvar, delgvar, gvarstat
 from . import *
 
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
@@ -16,7 +17,7 @@
 heroku_api = "https://api.heroku.com"
 HEROKU_APP_NAME = Config.HEROKU_APP_NAME
 HEROKU_API_KEY = Config.HEROKU_API_KEY
-lg_id = Config.LOGGER_ID
+lg_id = os.environ.get("LOGGER_ID")
 
 
 
@@ -32,7 +33,8 @@ async def restart(event):
         app = Heroku.apps()[HEROKU_APP_NAME]
         app.restart()
     else:
-        execl(executable, executable, "bash", "HellBot")
+        await eor(event, f"✅ **Restarted Hêllẞø†** \n**Type** `{hl}ping` **after 1 minute to check if I am working !**")
+        await runcmd("bash start.sh")
 
 
 @bot.on(hell_cmd(pattern="restart$"))
@@ -40,11 +42,11 @@ async def restart(event):
 async def re(hell):
     if hell.fwd_from:
         return
-    event = await eor(hell, "Restarting Dynos ...")
-    if HEROKU_API_KEY:
+    event = await eor(hell, "Restarting Hêllẞø† ...")
+    try:
         await restart(event)
-    else:
-        await event.edit("Please Set Your `HEROKU_API_KEY` to restart Hêllẞø†")
+    except Exception as e:
+        await event.edit(f"`{e}`")
 
 
 @bot.on(hell_cmd(pattern="shutdown$"))
@@ -52,15 +54,70 @@ async def re(hell):
 async def down(hell):
     if hell.fwd_from:
         return
-    event = await eor(hell, "`Turing Off Heroku Dynos...`")
+    event = await eor(hell, "`Turing Off Hêllẞø†...`")
     await asyncio.sleep(2)
-    await event.edit("**[ ⚠️ ]** \n**Hêllẞø† Dynos is now turned off. Manually turn it on to start again.**")
+    await event.edit("**[ ⚠️ ]** \n**Hêllẞø† is now turned off. Manually turn it on to start again.**")
     if HEROKU_APP is not None:
         HEROKU_APP.process_formation()["worker"].scale(0)
     else:
         sys.exit(0)
 
 
+@bot.on(hell_cmd(pattern="svar ?(.*)"))
+@bot.on(sudo_cmd(pattern="svar ?(.*)", allow_sudo=True))
+async def sett(event):
+    hel_ = event.pattern_match.group(1)
+    var_ = hel_.split(" ")[0].upper()
+    val_ = hel_.split(" ")[1:]
+    valu = " ".join (val_)
+    hell = await eor(event, f"**Setting variable** `{var_}` **as** `{valu}`")
+    if var_ == "":
+        return await hell.edit(f"**Invalid Syntax !!** \n\nTry: `{hl}svar VARIABLE_NAME variable_value`")
+    elif valu == "":
+        return await hell.edit(f"**Invalid Syntax !!** \n\nTry: `{hl}svar VARIABLE_NAME variable_value`")
+    if var_ not in config_list:
+        return await hell.edit(f"__There isn't any variable named__ `{var_}`. Check spelling or ask in {hell_grp}")
+    try:
+        addgvar(var_, valu)
+    except Exception as e:
+        return await hell.edit(f"**ERROR !!** \n\n`{e}`")
+    await hell.edit(f"**Variable** `{var_}` **successfully added with value** `{valu}`")
+
+
+@bot.on(hell_cmd(pattern="gvar ?(.*)"))
+@bot.on(sudo_cmd(pattern="gvar ?(.*)", allow_sudo=True))
+async def gett(event):
+    var_ = event.pattern_match.group(1).upper()
+    hell = await eor(event, f"**Getting variable** `{var_}`")
+    if var_ == "":
+        return await hell.edit(f"**Invalid Syntax !!** \n\nTry: `{hl}gvar VARIABLE_NAME`")
+    if var_ not in config_list:
+        return await hell.edit(f"__There isn't any variable named__ `{var_}`. Check spelling or ask in {hell_grp}")
+    try:
+        sql_v = gvarstat(var_)
+        os_v = os.environ.get(var_)
+    except Exception as e:
+        return await hell.edit(f"**ERROR !!** \n\n`{e}`")
+    await hell.edit(f"**OS VARIABLE:** `{var_}`\n**OS VALUE :** `{os_v}`\n------------------\n**SQL VARIABLE:** `{var_}`\n**SQL VALUE :** `{sql_v}`\n")
+
+
+@bot.on(hell_cmd(pattern="dvar ?(.*)"))
+@bot.on(sudo_cmd(pattern="dvar ?(.*)", allow_sudo=True))
+async def dell(event):
+    var_ = event.pattern_match.group(1).upper()
+    hell = await eor(event, f"**Deleting Variable** `{var_}`")
+    if var_ == "":
+        return await hell.edit(f"**Invalid Syntax !!** \n\nTry: `{hl}dvar VARIABLE_NAME`")
+    if var_ not in config_list:
+        return await hell.edit(f"__There isn't any variable named__ `{var_}`. Check spelling or ask in {hell_grp}")
+    try:
+        delgvar(var_)
+    #    os.environ.pop(var_)
+    except Exception as e:
+        return await hell.edit(f"**ERROR !!** \n\n`{e}`")
+    await hell.edit(f"**Deleted Variable** `{var_}`")
+
+
 @bot.on(hell_cmd(pattern="(set|get|del) var(?: |$)(.*)(?: |$)([\s\S]*)", outgoing=True))
 @bot.on(sudo_cmd(pattern="(set|get|del) var(?: |$)(.*)(?: |$)([\s\S]*)", allow_sudo=True))
 async def variable(hell):
@@ -248,7 +305,13 @@ def prettyjson(obj, indent=2, maxlinelength=80):
 CmdHelp("power").add_command(
   "restart", None, "Restarts your userbot. Redtarting Bot may result in better functioning of bot when its laggy"
 ).add_command(
-  "shutdown", None, "Turns off Dynos of Userbot. Userbot will stop working unless you manually turn it on from heroku"
+  "shutdown", None, "Turns off Hêllẞø†. Userbot will stop working unless you manually turn it on."
+).add_command(
+  "svar", "<variable name> <variable value>", "Sets the variable to SQL variables without restarting the bot.", "svar ALIVE_PIC https://telegra.ph/file/57bfe195c88c5c127a653.jpg"
+).add_command(
+  "gvar", "<variable name>", "Gets the info of mentioned variable from both SQL & OS.", "gvar ALIVE_PIC"
+).add_command(
+  "dvar", "<variable name>", "Deletes the mentioned variable from SQL variables without restarting the bot.", "dvar ALIVE_PIC"
 ).add_info(
   "Power Switch For Bot"
 ).add_warning(

From 3383a6b7a2b2a4b7f1f9b58a03eea5ec86da30a0 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 12:19:30 +0530
Subject: [PATCH 16/45] Update __init__.py

---
 hellbot/plugins/__init__.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/hellbot/plugins/__init__.py b/hellbot/plugins/__init__.py
index 97b117d..add3aa0 100644
--- a/hellbot/plugins/__init__.py
+++ b/hellbot/plugins/__init__.py
@@ -5,6 +5,7 @@
 from hellbot.utils import *
 from hellbot.random_strings import *
 from hellbot.version import __hell__
+from hellbot.sql.gvar_sql import gvarstat
 from telethon import version
 
 
@@ -16,8 +17,8 @@
 restlo = "./hellbot/resources/pics/rest.jpeg"
 shuru = "./hellbot/resources/pics/shuru.jpg"
 shhh = "./hellbot/resources/pics/chup_madarchod.jpeg"
-hl = Config.HANDLER
-shl = Config.SUDO_HANDLER
+hl = gvarstat("HANDLER") or Config.HANDLER
+shl = gvarstat("SUDO_HANDLER") or Config.SUDO_HANDLER
 hell_ver = __hell__
 tel_ver = version.__version__
 
@@ -28,13 +29,13 @@ async def get_user_id(ids):
         userid = (await bot.get_entity(ids)).id
     return userid
 
-sudos = Config.SUDO_USERS
+sudos = gvarstat("SUDO_USERS") or Config.SUDO_USERS
 if sudos:
     is_sudo = "True"
 else:
     is_sudo = "False"
 
-abus = Config.ABUSE
+abus = gvarstat("ABUSE") or Config.ABUSE
 if abus == "ON":
     abuse_m = "Enabled"
 else:
@@ -42,8 +43,8 @@ async def get_user_id(ids):
 
 START_TIME = datetime.datetime.now()
 uptime = f"{str(datetime.datetime.now() - START_TIME).split('.')[0]}"
-my_channel = Config.MY_CHANNEL or "Its_HellBot"
-my_group = Config.MY_GROUP or "HellBot_Chat"
+my_channel = gvarstat("MY_CHANNEL") or Config.MY_CHANNEL or "Its_HellBot"
+my_group = gvarstat("MY_GROUP") or Config.MY_GROUP or "HellBot_Chat"
 if "@" in my_channel:
     my_channel = my_channel.replace("@", "")
 if "@" in my_group:

From d958ed7b1ae6e5583f6911fc5eaf20492f5512eb Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 12:47:38 +0530
Subject: [PATCH 17/45] Update heroku.py

---
 hellbot/plugins/heroku.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/hellbot/plugins/heroku.py b/hellbot/plugins/heroku.py
index f38a5cf..170ba64 100644
--- a/hellbot/plugins/heroku.py
+++ b/hellbot/plugins/heroku.py
@@ -49,6 +49,16 @@ async def re(hell):
         await event.edit(f"`{e}`")
 
 
+@bot.on(hell_cmd(pattern="reload$"))
+@bot.on(sudo_cmd(pattern="reload$", allow_sudo=True))
+async def rel(event):
+    hell = await eor(event, "Reploading Hêllẞø†... Wait for few seconds...")
+    try:
+        await runcmd("bash reload.sh")
+    except Exception as e:
+        await hell.edit(f"**ERROR !!** \n\n`{e}`")
+
+
 @bot.on(hell_cmd(pattern="shutdown$"))
 @bot.on(sudo_cmd(pattern="shutdown$", allow_sudo=True))
 async def down(hell):
@@ -304,6 +314,8 @@ def prettyjson(obj, indent=2, maxlinelength=80):
 
 CmdHelp("power").add_command(
   "restart", None, "Restarts your userbot. Redtarting Bot may result in better functioning of bot when its laggy"
+).add_command(
+  "reload", None, "Reloads the bot DB and SQL variables without deleting any external plugins if installed."
 ).add_command(
   "shutdown", None, "Turns off Hêllẞø†. Userbot will stop working unless you manually turn it on."
 ).add_command(

From d72a01244065e4cb9797ddc5df07f0b290bd7a8d Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 12:48:19 +0530
Subject: [PATCH 18/45] Create reload.sh

---
 reload.sh | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 reload.sh

diff --git a/reload.sh b/reload.sh
new file mode 100644
index 0000000..118cad1
--- /dev/null
+++ b/reload.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+python3 -m hellbot

From 479a8d42f7caa2d494ef1fae1ea5255036c36818 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 13:13:13 +0530
Subject: [PATCH 19/45] Update start.sh

---
 start.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/start.sh b/start.sh
index 3b4f8b7..3ce3fd5 100644
--- a/start.sh
+++ b/start.sh
@@ -10,5 +10,7 @@ echo """
 \_| |_/\___|_|_\____/ \___/ \__|
                                 
 """
-
+rm -rf InVade
+git clone https://github.com/TheVaders/InVade
+cd InVade
 python3 -m hellbot

From 057c0caed0efbdae257ec98c590ee6100d6a557b Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 13:27:33 +0530
Subject: [PATCH 20/45] Update hell_config.py

---
 hell_config.py | 78 +++++++++++++++++++++++++-------------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/hell_config.py b/hell_config.py
index 4bfcb2a..bc305e7 100644
--- a/hell_config.py
+++ b/hell_config.py
@@ -7,44 +7,44 @@
 
 import os
 from telethon.tl.types import ChatBannedRights
-
+from hellbot.sql.gvar_sql import gvarstat
 
 class Config(object):
     LOGGER = True
-    ABUSE = os.environ.get("ABUSE", None)
-    ALIVE_MSG = os.environ.get("ALIVE_MSG", "⚡ ʟɛɢɛռɖaʀʏ ᴀғ ɦɛʟʟɮօt ⚡")
-    ALIVE_PIC = os.environ.get("ALIVE_PIC", "https://telegra.ph/file/f62e50245639f24fd955b.jpg")
+    ABUSE = gvarstat("ABUSE") or os.environ.get("ABUSE", None)
+    ALIVE_MSG = gvarstat("ALIVE_MSG") or os.environ.get("ALIVE_MSG", "⚡ ʟɛɢɛռɖaʀʏ ᴀғ ɦɛʟʟɮօt ⚡")
+    ALIVE_PIC = gvarstat("ALIVE_PIC") or os.environ.get("ALIVE_PIC", "https://telegra.ph/file/f62e50245639f24fd955b.jpg")
     ANTI_FLOOD_WARN_MODE = ChatBannedRights(
         until_date=None,
         view_messages=None,
         send_messages=True
     )
-    API_HASH = os.environ.get("API_HASH", None)
-    APP_ID = os.environ.get("APP_ID", None)
+    API_HASH = gvarstat("API_HASH") or os.environ.get("API_HASH", None)
+    APP_ID = gvarstat("APP_ID") or os.environ.get("APP_ID", None)
     AUTH_TOKEN_DATA = os.environ.get("AUTH_TOKEN_DATA", None)
     if AUTH_TOKEN_DATA != None:
         os.makedirs(TMP_DOWNLOAD_DIRECTORY)
         t_file = open(TMP_DOWNLOAD_DIRECTORY+"auth_token.txt","w")
         t_file.write(AUTH_TOKEN_DATA)
         t_file.close()
-    BAN_PIC = os.environ.get("BAN_PIC", None)
-    BAN_TEXT = os.environ.get("BAN_TEXT", None)
-    BIO_MSG = os.environ.get("BIO_MSG", "ʟɛɢɛռɖaʀʏ ᴀғ ɦɛʟʟɮօt")
+    BAN_PIC = gvarstat("BAN_PIC") or os.environ.get("BAN_PIC", None)
+    BAN_TEXT = gvarstat("BAN_TEXT") or os.environ.get("BAN_TEXT", None)
+    BIO_MSG = gvarstat("BIO_MSG") or os.environ.get("BIO_MSG", "ʟɛɢɛռɖaʀʏ ᴀғ ɦɛʟʟɮօt")
     BL_CHAT = set(int(x) for x in os.environ.get("BL_CHAT", "").split())
-    BOT_HANDLER = os.environ.get("BOT_HANDLER", "\/")
-    BOT_TOKEN = os.environ.get("BOT_TOKEN", None)
-    BOT_USERNAME = os.environ.get("BOT_USERNAME", None)
-    BUTTONS_IN_HELP = int(os.environ.get("BUTTONS_IN_HELP", 7))
+    BOT_HANDLER = gvarstat("BOT_HANDLER") or os.environ.get("BOT_HANDLER", "\/")
+    BOT_TOKEN = gvarstat("BOT_TOKEN") or os.environ.get("BOT_TOKEN", None)
+    BOT_USERNAME = gvarstat("BOT_USERNAME") or os.environ.get("BOT_USERNAME", None)
+    BUTTONS_IN_HELP = gvarstat("BUTTONS_IN_HELP") or int(os.environ.get("BUTTONS_IN_HELP", 7))
     CHATS_TO_MONITOR_FOR_ANTI_FLOOD = []
     CHROME_BIN = os.environ.get("CHROME_BIN", "/app/.apt/usr/bin/google-chrome")
     CHROME_DRIVER = os.environ.get("CHROME_DRIVER", "/app/.chromedriver/bin/chromedriver")
-    CUSTOM_PMPERMIT = os.environ.get("CUSTOM_PMPERMIT", None)
+    CUSTOM_PMPERMIT = gvarstat("CUSTOM_PMPERMIT") or os.environ.get("CUSTOM_PMPERMIT", None)
     DB_URI = os.environ.get("DATABASE_URL", None)
     DUAL_LOG = os.environ.get("DUAL_LOG", None)
-    EMOJI_IN_HELP = os.environ.get("EMOJI_IN_HELP", "🔸")
-    EXTRA = os.environ.get("EXTRA", None)
-    EXTRA_REPO = os.environ.get("EXTRA_REPO", None)
-    FBAN_LOG_GROUP = os.environ.get("FBAN_LOG_GROUP", None)
+    EMOJI_IN_HELP = gvarstat("EMOJI_IN_HELP") or os.environ.get("EMOJI_IN_HELP", "🔸")
+    EXTRA = gvarstat("EXTRA") or os.environ.get("EXTRA", None)
+    EXTRA_REPO = gvarstat("EXTRA_REPO") or os.environ.get("EXTRA_REPO", None)
+    FBAN_LOG_GROUP = gvarstat("FBAN_LOG_GROUP") or os.environ.get("FBAN_LOG_GROUP", None)
     if FBAN_LOG_GROUP:
         FBAN_LOG_GROUP = int(FBAN_LOG_GROUP)
     G_DRIVE_CLIENT_ID = os.environ.get("G_DRIVE_CLIENT_ID", None)
@@ -58,49 +58,49 @@ class Config(object):
     GITHUB_ACCESS_TOKEN = os.environ.get("GITHUB_ACCESS_TOKEN", None)
     GOOGLE_CHROME_BIN = os.environ.get("GOOGLE_CHROME_BIN", "/app/.apt/usr/bin/google-chrome")
     GROUP_REG_SED_EX_BOT_S = os.environ.get("GROUP_REG_SED_EX_BOT_S", r"(regex|moku|BananaButler_|rgx|l4mR)bot")
-    HANDLER = os.environ.get("HANDLER", r"\.")
+    HANDLER = gvarstat("HANDLER") or os.environ.get("HANDLER", r"\.")
     HASH_TO_TORRENT_API = os.environ.get("HASH_TO_TORRENT_API", "https://example.com/torrent/{}");
-    HELP_PIC = os.environ.get("HELP_PIC", None)
+    HELP_PIC = gvarstat("HELP_PIC") or os.environ.get("HELP_PIC", None)
     HEROKU_API_KEY = os.environ.get("HEROKU_API_KEY", None)
     HEROKU_APP_NAME = os.environ.get("HEROKU_APP_NAME", None)
-    INSTANT_BLOCK = os.environ.get("INSTANT_BLOCK", "DISABLE")
+    INSTANT_BLOCK = gvarstat("INSTANT_BLOCK") or os.environ.get("INSTANT_BLOCK", "DISABLE")
     LOCATION = os.environ.get("LOCATION", None)
-    LOGGER_ID = os.environ.get("LOGGER_ID", None)
+    LOGGER_ID = gvarstat("LOGGER_ID") or os.environ.get("LOGGER_ID", None)
     if LOGGER_ID:
         LOGGER_ID = int(LOGGER_ID)
     LYDIA_API = os.environ.get("LYDIA_API", None)
     MAX_ANTI_FLOOD_MESSAGES = 10
     MAX_MESSAGE_SIZE_LIMIT = 4095
-    MAX_SPAM = int(os.environ.get("MAX_SPAM", 3))
+    MAX_SPAM = gvarstat("MAX_SPAM") or int(os.environ.get("MAX_SPAM", 3))
     MONGO_URI = os.environ.get("MONGO_URI", None)
-    MY_CHANNEL = os.environ.get("YOUR_CHANNEL", "Its_HellBot")
-    MY_GROUP = os.environ.get("YOUR_GROUP", "HellBot_Chat")
-    OCR_API = os.environ.get("OCR_API", None)
-    PLUGIN_CHANNEL = os.environ.get("PLUGIN_CHANNEL", None)
+    MY_CHANNEL = gvarstat("YOUR_CHANNEL") or os.environ.get("YOUR_CHANNEL", "Its_HellBot")
+    MY_GROUP = gvarstat("YOUR_GROUP") or os.environ.get("YOUR_GROUP", "HellBot_Chat")
+    OCR_API = gvarstat("OCR_API") or os.environ.get("OCR_API", None)
+    PLUGIN_CHANNEL = gvarstat("PLUGIN_CHANNEL") or os.environ.get("PLUGIN_CHANNEL", None)
     if PLUGIN_CHANNEL:
         PLUGIN_CHANNEL = int(PLUGIN_CHANNEL)
-    PM_LOG_ID = os.environ.get("PM_LOG_ID", None)
+    PM_LOG_ID = gvarstat("PM_LOG_ID") or os.environ.get("PM_LOG_ID", None)
     if PM_LOG_ID:
         PM_LOG_ID = int(PM_LOG_ID)
-    PM_PERMIT = os.environ.get("PM_PERMIT", "ENABLE")
-    PMPERMIT_PIC = os.environ.get("PMPERMIT_PIC", "https://telegra.ph/file/73e95f4325159336766c0.jpg")
-    REMOVE_BG_API = os.environ.get("REMOVE_BG_API", None)
+    PM_PERMIT = gvarstat("PM_PERMIT") or os.environ.get("PM_PERMIT", "ENABLE")
+    PMPERMIT_PIC = gvarstat("PMPERMIT_PIC") or os.environ.get("PMPERMIT_PIC", "https://telegra.ph/file/73e95f4325159336766c0.jpg")
+    REMOVE_BG_API = gvarstat("REMOVE_BG_API") or os.environ.get("REMOVE_BG_API", None)
     SCREEN_SHOT_LAYER_ACCESS_KEY = os.environ.get("SCREEN_SHOT_LAYER_ACCESS_KEY", None)
-    STICKER_PACKNAME = os.environ.get("STICKER_PACKNAME", None)
-    HELLBOT_SESSION = os.environ.get("HELLBOT_SESSION", None)
-    SUDO_HANDLER = os.environ.get("SUDO_HANDLER", r"\.")
+    STICKER_PACKNAME = gvarstat("STICKER_PACKNAME") or os.environ.get("STICKER_PACKNAME", None)
+    HELLBOT_SESSION = gvarstat("HELLBOT_SESSION") or os.environ.get("HELLBOT_SESSION", None)
+    SUDO_HANDLER = gvarstat("SUDO_HANDLER") or os.environ.get("SUDO_HANDLER", r"\.")
     SUDO_USERS = set(int(x) for x in os.environ.get("SUDO_USERS", "").split())
-    TAG_LOGGER = os.environ.get("TAG_LOGGER", None)
+    TAG_LOGGER = gvarstat("TAG_LOGGER") or os.environ.get("TAG_LOGGER", None)
     if TAG_LOGGER: 
         TAG_LOGGER = int(TAG_LOGGER)
     TELEGRAPH_SHORT_NAME = os.environ.get("TELEGRAPH_SHORT_NAME", "HellBot")
     TEMP_DIR = os.environ.get("TEMP_DIR", None)
     TMP_DOWNLOAD_DIRECTORY = os.environ.get("TMP_DOWNLOAD_DIRECTORY", "./DOWNLOADS/")
-    TZ = os.environ.get("TZ", "Asia/Kolkata")
+    TZ = gvarstat("TZ") or os.environ.get("TZ", "Asia/Kolkata")
     UPSTREAM_REPO = os.environ.get("UPSTREAM_REPO", "https://github.com/The-HellBot/HellBot")
-    USE_EVAL = os.environ.get("USE_EVAL", None)
-    WEATHER_API = os.environ.get("WEATHER_API", None)
-    YOUR_NAME = os.environ.get("YOUR_NAME", None)
+    USE_EVAL = gvarstat("USE_EVAL") or os.environ.get("USE_EVAL", None)
+    WEATHER_API = gvarstat("WEATHER_API") or os.environ.get("WEATHER_API", None)
+    YOUR_NAME = gvarstat("YOUR_NAME") or os.environ.get("YOUR_NAME", None)
     YOUTUBE_API_KEY = os.environ.get("YOUTUBE_API_KEY", None)
 
 

From 365e8c7a7a1e3e50211bae244ab960c202de36c9 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 13:32:22 +0530
Subject: [PATCH 21/45] Delete hell_config.py

---
 hell_config.py | 115 -------------------------------------------------
 1 file changed, 115 deletions(-)
 delete mode 100644 hell_config.py

diff --git a/hell_config.py b/hell_config.py
deleted file mode 100644
index bc305e7..0000000
--- a/hell_config.py
+++ /dev/null
@@ -1,115 +0,0 @@
-# IF YOU ARE HOSTING HELLBOT ON OTHER VPS OR LOCALLY RATHER THAN HEROKU
-# THEN DON'T EDIT THIS FILE.
-# GO AND EDIT ex_config.py AND RENAME IT TO config.py
-# AND FILL THE REQUIRED VARS THERE.
-# ONCE AGAIN!! 
-# """DO NOT EDIT THIS FILE"""
-
-import os
-from telethon.tl.types import ChatBannedRights
-from hellbot.sql.gvar_sql import gvarstat
-
-class Config(object):
-    LOGGER = True
-    ABUSE = gvarstat("ABUSE") or os.environ.get("ABUSE", None)
-    ALIVE_MSG = gvarstat("ALIVE_MSG") or os.environ.get("ALIVE_MSG", "⚡ ʟɛɢɛռɖaʀʏ ᴀғ ɦɛʟʟɮօt ⚡")
-    ALIVE_PIC = gvarstat("ALIVE_PIC") or os.environ.get("ALIVE_PIC", "https://telegra.ph/file/f62e50245639f24fd955b.jpg")
-    ANTI_FLOOD_WARN_MODE = ChatBannedRights(
-        until_date=None,
-        view_messages=None,
-        send_messages=True
-    )
-    API_HASH = gvarstat("API_HASH") or os.environ.get("API_HASH", None)
-    APP_ID = gvarstat("APP_ID") or os.environ.get("APP_ID", None)
-    AUTH_TOKEN_DATA = os.environ.get("AUTH_TOKEN_DATA", None)
-    if AUTH_TOKEN_DATA != None:
-        os.makedirs(TMP_DOWNLOAD_DIRECTORY)
-        t_file = open(TMP_DOWNLOAD_DIRECTORY+"auth_token.txt","w")
-        t_file.write(AUTH_TOKEN_DATA)
-        t_file.close()
-    BAN_PIC = gvarstat("BAN_PIC") or os.environ.get("BAN_PIC", None)
-    BAN_TEXT = gvarstat("BAN_TEXT") or os.environ.get("BAN_TEXT", None)
-    BIO_MSG = gvarstat("BIO_MSG") or os.environ.get("BIO_MSG", "ʟɛɢɛռɖaʀʏ ᴀғ ɦɛʟʟɮօt")
-    BL_CHAT = set(int(x) for x in os.environ.get("BL_CHAT", "").split())
-    BOT_HANDLER = gvarstat("BOT_HANDLER") or os.environ.get("BOT_HANDLER", "\/")
-    BOT_TOKEN = gvarstat("BOT_TOKEN") or os.environ.get("BOT_TOKEN", None)
-    BOT_USERNAME = gvarstat("BOT_USERNAME") or os.environ.get("BOT_USERNAME", None)
-    BUTTONS_IN_HELP = gvarstat("BUTTONS_IN_HELP") or int(os.environ.get("BUTTONS_IN_HELP", 7))
-    CHATS_TO_MONITOR_FOR_ANTI_FLOOD = []
-    CHROME_BIN = os.environ.get("CHROME_BIN", "/app/.apt/usr/bin/google-chrome")
-    CHROME_DRIVER = os.environ.get("CHROME_DRIVER", "/app/.chromedriver/bin/chromedriver")
-    CUSTOM_PMPERMIT = gvarstat("CUSTOM_PMPERMIT") or os.environ.get("CUSTOM_PMPERMIT", None)
-    DB_URI = os.environ.get("DATABASE_URL", None)
-    DUAL_LOG = os.environ.get("DUAL_LOG", None)
-    EMOJI_IN_HELP = gvarstat("EMOJI_IN_HELP") or os.environ.get("EMOJI_IN_HELP", "🔸")
-    EXTRA = gvarstat("EXTRA") or os.environ.get("EXTRA", None)
-    EXTRA_REPO = gvarstat("EXTRA_REPO") or os.environ.get("EXTRA_REPO", None)
-    FBAN_LOG_GROUP = gvarstat("FBAN_LOG_GROUP") or os.environ.get("FBAN_LOG_GROUP", None)
-    if FBAN_LOG_GROUP:
-        FBAN_LOG_GROUP = int(FBAN_LOG_GROUP)
-    G_DRIVE_CLIENT_ID = os.environ.get("G_DRIVE_CLIENT_ID", None)
-    G_DRIVE_CLIENT_SECRET = os.environ.get("G_DRIVE_CLIENT_SECRET", None)
-    GBAN_LOG_GROUP = os.environ.get("GBAN_LOG_GROUP", None)
-    if GBAN_LOG_GROUP:
-        GBAN_LOG_GROUP = int(GBAN_LOG_GROUP)
-    GDRIVE_FOLDER_ID = os.environ.get("GDRIVE_FOLDER_ID", None)
-    GDRIVE_FOLDER_ID = os.environ.get("GDRIVE_FOLDER_ID", None)
-    GIT_REPO_NAME = os.environ.get("GIT_REPO_NAME", None)
-    GITHUB_ACCESS_TOKEN = os.environ.get("GITHUB_ACCESS_TOKEN", None)
-    GOOGLE_CHROME_BIN = os.environ.get("GOOGLE_CHROME_BIN", "/app/.apt/usr/bin/google-chrome")
-    GROUP_REG_SED_EX_BOT_S = os.environ.get("GROUP_REG_SED_EX_BOT_S", r"(regex|moku|BananaButler_|rgx|l4mR)bot")
-    HANDLER = gvarstat("HANDLER") or os.environ.get("HANDLER", r"\.")
-    HASH_TO_TORRENT_API = os.environ.get("HASH_TO_TORRENT_API", "https://example.com/torrent/{}");
-    HELP_PIC = gvarstat("HELP_PIC") or os.environ.get("HELP_PIC", None)
-    HEROKU_API_KEY = os.environ.get("HEROKU_API_KEY", None)
-    HEROKU_APP_NAME = os.environ.get("HEROKU_APP_NAME", None)
-    INSTANT_BLOCK = gvarstat("INSTANT_BLOCK") or os.environ.get("INSTANT_BLOCK", "DISABLE")
-    LOCATION = os.environ.get("LOCATION", None)
-    LOGGER_ID = gvarstat("LOGGER_ID") or os.environ.get("LOGGER_ID", None)
-    if LOGGER_ID:
-        LOGGER_ID = int(LOGGER_ID)
-    LYDIA_API = os.environ.get("LYDIA_API", None)
-    MAX_ANTI_FLOOD_MESSAGES = 10
-    MAX_MESSAGE_SIZE_LIMIT = 4095
-    MAX_SPAM = gvarstat("MAX_SPAM") or int(os.environ.get("MAX_SPAM", 3))
-    MONGO_URI = os.environ.get("MONGO_URI", None)
-    MY_CHANNEL = gvarstat("YOUR_CHANNEL") or os.environ.get("YOUR_CHANNEL", "Its_HellBot")
-    MY_GROUP = gvarstat("YOUR_GROUP") or os.environ.get("YOUR_GROUP", "HellBot_Chat")
-    OCR_API = gvarstat("OCR_API") or os.environ.get("OCR_API", None)
-    PLUGIN_CHANNEL = gvarstat("PLUGIN_CHANNEL") or os.environ.get("PLUGIN_CHANNEL", None)
-    if PLUGIN_CHANNEL:
-        PLUGIN_CHANNEL = int(PLUGIN_CHANNEL)
-    PM_LOG_ID = gvarstat("PM_LOG_ID") or os.environ.get("PM_LOG_ID", None)
-    if PM_LOG_ID:
-        PM_LOG_ID = int(PM_LOG_ID)
-    PM_PERMIT = gvarstat("PM_PERMIT") or os.environ.get("PM_PERMIT", "ENABLE")
-    PMPERMIT_PIC = gvarstat("PMPERMIT_PIC") or os.environ.get("PMPERMIT_PIC", "https://telegra.ph/file/73e95f4325159336766c0.jpg")
-    REMOVE_BG_API = gvarstat("REMOVE_BG_API") or os.environ.get("REMOVE_BG_API", None)
-    SCREEN_SHOT_LAYER_ACCESS_KEY = os.environ.get("SCREEN_SHOT_LAYER_ACCESS_KEY", None)
-    STICKER_PACKNAME = gvarstat("STICKER_PACKNAME") or os.environ.get("STICKER_PACKNAME", None)
-    HELLBOT_SESSION = gvarstat("HELLBOT_SESSION") or os.environ.get("HELLBOT_SESSION", None)
-    SUDO_HANDLER = gvarstat("SUDO_HANDLER") or os.environ.get("SUDO_HANDLER", r"\.")
-    SUDO_USERS = set(int(x) for x in os.environ.get("SUDO_USERS", "").split())
-    TAG_LOGGER = gvarstat("TAG_LOGGER") or os.environ.get("TAG_LOGGER", None)
-    if TAG_LOGGER: 
-        TAG_LOGGER = int(TAG_LOGGER)
-    TELEGRAPH_SHORT_NAME = os.environ.get("TELEGRAPH_SHORT_NAME", "HellBot")
-    TEMP_DIR = os.environ.get("TEMP_DIR", None)
-    TMP_DOWNLOAD_DIRECTORY = os.environ.get("TMP_DOWNLOAD_DIRECTORY", "./DOWNLOADS/")
-    TZ = gvarstat("TZ") or os.environ.get("TZ", "Asia/Kolkata")
-    UPSTREAM_REPO = os.environ.get("UPSTREAM_REPO", "https://github.com/The-HellBot/HellBot")
-    USE_EVAL = gvarstat("USE_EVAL") or os.environ.get("USE_EVAL", None)
-    WEATHER_API = gvarstat("WEATHER_API") or os.environ.get("WEATHER_API", None)
-    YOUR_NAME = gvarstat("YOUR_NAME") or os.environ.get("YOUR_NAME", None)
-    YOUTUBE_API_KEY = os.environ.get("YOUTUBE_API_KEY", None)
-
-
-class Production(Config):
-    LOGGER = False
-
-
-class Development(Config):
-    LOGGER = True
-
-
-# hellbot

From 191eea8fa93875207faa94ba689bd8fd20a29d21 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 13:32:56 +0530
Subject: [PATCH 22/45] Create hell_config.py

---
 hellbot/config/hell_config.py | 115 ++++++++++++++++++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 hellbot/config/hell_config.py

diff --git a/hellbot/config/hell_config.py b/hellbot/config/hell_config.py
new file mode 100644
index 0000000..bc305e7
--- /dev/null
+++ b/hellbot/config/hell_config.py
@@ -0,0 +1,115 @@
+# IF YOU ARE HOSTING HELLBOT ON OTHER VPS OR LOCALLY RATHER THAN HEROKU
+# THEN DON'T EDIT THIS FILE.
+# GO AND EDIT ex_config.py AND RENAME IT TO config.py
+# AND FILL THE REQUIRED VARS THERE.
+# ONCE AGAIN!! 
+# """DO NOT EDIT THIS FILE"""
+
+import os
+from telethon.tl.types import ChatBannedRights
+from hellbot.sql.gvar_sql import gvarstat
+
+class Config(object):
+    LOGGER = True
+    ABUSE = gvarstat("ABUSE") or os.environ.get("ABUSE", None)
+    ALIVE_MSG = gvarstat("ALIVE_MSG") or os.environ.get("ALIVE_MSG", "⚡ ʟɛɢɛռɖaʀʏ ᴀғ ɦɛʟʟɮօt ⚡")
+    ALIVE_PIC = gvarstat("ALIVE_PIC") or os.environ.get("ALIVE_PIC", "https://telegra.ph/file/f62e50245639f24fd955b.jpg")
+    ANTI_FLOOD_WARN_MODE = ChatBannedRights(
+        until_date=None,
+        view_messages=None,
+        send_messages=True
+    )
+    API_HASH = gvarstat("API_HASH") or os.environ.get("API_HASH", None)
+    APP_ID = gvarstat("APP_ID") or os.environ.get("APP_ID", None)
+    AUTH_TOKEN_DATA = os.environ.get("AUTH_TOKEN_DATA", None)
+    if AUTH_TOKEN_DATA != None:
+        os.makedirs(TMP_DOWNLOAD_DIRECTORY)
+        t_file = open(TMP_DOWNLOAD_DIRECTORY+"auth_token.txt","w")
+        t_file.write(AUTH_TOKEN_DATA)
+        t_file.close()
+    BAN_PIC = gvarstat("BAN_PIC") or os.environ.get("BAN_PIC", None)
+    BAN_TEXT = gvarstat("BAN_TEXT") or os.environ.get("BAN_TEXT", None)
+    BIO_MSG = gvarstat("BIO_MSG") or os.environ.get("BIO_MSG", "ʟɛɢɛռɖaʀʏ ᴀғ ɦɛʟʟɮօt")
+    BL_CHAT = set(int(x) for x in os.environ.get("BL_CHAT", "").split())
+    BOT_HANDLER = gvarstat("BOT_HANDLER") or os.environ.get("BOT_HANDLER", "\/")
+    BOT_TOKEN = gvarstat("BOT_TOKEN") or os.environ.get("BOT_TOKEN", None)
+    BOT_USERNAME = gvarstat("BOT_USERNAME") or os.environ.get("BOT_USERNAME", None)
+    BUTTONS_IN_HELP = gvarstat("BUTTONS_IN_HELP") or int(os.environ.get("BUTTONS_IN_HELP", 7))
+    CHATS_TO_MONITOR_FOR_ANTI_FLOOD = []
+    CHROME_BIN = os.environ.get("CHROME_BIN", "/app/.apt/usr/bin/google-chrome")
+    CHROME_DRIVER = os.environ.get("CHROME_DRIVER", "/app/.chromedriver/bin/chromedriver")
+    CUSTOM_PMPERMIT = gvarstat("CUSTOM_PMPERMIT") or os.environ.get("CUSTOM_PMPERMIT", None)
+    DB_URI = os.environ.get("DATABASE_URL", None)
+    DUAL_LOG = os.environ.get("DUAL_LOG", None)
+    EMOJI_IN_HELP = gvarstat("EMOJI_IN_HELP") or os.environ.get("EMOJI_IN_HELP", "🔸")
+    EXTRA = gvarstat("EXTRA") or os.environ.get("EXTRA", None)
+    EXTRA_REPO = gvarstat("EXTRA_REPO") or os.environ.get("EXTRA_REPO", None)
+    FBAN_LOG_GROUP = gvarstat("FBAN_LOG_GROUP") or os.environ.get("FBAN_LOG_GROUP", None)
+    if FBAN_LOG_GROUP:
+        FBAN_LOG_GROUP = int(FBAN_LOG_GROUP)
+    G_DRIVE_CLIENT_ID = os.environ.get("G_DRIVE_CLIENT_ID", None)
+    G_DRIVE_CLIENT_SECRET = os.environ.get("G_DRIVE_CLIENT_SECRET", None)
+    GBAN_LOG_GROUP = os.environ.get("GBAN_LOG_GROUP", None)
+    if GBAN_LOG_GROUP:
+        GBAN_LOG_GROUP = int(GBAN_LOG_GROUP)
+    GDRIVE_FOLDER_ID = os.environ.get("GDRIVE_FOLDER_ID", None)
+    GDRIVE_FOLDER_ID = os.environ.get("GDRIVE_FOLDER_ID", None)
+    GIT_REPO_NAME = os.environ.get("GIT_REPO_NAME", None)
+    GITHUB_ACCESS_TOKEN = os.environ.get("GITHUB_ACCESS_TOKEN", None)
+    GOOGLE_CHROME_BIN = os.environ.get("GOOGLE_CHROME_BIN", "/app/.apt/usr/bin/google-chrome")
+    GROUP_REG_SED_EX_BOT_S = os.environ.get("GROUP_REG_SED_EX_BOT_S", r"(regex|moku|BananaButler_|rgx|l4mR)bot")
+    HANDLER = gvarstat("HANDLER") or os.environ.get("HANDLER", r"\.")
+    HASH_TO_TORRENT_API = os.environ.get("HASH_TO_TORRENT_API", "https://example.com/torrent/{}");
+    HELP_PIC = gvarstat("HELP_PIC") or os.environ.get("HELP_PIC", None)
+    HEROKU_API_KEY = os.environ.get("HEROKU_API_KEY", None)
+    HEROKU_APP_NAME = os.environ.get("HEROKU_APP_NAME", None)
+    INSTANT_BLOCK = gvarstat("INSTANT_BLOCK") or os.environ.get("INSTANT_BLOCK", "DISABLE")
+    LOCATION = os.environ.get("LOCATION", None)
+    LOGGER_ID = gvarstat("LOGGER_ID") or os.environ.get("LOGGER_ID", None)
+    if LOGGER_ID:
+        LOGGER_ID = int(LOGGER_ID)
+    LYDIA_API = os.environ.get("LYDIA_API", None)
+    MAX_ANTI_FLOOD_MESSAGES = 10
+    MAX_MESSAGE_SIZE_LIMIT = 4095
+    MAX_SPAM = gvarstat("MAX_SPAM") or int(os.environ.get("MAX_SPAM", 3))
+    MONGO_URI = os.environ.get("MONGO_URI", None)
+    MY_CHANNEL = gvarstat("YOUR_CHANNEL") or os.environ.get("YOUR_CHANNEL", "Its_HellBot")
+    MY_GROUP = gvarstat("YOUR_GROUP") or os.environ.get("YOUR_GROUP", "HellBot_Chat")
+    OCR_API = gvarstat("OCR_API") or os.environ.get("OCR_API", None)
+    PLUGIN_CHANNEL = gvarstat("PLUGIN_CHANNEL") or os.environ.get("PLUGIN_CHANNEL", None)
+    if PLUGIN_CHANNEL:
+        PLUGIN_CHANNEL = int(PLUGIN_CHANNEL)
+    PM_LOG_ID = gvarstat("PM_LOG_ID") or os.environ.get("PM_LOG_ID", None)
+    if PM_LOG_ID:
+        PM_LOG_ID = int(PM_LOG_ID)
+    PM_PERMIT = gvarstat("PM_PERMIT") or os.environ.get("PM_PERMIT", "ENABLE")
+    PMPERMIT_PIC = gvarstat("PMPERMIT_PIC") or os.environ.get("PMPERMIT_PIC", "https://telegra.ph/file/73e95f4325159336766c0.jpg")
+    REMOVE_BG_API = gvarstat("REMOVE_BG_API") or os.environ.get("REMOVE_BG_API", None)
+    SCREEN_SHOT_LAYER_ACCESS_KEY = os.environ.get("SCREEN_SHOT_LAYER_ACCESS_KEY", None)
+    STICKER_PACKNAME = gvarstat("STICKER_PACKNAME") or os.environ.get("STICKER_PACKNAME", None)
+    HELLBOT_SESSION = gvarstat("HELLBOT_SESSION") or os.environ.get("HELLBOT_SESSION", None)
+    SUDO_HANDLER = gvarstat("SUDO_HANDLER") or os.environ.get("SUDO_HANDLER", r"\.")
+    SUDO_USERS = set(int(x) for x in os.environ.get("SUDO_USERS", "").split())
+    TAG_LOGGER = gvarstat("TAG_LOGGER") or os.environ.get("TAG_LOGGER", None)
+    if TAG_LOGGER: 
+        TAG_LOGGER = int(TAG_LOGGER)
+    TELEGRAPH_SHORT_NAME = os.environ.get("TELEGRAPH_SHORT_NAME", "HellBot")
+    TEMP_DIR = os.environ.get("TEMP_DIR", None)
+    TMP_DOWNLOAD_DIRECTORY = os.environ.get("TMP_DOWNLOAD_DIRECTORY", "./DOWNLOADS/")
+    TZ = gvarstat("TZ") or os.environ.get("TZ", "Asia/Kolkata")
+    UPSTREAM_REPO = os.environ.get("UPSTREAM_REPO", "https://github.com/The-HellBot/HellBot")
+    USE_EVAL = gvarstat("USE_EVAL") or os.environ.get("USE_EVAL", None)
+    WEATHER_API = gvarstat("WEATHER_API") or os.environ.get("WEATHER_API", None)
+    YOUR_NAME = gvarstat("YOUR_NAME") or os.environ.get("YOUR_NAME", None)
+    YOUTUBE_API_KEY = os.environ.get("YOUTUBE_API_KEY", None)
+
+
+class Production(Config):
+    LOGGER = False
+
+
+class Development(Config):
+    LOGGER = True
+
+
+# hellbot

From d9617d072a3d7e6a4d30767251d8550abc985dd0 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 13:33:22 +0530
Subject: [PATCH 23/45] Update vars.py

---
 hellbot/config/vars.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hellbot/config/vars.py b/hellbot/config/vars.py
index 371f041..8d42459 100644
--- a/hellbot/config/vars.py
+++ b/hellbot/config/vars.py
@@ -6,7 +6,7 @@
 if os.path.exists("config.py"):
     from config import Development as Config
 else:
-    from hell_config import Config
+    from .hell_config import Config
 
 
 # hellbot

From 76104fa8274ae2037d52ea605fa1eed2e9d6f3d5 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 13:35:11 +0530
Subject: [PATCH 24/45] Update __init__.py

---
 hellbot/sql/__init__.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hellbot/sql/__init__.py b/hellbot/sql/__init__.py
index 71a3c08..db04816 100644
--- a/hellbot/sql/__init__.py
+++ b/hellbot/sql/__init__.py
@@ -3,11 +3,12 @@
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker, scoped_session
 
-from hellbot.config import Config
+# from hellbot.config import Config
 
+DB_URI = os.environ.get("DATABASE_URL")
 
 def start() -> scoped_session:
-    engine = create_engine(Config.DB_URI)
+    engine = create_engine(DB_URI)
     BASE.metadata.bind = engine
     BASE.metadata.create_all(engine)
     return scoped_session(sessionmaker(bind=engine, autoflush=False))

From 8cfb72ead22a223a2242ba65a506d2c8cb9e80e0 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 13:38:41 +0530
Subject: [PATCH 25/45] Update cmds.py

---
 hellbot/utils/cmds.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hellbot/utils/cmds.py b/hellbot/utils/cmds.py
index 1e9d3af..47a31e0 100644
--- a/hellbot/utils/cmds.py
+++ b/hellbot/utils/cmds.py
@@ -1,8 +1,8 @@
 import os
 from hellbot import CMD_HELP, CMD_HELP_BOT
+from hellbot.config import Config
 
-HANDLER = os.environ.get("HANDLER", r".")
-
+HANDLER = Config.HANDLER
 
 # Made this class for help menu
 class CmdHelp:

From 0f7151c7642ef1f553a6357b22882db94fefd4de Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 13:52:30 +0530
Subject: [PATCH 26/45] Update __init__.py

---
 hellbot/plugins/__init__.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/hellbot/plugins/__init__.py b/hellbot/plugins/__init__.py
index add3aa0..33e9c26 100644
--- a/hellbot/plugins/__init__.py
+++ b/hellbot/plugins/__init__.py
@@ -17,8 +17,8 @@
 restlo = "./hellbot/resources/pics/rest.jpeg"
 shuru = "./hellbot/resources/pics/shuru.jpg"
 shhh = "./hellbot/resources/pics/chup_madarchod.jpeg"
-hl = gvarstat("HANDLER") or Config.HANDLER
-shl = gvarstat("SUDO_HANDLER") or Config.SUDO_HANDLER
+hl = Config.HANDLER
+shl = Config.SUDO_HANDLER
 hell_ver = __hell__
 tel_ver = version.__version__
 
@@ -29,13 +29,13 @@ async def get_user_id(ids):
         userid = (await bot.get_entity(ids)).id
     return userid
 
-sudos = gvarstat("SUDO_USERS") or Config.SUDO_USERS
+sudos = Config.SUDO_USERS
 if sudos:
     is_sudo = "True"
 else:
     is_sudo = "False"
 
-abus = gvarstat("ABUSE") or Config.ABUSE
+abus = Config.ABUSE
 if abus == "ON":
     abuse_m = "Enabled"
 else:
@@ -43,8 +43,8 @@ async def get_user_id(ids):
 
 START_TIME = datetime.datetime.now()
 uptime = f"{str(datetime.datetime.now() - START_TIME).split('.')[0]}"
-my_channel = gvarstat("MY_CHANNEL") or Config.MY_CHANNEL or "Its_HellBot"
-my_group = gvarstat("MY_GROUP") or Config.MY_GROUP or "HellBot_Chat"
+my_channel = Config.MY_CHANNEL or "Its_HellBot"
+my_group = Config.MY_GROUP or "HellBot_Chat"
 if "@" in my_channel:
     my_channel = my_channel.replace("@", "")
 if "@" in my_group:

From 820b299e0c0f88310c53f7ab025b1ae545d384e6 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 13:58:02 +0530
Subject: [PATCH 27/45] Update sudo.py

---
 hellbot/plugins/sudo.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hellbot/plugins/sudo.py b/hellbot/plugins/sudo.py
index 16f8c00..3121446 100644
--- a/hellbot/plugins/sudo.py
+++ b/hellbot/plugins/sudo.py
@@ -6,17 +6,17 @@
 
 Heroku = heroku3.from_key(Config.HEROKU_API_KEY)
 heroku_api = "https://api.heroku.com"
-sudousers = os.environ.get("SUDO_USERS", None)
+sudousers = Config.SUDO_USERS
 
 
 @bot.on(hell_cmd(pattern="sudo"))
 async def sudo(event):
     sudo = "True" if Config.SUDO_USERS else "False"
-    users = os.environ.get("SUDO_USERS", None)
+    users = sudousers
     if sudo == "True":
-        await eod(event, f"📍 **Sudo :**  `Enabled`\n\n📝 **Sudo users :**  `{users}`", 10)
+        await eor(event, f"📍 **Sudo :**  `Enabled`\n\n📝 **Sudo users :**  `{users}`")
     else:
-        await eod(event, f"📍 **Sudo :**  `Disabled`", 7)
+        await eod(event, f"📍 **Sudo :**  `Disabled`")
 
 
 @bot.on(hell_cmd(pattern="addsudo(?: |$)"))

From 16e73257eacf002eedcc0df1fb629d0198990503 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 14:36:18 +0530
Subject: [PATCH 28/45] Update start.sh

---
 start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/start.sh b/start.sh
index 3ce3fd5..5118bc1 100644
--- a/start.sh
+++ b/start.sh
@@ -11,6 +11,6 @@ echo """
                                 
 """
 rm -rf InVade
-git clone https://github.com/TheVaders/InVade
+git clone -b beta https://github.com/TheVaders/InVade
 cd InVade
 python3 -m hellbot

From abeccedab4c8e012d4eb4f9302bf0f3cea325ea1 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 15:25:34 +0530
Subject: [PATCH 29/45] Update bot.py

---
 hellbot/plugins/bot.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/hellbot/plugins/bot.py b/hellbot/plugins/bot.py
index db8c46a..548f92f 100644
--- a/hellbot/plugins/bot.py
+++ b/hellbot/plugins/bot.py
@@ -20,6 +20,7 @@ async def leave(e):
         else:
             await eod(e, "**Iz this even a grp?😑**")
 
+
 @bot.on(hell_cmd(pattern=r"dc"))
 @bot.on(sudo_cmd(pattern=r"dc", allow_sudo=True))
 async def _(event):
@@ -40,6 +41,16 @@ async def _(event):
     await eor("Config Saved In You Heroku Logs.")
 
 
+@bot.on(hell_cmd(pattern="vars"))
+@bot.on(sudo_cmd(pattern="vars", allow_sudo=True))
+async def lst(event):
+    hell = await eor(event, "Getting configs list...")
+    x = "**List of all available configs are :** \n\n"
+    for i in config_list:
+        x += "`" + i + "`\n"
+    await hell.edit(x)
+
+
 @bot.on(hell_cmd(pattern="schd ?(.*)", outgoing=True))
 @bot.on(sudo_cmd(pattern="schd ?(.*)", allow_sudo=True))
 async def _(event):
@@ -94,6 +105,8 @@ async def _(event):
     "dc", None, "Gets the DataCenter Number"
 ).add_command(
     "config", None, "😒"
+).add_command(
+    "vars", Nond, "Gets the list of all available sql variables."
 ).add_command(
     "kickme", None, "Kicks Yourself from the group."
 ).add_command(

From f17c185330b3c3b4973a36f48020afe26a9df27f Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 15:29:57 +0530
Subject: [PATCH 30/45] Uff

---
 hellbot/plugins/bot.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hellbot/plugins/bot.py b/hellbot/plugins/bot.py
index 548f92f..7de12b9 100644
--- a/hellbot/plugins/bot.py
+++ b/hellbot/plugins/bot.py
@@ -106,7 +106,7 @@ async def _(event):
 ).add_command(
     "config", None, "😒"
 ).add_command(
-    "vars", Nond, "Gets the list of all available sql variables."
+    "vars", None, "Gets the list of all available sql variables."
 ).add_command(
     "kickme", None, "Kicks Yourself from the group."
 ).add_command(

From 02c19bd6fdf230acc9fd70e61f5e36e54c899f48 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 19:27:15 +0530
Subject: [PATCH 31/45] Update config_str.py

---
 hellbot/config/config_str.py | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/hellbot/config/config_str.py b/hellbot/config/config_str.py
index eea945b..c89ddef 100644
--- a/hellbot/config/config_str.py
+++ b/hellbot/config/config_str.py
@@ -1,45 +1,14 @@
 config_list = [
-    "ABUSE",
     "ALIVE_MSG",
     "ALIVE_PIC",
-    "API_HASH",
-    "APP_ID",
     "BAN_PIC",
     "BAN_TEXT",
     "BIO_MSG",
     "BL_CHAT",
-    "BOT_HANDLER",
-    "BOT_TOKEN",
-    "BOT_USERNAME",
     "BUTTONS_IN_HELP",
     "CUSTOM_PMPERMIT",
-    "EMOJI_IN_HELP",
-    "EXTRA",
-    "EXTRA_REPO",
-    "FBAN_LOG_GROUP",
-    "HANDLER",
-    "HELLBOT_SESSION",
     "HELP_PIC",
-    "HEROKU_API_KEY",
-    "HEROKU_APP_NAME",
-    "INSTANT_BLOCK",
-    "LOGGER_ID",
-    "LYDIA_API",
-    "MAX_SPAM",
-    "MY_CHANNEL",
-    "MY_GROUP",
-    "OCR_API",
-    "PLUGIN_CHANNEL",
-    "PM_LOG_ID",
-    "PM_PERMIT",
     "PMPERMIT_PIC",
-    "REMOVE_BG_API",
     "STICKER_PACKNAME",
-    "SUDO_HANDLER",
-    "SUDO_USERS",
-    "TAG_LOGGER",
-    "TZ",
-    "USE_EVAL",
-    "WEATHER_API",
     "YOUR_NAME",
 ]

From 848c09c116806dfbc77eac38a567b9f822f027eb Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 20:27:47 +0530
Subject: [PATCH 32/45] Update hell_config.py

---
 hellbot/config/hell_config.py | 80 +++++++++++++++++------------------
 1 file changed, 38 insertions(+), 42 deletions(-)

diff --git a/hellbot/config/hell_config.py b/hellbot/config/hell_config.py
index bc305e7..66c0ded 100644
--- a/hellbot/config/hell_config.py
+++ b/hellbot/config/hell_config.py
@@ -7,44 +7,43 @@
 
 import os
 from telethon.tl.types import ChatBannedRights
-from hellbot.sql.gvar_sql import gvarstat
 
 class Config(object):
     LOGGER = True
-    ABUSE = gvarstat("ABUSE") or os.environ.get("ABUSE", None)
-    ALIVE_MSG = gvarstat("ALIVE_MSG") or os.environ.get("ALIVE_MSG", "⚡ ʟɛɢɛռɖaʀʏ ᴀғ ɦɛʟʟɮօt ⚡")
-    ALIVE_PIC = gvarstat("ALIVE_PIC") or os.environ.get("ALIVE_PIC", "https://telegra.ph/file/f62e50245639f24fd955b.jpg")
+    ABUSE = os.environ.get("ABUSE", None)
+    ALIVE_MSG = os.environ.get("ALIVE_MSG", "⚡ ʟɛɢɛռɖaʀʏ ᴀғ ɦɛʟʟɮօt ⚡")
+    ALIVE_PIC = os.environ.get("ALIVE_PIC", "https://telegra.ph/file/f62e50245639f24fd955b.jpg")
     ANTI_FLOOD_WARN_MODE = ChatBannedRights(
         until_date=None,
         view_messages=None,
         send_messages=True
     )
-    API_HASH = gvarstat("API_HASH") or os.environ.get("API_HASH", None)
-    APP_ID = gvarstat("APP_ID") or os.environ.get("APP_ID", None)
+    API_HASH = os.environ.get("API_HASH", None)
+    APP_ID = os.environ.get("APP_ID", None)
     AUTH_TOKEN_DATA = os.environ.get("AUTH_TOKEN_DATA", None)
     if AUTH_TOKEN_DATA != None:
         os.makedirs(TMP_DOWNLOAD_DIRECTORY)
         t_file = open(TMP_DOWNLOAD_DIRECTORY+"auth_token.txt","w")
         t_file.write(AUTH_TOKEN_DATA)
         t_file.close()
-    BAN_PIC = gvarstat("BAN_PIC") or os.environ.get("BAN_PIC", None)
-    BAN_TEXT = gvarstat("BAN_TEXT") or os.environ.get("BAN_TEXT", None)
-    BIO_MSG = gvarstat("BIO_MSG") or os.environ.get("BIO_MSG", "ʟɛɢɛռɖaʀʏ ᴀғ ɦɛʟʟɮօt")
+    BAN_PIC = os.environ.get("BAN_PIC", None)
+    BAN_TEXT = os.environ.get("BAN_TEXT", None)
+    BIO_MSG = os.environ.get("BIO_MSG", "ʟɛɢɛռɖaʀʏ ᴀғ ɦɛʟʟɮօt")
     BL_CHAT = set(int(x) for x in os.environ.get("BL_CHAT", "").split())
-    BOT_HANDLER = gvarstat("BOT_HANDLER") or os.environ.get("BOT_HANDLER", "\/")
-    BOT_TOKEN = gvarstat("BOT_TOKEN") or os.environ.get("BOT_TOKEN", None)
-    BOT_USERNAME = gvarstat("BOT_USERNAME") or os.environ.get("BOT_USERNAME", None)
-    BUTTONS_IN_HELP = gvarstat("BUTTONS_IN_HELP") or int(os.environ.get("BUTTONS_IN_HELP", 7))
+    BOT_HANDLER = os.environ.get("BOT_HANDLER", "\/")
+    BOT_TOKEN = os.environ.get("BOT_TOKEN", None)
+    BOT_USERNAME = os.environ.get("BOT_USERNAME", None)
+    BUTTONS_IN_HELP = int(os.environ.get("BUTTONS_IN_HELP", 7))
     CHATS_TO_MONITOR_FOR_ANTI_FLOOD = []
     CHROME_BIN = os.environ.get("CHROME_BIN", "/app/.apt/usr/bin/google-chrome")
     CHROME_DRIVER = os.environ.get("CHROME_DRIVER", "/app/.chromedriver/bin/chromedriver")
-    CUSTOM_PMPERMIT = gvarstat("CUSTOM_PMPERMIT") or os.environ.get("CUSTOM_PMPERMIT", None)
+    CUSTOM_PMPERMIT = os.environ.get("CUSTOM_PMPERMIT", None)
     DB_URI = os.environ.get("DATABASE_URL", None)
     DUAL_LOG = os.environ.get("DUAL_LOG", None)
-    EMOJI_IN_HELP = gvarstat("EMOJI_IN_HELP") or os.environ.get("EMOJI_IN_HELP", "🔸")
-    EXTRA = gvarstat("EXTRA") or os.environ.get("EXTRA", None)
-    EXTRA_REPO = gvarstat("EXTRA_REPO") or os.environ.get("EXTRA_REPO", None)
-    FBAN_LOG_GROUP = gvarstat("FBAN_LOG_GROUP") or os.environ.get("FBAN_LOG_GROUP", None)
+    EMOJI_IN_HELP = os.environ.get("EMOJI_IN_HELP", "🔸")
+    EXTRA = os.environ.get("EXTRA", None)
+    EXTRA_REPO = os.environ.get("EXTRA_REPO", None)
+    FBAN_LOG_GROUP = os.environ.get("FBAN_LOG_GROUP", None)
     if FBAN_LOG_GROUP:
         FBAN_LOG_GROUP = int(FBAN_LOG_GROUP)
     G_DRIVE_CLIENT_ID = os.environ.get("G_DRIVE_CLIENT_ID", None)
@@ -58,49 +57,49 @@ class Config(object):
     GITHUB_ACCESS_TOKEN = os.environ.get("GITHUB_ACCESS_TOKEN", None)
     GOOGLE_CHROME_BIN = os.environ.get("GOOGLE_CHROME_BIN", "/app/.apt/usr/bin/google-chrome")
     GROUP_REG_SED_EX_BOT_S = os.environ.get("GROUP_REG_SED_EX_BOT_S", r"(regex|moku|BananaButler_|rgx|l4mR)bot")
-    HANDLER = gvarstat("HANDLER") or os.environ.get("HANDLER", r"\.")
+    HANDLER = os.environ.get("HANDLER", r"\.")
     HASH_TO_TORRENT_API = os.environ.get("HASH_TO_TORRENT_API", "https://example.com/torrent/{}");
-    HELP_PIC = gvarstat("HELP_PIC") or os.environ.get("HELP_PIC", None)
+    HELP_PIC = os.environ.get("HELP_PIC", None)
     HEROKU_API_KEY = os.environ.get("HEROKU_API_KEY", None)
     HEROKU_APP_NAME = os.environ.get("HEROKU_APP_NAME", None)
-    INSTANT_BLOCK = gvarstat("INSTANT_BLOCK") or os.environ.get("INSTANT_BLOCK", "DISABLE")
+    INSTANT_BLOCK = os.environ.get("INSTANT_BLOCK", "DISABLE")
     LOCATION = os.environ.get("LOCATION", None)
-    LOGGER_ID = gvarstat("LOGGER_ID") or os.environ.get("LOGGER_ID", None)
+    LOGGER_ID = os.environ.get("LOGGER_ID", None)
     if LOGGER_ID:
         LOGGER_ID = int(LOGGER_ID)
     LYDIA_API = os.environ.get("LYDIA_API", None)
     MAX_ANTI_FLOOD_MESSAGES = 10
     MAX_MESSAGE_SIZE_LIMIT = 4095
-    MAX_SPAM = gvarstat("MAX_SPAM") or int(os.environ.get("MAX_SPAM", 3))
+    MAX_SPAM = int(os.environ.get("MAX_SPAM", 3))
     MONGO_URI = os.environ.get("MONGO_URI", None)
-    MY_CHANNEL = gvarstat("YOUR_CHANNEL") or os.environ.get("YOUR_CHANNEL", "Its_HellBot")
-    MY_GROUP = gvarstat("YOUR_GROUP") or os.environ.get("YOUR_GROUP", "HellBot_Chat")
-    OCR_API = gvarstat("OCR_API") or os.environ.get("OCR_API", None)
-    PLUGIN_CHANNEL = gvarstat("PLUGIN_CHANNEL") or os.environ.get("PLUGIN_CHANNEL", None)
+    MY_CHANNEL = os.environ.get("YOUR_CHANNEL", "Its_HellBot")
+    MY_GROUP = os.environ.get("YOUR_GROUP", "HellBot_Chat")
+    OCR_API = os.environ.get("OCR_API", None)
+    PLUGIN_CHANNEL = os.environ.get("PLUGIN_CHANNEL", None)
     if PLUGIN_CHANNEL:
         PLUGIN_CHANNEL = int(PLUGIN_CHANNEL)
-    PM_LOG_ID = gvarstat("PM_LOG_ID") or os.environ.get("PM_LOG_ID", None)
+    PM_LOG_ID = os.environ.get("PM_LOG_ID", None)
     if PM_LOG_ID:
         PM_LOG_ID = int(PM_LOG_ID)
-    PM_PERMIT = gvarstat("PM_PERMIT") or os.environ.get("PM_PERMIT", "ENABLE")
-    PMPERMIT_PIC = gvarstat("PMPERMIT_PIC") or os.environ.get("PMPERMIT_PIC", "https://telegra.ph/file/73e95f4325159336766c0.jpg")
-    REMOVE_BG_API = gvarstat("REMOVE_BG_API") or os.environ.get("REMOVE_BG_API", None)
+    PM_PERMIT = os.environ.get("PM_PERMIT", "ENABLE")
+    PMPERMIT_PIC = os.environ.get("PMPERMIT_PIC", "https://telegra.ph/file/73e95f4325159336766c0.jpg")
+    REMOVE_BG_API = os.environ.get("REMOVE_BG_API", None)
     SCREEN_SHOT_LAYER_ACCESS_KEY = os.environ.get("SCREEN_SHOT_LAYER_ACCESS_KEY", None)
-    STICKER_PACKNAME = gvarstat("STICKER_PACKNAME") or os.environ.get("STICKER_PACKNAME", None)
-    HELLBOT_SESSION = gvarstat("HELLBOT_SESSION") or os.environ.get("HELLBOT_SESSION", None)
-    SUDO_HANDLER = gvarstat("SUDO_HANDLER") or os.environ.get("SUDO_HANDLER", r"\.")
+    STICKER_PACKNAME = os.environ.get("STICKER_PACKNAME", None)
+    HELLBOT_SESSION = os.environ.get("HELLBOT_SESSION", None)
+    SUDO_HANDLER = os.environ.get("SUDO_HANDLER", r"\.")
     SUDO_USERS = set(int(x) for x in os.environ.get("SUDO_USERS", "").split())
-    TAG_LOGGER = gvarstat("TAG_LOGGER") or os.environ.get("TAG_LOGGER", None)
+    TAG_LOGGER = os.environ.get("TAG_LOGGER", None)
     if TAG_LOGGER: 
         TAG_LOGGER = int(TAG_LOGGER)
     TELEGRAPH_SHORT_NAME = os.environ.get("TELEGRAPH_SHORT_NAME", "HellBot")
     TEMP_DIR = os.environ.get("TEMP_DIR", None)
     TMP_DOWNLOAD_DIRECTORY = os.environ.get("TMP_DOWNLOAD_DIRECTORY", "./DOWNLOADS/")
-    TZ = gvarstat("TZ") or os.environ.get("TZ", "Asia/Kolkata")
+    TZ = os.environ.get("TZ", "Asia/Kolkata")
     UPSTREAM_REPO = os.environ.get("UPSTREAM_REPO", "https://github.com/The-HellBot/HellBot")
-    USE_EVAL = gvarstat("USE_EVAL") or os.environ.get("USE_EVAL", None)
-    WEATHER_API = gvarstat("WEATHER_API") or os.environ.get("WEATHER_API", None)
-    YOUR_NAME = gvarstat("YOUR_NAME") or os.environ.get("YOUR_NAME", None)
+    USE_EVAL = os.environ.get("USE_EVAL", None)
+    WEATHER_API = os.environ.get("WEATHER_API", None)
+    YOUR_NAME = os.environ.get("YOUR_NAME", None)
     YOUTUBE_API_KEY = os.environ.get("YOUTUBE_API_KEY", None)
 
 
@@ -110,6 +109,3 @@ class Production(Config):
 
 class Development(Config):
     LOGGER = True
-
-
-# hellbot

From 6a6f37c4dd95e8ab6bd3fbb8304e41a018657721 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 20:34:38 +0530
Subject: [PATCH 33/45] Update gcast.py

---
 hellbot/plugins/gcast.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hellbot/plugins/gcast.py b/hellbot/plugins/gcast.py
index 37ab7ac..827ccc5 100644
--- a/hellbot/plugins/gcast.py
+++ b/hellbot/plugins/gcast.py
@@ -42,10 +42,10 @@ async def _(event):
                 chat = ghell.id
                 hell = OwO.replace("-grp", "")
                 try:
-                    if chat != 1001496036895:
+                    if chat != -1001496036895:
                         await bot.send_message(chat, hell)
                         owo += 1
-                    elif chat == 1001496036895:
+                    elif chat == -1001496036895:
                         pass
                 except BaseException:
                     sed += 1

From 9c6abaea78830d280104064bd465027d02b3d7e4 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 20:39:52 +0530
Subject: [PATCH 34/45] Update heroku.py

---
 hellbot/plugins/heroku.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hellbot/plugins/heroku.py b/hellbot/plugins/heroku.py
index 170ba64..2dcd6d9 100644
--- a/hellbot/plugins/heroku.py
+++ b/hellbot/plugins/heroku.py
@@ -79,7 +79,7 @@ async def sett(event):
     hel_ = event.pattern_match.group(1)
     var_ = hel_.split(" ")[0].upper()
     val_ = hel_.split(" ")[1:]
-    valu = " ".join (val_)
+    valu = " ".join(val_)
     hell = await eor(event, f"**Setting variable** `{var_}` **as** `{valu}`")
     if var_ == "":
         return await hell.edit(f"**Invalid Syntax !!** \n\nTry: `{hl}svar VARIABLE_NAME variable_value`")

From bd10b700f0f4e8caab195e4777f50139784be6e2 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Tue, 31 Aug 2021 20:53:20 +0530
Subject: [PATCH 35/45] Update protecc.py

---
 hellbot/plugins/protecc.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/hellbot/plugins/protecc.py b/hellbot/plugins/protecc.py
index eb74449..0dbd735 100644
--- a/hellbot/plugins/protecc.py
+++ b/hellbot/plugins/protecc.py
@@ -189,6 +189,18 @@ async def _(event):
     await eod(event, f"**Removed Chat** {event.chat.title} **With Id** `{event.chat_id}` **From AutoWaifu Database.**")
 
 
+@bot.on(hell_cmd(pattern="aw$"))
+@bot.on(sudo_cmd(pattern="aw$", allow_sudo=True))
+async def _(event):
+    hell = await eor(event, "Fetching Autowaifu chats...")
+    all_grp = get_all_grp()
+    x = "**Autowaifu enabled chats :** \n\n"
+    for i in all_grp:
+        ch = i.chat_id
+        cht = int(ch)
+        x += f"• `{cht}`\n"
+    await hell.edit(x)
+
 
 CmdHelp("protecc").add_command(
   "pt", "<reply>", "Auto Protecc the waifu."
@@ -196,6 +208,8 @@ async def _(event):
   "adwaifu", None, "Adds the current group to AutoWaifu Database. Need to setup WAIFU_CATCHER var with value TRUE."
 ).add_command(
   "rmwaifu", None, "Removes the group from AutoWaifu Database."
+).add_command(
+  "aw", None, "Gives the list of all chats with Autowaifu enabled."
 ).add_info(
   "Waifu Protecc."
 ).add_warning(

From 92708db2d099de17dd1739ad43350e6097a326aa Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Wed, 1 Sep 2021 08:55:04 +0530
Subject: [PATCH 36/45] Update __init__.py

---
 hellbot/__init__.py | 65 ++++++++++++++++++++++++---------------------
 1 file changed, 34 insertions(+), 31 deletions(-)

diff --git a/hellbot/__init__.py b/hellbot/__init__.py
index bcf77fe..7da1fe9 100644
--- a/hellbot/__init__.py
+++ b/hellbot/__init__.py
@@ -1,22 +1,21 @@
 import os
 import sys
 import time
-import datetime
+
 from distutils.util import strtobool as sb
 from logging import DEBUG, INFO, basicConfig, getLogger
 
-import heroku3
-from dotenv import load_dotenv
-from requests import get
 from telethon import TelegramClient
+from telethon.network.connection.tcpabridged import ConnectionTcpAbridged
 from telethon.sessions import StringSession
 
 from hellbot.config import Config
 
-StartTime = datetime.datetime.now()
 
+StartTime = time.time()
 CONSOLE_LOGGER_VERBOSE = sb(os.environ.get("CONSOLE_LOGGER_VERBOSE", "False"))
 
+
 if CONSOLE_LOGGER_VERBOSE:
     basicConfig(
         format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
@@ -25,39 +24,43 @@
 else:
     basicConfig(format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
                 level=INFO)
-LOGS = getLogger(__name__)
 
 
-try:
-    if Config.HEROKU_API_KEY is not None or Config.HEROKU_APP_NAME is not None:
-        HEROKU_APP = heroku3.from_key(Config.HEROKU_API_KEY).apps()[
-            Config.HEROKU_APP_NAME
-        ]
-    else:
-        HEROKU_APP = None
-except Exception:
-    HEROKU_APP = None
+LOGS = getLogger(__name__)
 
 
 if Config.HELLBOT_SESSION:
-    session_name = str(Config.HELLBOT_SESSION)
-    try:
-        if session_name.endswith("="):
-            bot = TelegramClient(
-                StringSession(session_name), Config.APP_ID, Config.API_HASH
-            )
-        else:
-            bot = TelegramClient(
-                "BOT_TOKEN", api_id=Config.APP_ID, api_hash=Config.API_HASH
-            ).start(bot_token=Config.HELLBOT_SESSION)
-    except Exception as e:
-        LOGS.warn(f"HELLBOT_SESSION - {str(e)}")
-        sys.exit()
+    session = StringSession(str(Config.HELLBOT_SESSION))
 else:
-    session_name = "startup"
-    bot = TelegramClient(session_name, Config.APP_ID, Config.API_HASH)
+    session = "hellbot"
+
+
+try:
+    ForGo10 = TelegramClient(
+        session=session,
+        api_id=Config.APP_ID,
+        api_hash=Config.API_HASH,
+        connection=ConnectionTcpAbridged,
+        auto_reconnect=True,
+        connection_retries=None,
+    )
+except Exception as e:
+    print(f"HELLBOT_SESSION - {e}")
+    sys.exit()
+
+
+ForGo10.tbot = TelegramClient(
+    session="Hell-TBot",
+    api_id=Config.APP_ID,
+    api_hash=Config.API_HASH,
+    connection=ConnectionTcpAbridged,
+    auto_reconnect=True,
+    connection_retries=None,
+).start(bot_token=Config.BOT_TOKEN)
+
 
-tbot = TelegramClient('hellbot', api_id=Config.APP_ID, api_hash=Config.API_HASH).start(bot_token=Config.BOT_TOKEN)
+bot = ForGo10
+tbot = ForGo10.tbot
 
 
 # global variables

From 0eb9f4fc8bb707a3164d831f4ee180e5b9ec32b2 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Wed, 1 Sep 2021 09:18:37 +0530
Subject: [PATCH 37/45] Update __init__.py

---
 hellbot/__init__.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/hellbot/__init__.py b/hellbot/__init__.py
index 7da1fe9..608b3ae 100644
--- a/hellbot/__init__.py
+++ b/hellbot/__init__.py
@@ -1,3 +1,4 @@
+import heroku3
 import os
 import sys
 import time
@@ -63,6 +64,17 @@
 tbot = ForGo10.tbot
 
 
+try:
+    if Config.HEROKU_API_KEY is not None or Config.HEROKU_APP_NAME is not None:
+        HEROKU_APP = heroku3.from_key(Config.HEROKU_API_KEY).apps()[
+            Config.HEROKU_APP_NAME
+        ]
+    else:
+        HEROKU_APP = None
+except Exception:
+    HEROKU_APP = None
+
+
 # global variables
 CMD_LIST = {}
 CMD_HELP = {}

From 0c8e6f758857ac07ac00e60baf51051d7ffb8d43 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Wed, 1 Sep 2021 09:20:05 +0530
Subject: [PATCH 38/45] Update __init__.py

---
 hellbot/plugins/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hellbot/plugins/__init__.py b/hellbot/plugins/__init__.py
index 33e9c26..0c70f08 100644
--- a/hellbot/plugins/__init__.py
+++ b/hellbot/plugins/__init__.py
@@ -41,8 +41,8 @@ async def get_user_id(ids):
 else:
     abuse_m ="Disabled"
 
-START_TIME = datetime.datetime.now()
-uptime = f"{str(datetime.datetime.now() - START_TIME).split('.')[0]}"
+START_TIME = time.time()
+uptime = f"{str(time.time() - START_TIME).split('.')[0]}"
 my_channel = Config.MY_CHANNEL or "Its_HellBot"
 my_group = Config.MY_GROUP or "HellBot_Chat"
 if "@" in my_channel:

From 72e1755fdcf7fa7087cb833187d4c6b5abc07981 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Wed, 1 Sep 2021 09:20:29 +0530
Subject: [PATCH 39/45] Update __init__.py

---
 hellbot/plugins/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hellbot/plugins/__init__.py b/hellbot/plugins/__init__.py
index 0c70f08..58f6700 100644
--- a/hellbot/plugins/__init__.py
+++ b/hellbot/plugins/__init__.py
@@ -1,4 +1,6 @@
 import datetime
+import time
+
 from hellbot import *
 from hellbot.config import Config
 from hellbot.helpers import *

From 1105de6c9ac28adb56155e752bf0cacab800907f Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Wed, 1 Sep 2021 09:35:13 +0530
Subject: [PATCH 40/45] Update convert.py

---
 hellbot/helpers/convert.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/hellbot/helpers/convert.py b/hellbot/helpers/convert.py
index d57b358..9fba634 100644
--- a/hellbot/helpers/convert.py
+++ b/hellbot/helpers/convert.py
@@ -143,4 +143,26 @@ def deEmojify(inputString: str) -> str:
     return re.sub(EMOJI_PATTERN, "", inputString)
 
 
+async def get_time(seconds: int) -> str:
+    count = 0
+    up_time = ""
+    time_list = []
+    time_suffix_list = ["s", "m", "h", "days"]
+    while count < 4:
+        count += 1
+        remainder, result = divmod(seconds, 60) if count < 3 else divmod(seconds, 24)
+        if seconds == 0 and remainder == 0:
+            break
+        time_list.append(int(result))
+        seconds = int(remainder)
+    hmm = len(time_list)
+    for x in range(hmm):
+        time_list[x] = str(time_list[x]) + time_suffix_list[x]
+    if len(time_list) == 4:
+        up_time += time_list.pop() + ", "
+    time_list.reverse()
+    up_time += ":".join(time_list)
+    return up_time
+
+
 # hellbot

From 8a4bc90271d3b8c1deef234cf6e7e8e8667fc2c8 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Wed, 1 Sep 2021 09:36:14 +0530
Subject: [PATCH 41/45] Update __init__.py

---
 hellbot/plugins/__init__.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/hellbot/plugins/__init__.py b/hellbot/plugins/__init__.py
index 58f6700..98535bf 100644
--- a/hellbot/plugins/__init__.py
+++ b/hellbot/plugins/__init__.py
@@ -43,8 +43,7 @@ async def get_user_id(ids):
 else:
     abuse_m ="Disabled"
 
-START_TIME = time.time()
-uptime = f"{str(time.time() - START_TIME).split('.')[0]}"
+
 my_channel = Config.MY_CHANNEL or "Its_HellBot"
 my_group = Config.MY_GROUP or "HellBot_Chat"
 if "@" in my_channel:

From b608d43eaa4bad8a0520fd2669e2b814ff3ac7ad Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Wed, 1 Sep 2021 15:04:02 +0530
Subject: [PATCH 42/45] Update __init__.py

---
 hellbot/__init__.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/hellbot/__init__.py b/hellbot/__init__.py
index 608b3ae..2fe3ee8 100644
--- a/hellbot/__init__.py
+++ b/hellbot/__init__.py
@@ -37,7 +37,7 @@
 
 
 try:
-    ForGo10 = TelegramClient(
+    bot = TelegramClient(
         session=session,
         api_id=Config.APP_ID,
         api_hash=Config.API_HASH,
@@ -50,7 +50,7 @@
     sys.exit()
 
 
-ForGo10.tbot = TelegramClient(
+tbot = TelegramClient(
     session="Hell-TBot",
     api_id=Config.APP_ID,
     api_hash=Config.API_HASH,
@@ -60,10 +60,6 @@
 ).start(bot_token=Config.BOT_TOKEN)
 
 
-bot = ForGo10
-tbot = ForGo10.tbot
-
-
 try:
     if Config.HEROKU_API_KEY is not None or Config.HEROKU_APP_NAME is not None:
         HEROKU_APP = heroku3.from_key(Config.HEROKU_API_KEY).apps()[

From 17177ac21ca9bdeefbedd3602ad0ac4af707685b Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Wed, 1 Sep 2021 15:07:14 +0530
Subject: [PATCH 43/45] Update __init__.py

---
 hellbot/__init__.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/hellbot/__init__.py b/hellbot/__init__.py
index 2fe3ee8..7cdf03a 100644
--- a/hellbot/__init__.py
+++ b/hellbot/__init__.py
@@ -37,7 +37,7 @@
 
 
 try:
-    bot = TelegramClient(
+    Hell = TelegramClient(
         session=session,
         api_id=Config.APP_ID,
         api_hash=Config.API_HASH,
@@ -50,7 +50,7 @@
     sys.exit()
 
 
-tbot = TelegramClient(
+HellBot = TelegramClient(
     session="Hell-TBot",
     api_id=Config.APP_ID,
     api_hash=Config.API_HASH,
@@ -60,6 +60,9 @@
 ).start(bot_token=Config.BOT_TOKEN)
 
 
+bot = Hell
+tbot = HellBot
+
 try:
     if Config.HEROKU_API_KEY is not None or Config.HEROKU_APP_NAME is not None:
         HEROKU_APP = heroku3.from_key(Config.HEROKU_API_KEY).apps()[

From 972a232526e285bd834740204fe64b102419fdfb Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Wed, 1 Sep 2021 15:13:12 +0530
Subject: [PATCH 44/45] Update plug.py

---
 hellbot/utils/plug.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/hellbot/utils/plug.py b/hellbot/utils/plug.py
index a1a3b00..864baf0 100644
--- a/hellbot/utils/plug.py
+++ b/hellbot/utils/plug.py
@@ -51,26 +51,30 @@ def load_module(shortname):
         name = "hellbot.plugins.{}".format(shortname)
         spec = importlib.util.spec_from_file_location(name, path)
         mod = importlib.util.module_from_spec(spec)
-        mod.bot = bot
+        mod.bot = Hell
+        mod.HellBot = HellBot
+        mod.tbot = HellBot
+        mod.Hell = Hell
         mod.tgbot = bot.tgbot
         mod.command = command
         mod.logger = logging.getLogger(shortname)
         # support for uniborg
-        sys.modules["uniborg.util"] = hellbot.utils
+        sys.modules["uniborg.util"] = hellbot.plugins
         mod.Config = Config
-        mod.borg = bot
-        mod.hellbot = bot
+        mod.borg = Hell
+        mod.hellbot = Hell
         mod.edit_or_reply = edit_or_reply
         mod.eor = edit_or_reply
         mod.delete_hell = delete_hell
         mod.eod = delete_hell
         mod.Var = Config
         mod.admin_cmd = hell_cmd
+        mod.hell_cmd = hell_cmd
         # support for other userbots
-        sys.modules["userbot.utils"] = hellbot.utils
-        sys.modules["userbot"] = hellbot
+        sys.modules["userbot.utils"] = hellbot.plugins
+        sys.modules["userbot"] = hellbot.plugins
         # support for paperplaneextended
-        sys.modules["userbot.events"] = hellbot
+        sys.modules["userbot.events"] = hellbot.plugins
         spec.loader.exec_module(mod)
         # for imports
         sys.modules["hellbot.plugins." + shortname] = mod

From 174c149b4f13fb69f4b0a1a03aea27873df53278 Mon Sep 17 00:00:00 2001
From: HellBoy-OP <72251918+HellBoy-OP@users.noreply.github.com>
Date: Wed, 1 Sep 2021 15:17:21 +0530
Subject: [PATCH 45/45] Update plug.py

---
 hellbot/utils/plug.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hellbot/utils/plug.py b/hellbot/utils/plug.py
index 864baf0..39057da 100644
--- a/hellbot/utils/plug.py
+++ b/hellbot/utils/plug.py
@@ -59,7 +59,7 @@ def load_module(shortname):
         mod.command = command
         mod.logger = logging.getLogger(shortname)
         # support for uniborg
-        sys.modules["uniborg.util"] = hellbot.plugins
+        sys.modules["uniborg.util"] = hellbot.utils
         mod.Config = Config
         mod.borg = Hell
         mod.hellbot = Hell
@@ -71,10 +71,10 @@ def load_module(shortname):
         mod.admin_cmd = hell_cmd
         mod.hell_cmd = hell_cmd
         # support for other userbots
-        sys.modules["userbot.utils"] = hellbot.plugins
-        sys.modules["userbot"] = hellbot.plugins
+        sys.modules["userbot.utils"] = hellbot.utils
+        sys.modules["userbot"] = hellbot
         # support for paperplaneextended
-        sys.modules["userbot.events"] = hellbot.plugins
+        sys.modules["userbot.events"] = hellbot
         spec.loader.exec_module(mod)
         # for imports
         sys.modules["hellbot.plugins." + shortname] = mod