v1.3.3 🛃 User Sess & Bug Hunting

* Fixed Memory Usage for Screenshots using Semaphore * Added a Maximum Screenshots Limit * Caption Fillings are not Case Insentive, but should be put in {} * \{ & \} Added in Caption for Curly Brackets * (New) User StringSession (Pyro) to Download Content from Private / Restricted Areas using their Session NOTE: Also Added Fernet Encryption to Protect your Privacy, No One can gain Access to your USess... * Major Bug Fixes and Reafactor * Removed UPTOBOX * Added New Domains: filepress * Added JioDrive by Maverick * Daily Leech Limit Fixed * Fixed ytdlp or Sync with Base Repo * UPCOMING: Tg List, Tg Link Multiplier, Resume Tasks after Restart ... more... ~ MysterySD & Karan --------- Co-authored-by: Karan Adhikari <[email protected]>
qthang · Oct 3, 2023 · 56b9917 · 56b9917
1 parent 97bd342
commit 56b9917
Show file tree

Hide file tree

Showing 32 changed files with 551 additions and 362 deletions.
diff --git a/README.md b/README.md
@@ -206,7 +206,7 @@
 - Extract these filetypes
   > ZIP, RAR, TAR, 7z, ISO, WIM, CAB, GZIP, BZIP2, APM, ARJ, CHM, CPIO, CramFS, DEB, DMG, FAT, HFS, LZH, LZMA, LZMA2, MBR, MSI, MSLZ, NSIS, NTFS, RPM, SquashFS, UDF, VHD, XAR, Z, TAR.XZ
 - Direct links Supported:
-  > mediafire(folder), letsupload.io, hxfile.co, antfiles, fembed.com, fembed.net, femax20.com, layarkacaxxi.icu, fcdn.stream, sbplay.org, naniplay.com, naniplay.nanime.in, naniplay.nanime.biz, sbembed.com, streamtape.com, streamsb.net, feurl.com, upload.ee, pixeldrain.com, racaty.net, 1fichier.com, 1drv.ms (Only works for file not folder or business account), uptobox.com and solidfiles.com, linkbox.to, shrdsk.me (sharedisk.io), akmfiles.com, wetransfer.com, mdisk.me (with ytdl), gofile.io(folder), filelion, terabox.com (you need to add cookies txt with name) [terabox.txt](https://github.com/ytdl-org/youtube-dl#how-do-i-pass-cookies-to-youtube-dl) and almost every anonfiles based sites
+  > mediafire(folder), letsupload.io, hxfile.co, antfiles, fembed.com, fembed.net, femax20.com, layarkacaxxi.icu, fcdn.stream, sbplay.org, naniplay.com, naniplay.nanime.in, naniplay.nanime.biz, sbembed.com, streamtape.com, streamsb.net, feurl.com, upload.ee, pixeldrain.com, racaty.net, 1fichier.com, 1drv.ms (Only works for file not folder or business account), uptobox.com and solidfiles.com, streamvid.net, linkbox.to, shrdsk.me (sharedisk.io), akmfiles.com, wetransfer.com, mdisk.me (with ytdl), gofile.io(folder), filelion, terabox.com (you need to add cookies txt with name) [terabox.txt](https://github.com/ytdl-org/youtube-dl#how-do-i-pass-cookies-to-youtube-dl) and almost every anonfiles based sites
 
 </details>
 
@@ -478,7 +478,7 @@ help - All cmds with description
     - `DEBRID_LINK_API` : Api of `debrid-link.com`. Support the Premium `Bypass Download limit`.
     - `FILELION_API`: Api of `filelions.com` to download the link from the filelion site
     - `GDTOT_CRYPT`: Use Gdtot crpyt to bypass the GDTOT links.
-    - `UPTOBOX_TOKEN`: Uptobox token to mirror uptobox links. Get it from [Uptobox Premium Account](https://uptobox.com/my_account). `str`
+    - `JIODRIVE_TOKEN`: Use Jiodrive Token to bypass the jiodrive links.
     </details></li>
 
     <li><details>

diff --git a/bot/__init__.py b/bot/__init__.py
@@ -226,15 +226,15 @@ def changetz(*args):
     log_warning('MEGA Credentials not provided!')
     MEGA_EMAIL = ''
     MEGA_PASSWORD = ''
-
-UPTOBOX_TOKEN = environ.get('UPTOBOX_TOKEN', '')
-if len(UPTOBOX_TOKEN) == 0:
-    UPTOBOX_TOKEN = ''
 
 GDTOT_CRYPT = environ.get('GDTOT_CRYPT', '')
 if len(GDTOT_CRYPT) == 0:
     GDTOT_CRYPT = ''
 
+JIODRIVE_TOKEN = environ.get('JIODRIVE_TOKEN', '')
+if len(JIODRIVE_TOKEN) == 0:
+    JIODRIVE_TOKEN = ''
+
 REAL_DEBRID_API = environ.get('REAL_DEBRID_API', '')
 if len(REAL_DEBRID_API) == 0:
     REAL_DEBRID_API = ''
@@ -635,6 +635,7 @@ def changetz(*args):
                'TIMEZONE': TIMEZONE,
                'GD_INFO': GD_INFO,
                'GDTOT_CRYPT': GDTOT_CRYPT,
+               'JIODRIVE_TOKEN': JIODRIVE_TOKEN,
                'EQUAL_SPLITS': EQUAL_SPLITS,
                'EXTENSION_FILTER': EXTENSION_FILTER,
                'GDRIVE_ID': GDRIVE_ID,
@@ -688,7 +689,6 @@ def changetz(*args):
                'UPSTREAM_REPO': UPSTREAM_REPO,
                'UPSTREAM_BRANCH': UPSTREAM_BRANCH,
                'UPGRADE_PACKAGES': UPGRADE_PACKAGES,
-               'UPTOBOX_TOKEN': UPTOBOX_TOKEN,
                'USER_SESSION_STRING': USER_SESSION_STRING,
                'USER_TD_MODE':USER_TD_MODE,
                'USER_TD_SA': USER_TD_SA,

diff --git a/bot/__main__.py b/bot/__main__.py
@@ -217,25 +217,28 @@ async def log_check():
         for chat_id in config_dict['LEECH_LOG_ID'].split():
             chat_id, *topic_id = chat_id.split(":")
             try:
-                chat = await bot.get_chat(int(chat_id))
-            except Exception:
-                LOGGER.error(f"Not Connected Chat ID : {chat_id}, Make sure the Bot is Added!")
-                continue
-            if chat.type == ChatType.CHANNEL:
-                if not (await chat.get_member(bot.me.id)).privileges.can_post_messages:
-                    LOGGER.error(f"Not Connected Chat ID : {chat_id}, Make the Bot is Admin in Channel to Connect!")
+                try:
+                    chat = await bot.get_chat(int(chat_id))
+                except Exception:
+                    LOGGER.error(f"Not Connected Chat ID : {chat_id}, Make sure the Bot is Added!")
                     continue
-                if user and not (await chat.get_member(user.me.id)).privileges.can_post_messages:
-                    LOGGER.error(f"Not Connected Chat ID : {chat_id}, Make the User is Admin in Channel to Connect!")
-                    continue
-            elif chat.type == ChatType.SUPERGROUP:
-                if not (await chat.get_member(bot.me.id)).status in [ChatMemberStatus.OWNER, ChatMemberStatus.ADMINISTRATOR]:
-                    LOGGER.error(f"Not Connected Chat ID : {chat_id}, Make the Bot is Admin in Group to Connect!")
-                    continue
-                if user and not (await chat.get_member(user.me.id)).status in [ChatMemberStatus.OWNER, ChatMemberStatus.ADMINISTRATOR]:
-                    LOGGER.error(f"Not Connected Chat ID : {chat_id}, Make the User is Admin in Group to Connect!")
-                    continue
-            LOGGER.info(f"Connected Chat ID : {chat_id}")
+                if chat.type == ChatType.CHANNEL:
+                    if not (await chat.get_member(bot.me.id)).privileges.can_post_messages:
+                        LOGGER.error(f"Not Connected Chat ID : {chat_id}, Make the Bot is Admin in Channel to Connect!")
+                        continue
+                    if user and not (await chat.get_member(user.me.id)).privileges.can_post_messages:
+                        LOGGER.error(f"Not Connected Chat ID : {chat_id}, Make the User is Admin in Channel to Connect!")
+                        continue
+                elif chat.type == ChatType.SUPERGROUP:
+                    if not (await chat.get_member(bot.me.id)).status in [ChatMemberStatus.OWNER, ChatMemberStatus.ADMINISTRATOR]:
+                        LOGGER.error(f"Not Connected Chat ID : {chat_id}, Make the Bot is Admin in Group to Connect!")
+                        continue
+                    if user and not (await chat.get_member(user.me.id)).status in [ChatMemberStatus.OWNER, ChatMemberStatus.ADMINISTRATOR]:
+                        LOGGER.error(f"Not Connected Chat ID : {chat_id}, Make the User is Admin in Group to Connect!")
+                        continue
+                LOGGER.info(f"Connected Chat ID : {chat_id}")
+            except Exception as e:
+                LOGGER.error(f"Not Connected Chat ID : {chat_id}, ERROR: {e}")
 
 
 async def main():

diff --git a/bot/helper/ext_utils/__init__.py b/bot/helper/ext_utils/__init__.py
@@ -1 +0,0 @@
-