Changes in Database

FileStream/Tools/progress.py

@@ -42,9 +42,6 @@ from FileStream.utils.FileProcessors.human_readable import humanbytes
 from FileStream.utils.FileProcessors.file_properties import get_file_ids,get_file_info
 
 
-
-
-
 async def progress(current, total, progress_args):
   progress_text = LANG.BASIC_PRIV_FILE.format(
       progress_args[1], humanbytes(progress_args[2]))

FileStream/__main__.py

@@ -48,6 +48,7 @@ async def start_services():
     FileStream.id = bot_info.id
     FileStream.username = bot_info.username
     FileStream.fname = bot_info.first_name
+    await FileStream.get_users(Telegram.DATA_SOURCES + [Telegram.FLOG_CHANNEL])
     print("------------------------------ DONE ------------------------------\n")
 
     print("---------------------- Initializing Clients ----------------------")

FileStream/bot/plugins/FileHandlers/callback.py

@@ -109,12 +109,12 @@ async def cb_data(bot: Client, update: CallbackQuery):
 
   elif usr_cmd[0] == "mainstream":
     _id = usr_cmd[1]
-    reply_markup, stream_text = await gen_link(_id=_id)
+    response = await gen_link(_id=_id)
     await update.message.edit_text(
-        text=stream_text,
+        text=response["stream_text"],
         parse_mode=ParseMode.HTML,
         disable_web_page_preview=True,
-        reply_markup=reply_markup,
+        reply_markup=response["reply_markup"],
     )
 
   elif usr_cmd[0] == "pubup":
@@ -164,10 +164,10 @@ async def cb_data(bot: Client, update: CallbackQuery):
       await db.update_privacy(file_info)
       reply_markup, stream_text = await gen_link(_id=inserted_id)
       await update.message.edit_text(
-          text=stream_text,
+          text=response["stream_text"],
           parse_mode=ParseMode.HTML,
           disable_web_page_preview=True,
-          reply_markup=reply_markup,
+          reply_markup=response["reply_markup"],
       )    
     except FloodWait as e:
       print(f"Sleeping for {str(e.value)}s")
@@ -227,12 +227,12 @@ async def cb_data(bot: Client, update: CallbackQuery):
       #All the Time Get_file_ids should be called before update privacy or else tagged_users will be {}
       print(file_info)
       await db.update_privacy(file_info)
-      reply_markup, stream_text = await gen_link(_id=inserted_id)
+      response = await gen_link(_id=inserted_id)
       await update.message.edit_text(
-          text=stream_text,
+          text=response["stream_text"],
           parse_mode=ParseMode.HTML,
           disable_web_page_preview=True,
-          reply_markup=reply_markup,
+          reply_markup=response["reply_markup"],
       )    
     except FloodWait as e:
       print(f"Sleeping for {str(e.value)}s")

FileStream/bot/plugins/FileHandlers/stream.py

@@ -75,12 +75,19 @@ async def private_receive_handler(bot: Client, message: Message):
         reply = await message.reply_text(LANG.PROCESSING_TEXT)
         file_info=get_file_info(message, instruction)
         #This Will give a option to Public Private and temporary Upload
-        reply_markup, stream_text = await upload_type_func(get_file_info(message, instruction),reply)
-        await reply.edit_text(text=stream_text,
+        response = await upload_type_func(get_file_info(message, instruction),reply)
+        if response["type"]=="ExistingFile":
+            reply.reply_photo(text=response["stream_text"],
                               parse_mode=ParseMode.HTML,
                               disable_web_page_preview=True,
-                              reply_markup=reply_markup,
-                            )
+                              reply_markup= response["reply_markup"],
+            )
+        else:
+            await reply.edit_text(text=response["stream_text"],
+                                parse_mode=ParseMode.HTML,
+                                disable_web_page_preview=True,
+                                reply_markup= response["reply_markup"],
+                                )
     except FloodWait as e:
         print(f"Sleeping for {str(e.value)}s")
         
@@ -102,15 +109,14 @@ async def channel_receive_handler(bot: Client, message: Message):
     try:
         inserted_id = await db.add_file(file_info=get_file_info(message),  db_type="TEMPORARY")
         await get_file_ids(False, inserted_id, MULTI_CLIENTS, message)
-        reply_markup, stream_link = await gen_link(_id=inserted_id)
+        response = await gen_link(_id=inserted_id)
         await bot.edit_message_reply_markup(
             chat_id=message.chat.id,
             message_id=message.id,
             reply_markup=InlineKeyboardMarkup([[
                 InlineKeyboardButton(
                     "Dᴏᴡɴʟᴏᴀᴅ ʟɪɴᴋ 📥",
-                    url=
-                    f"https://t.me/{FileStream.username}?start=stream_{str(inserted_id)}"
+                    url=f"https://t.me/{FileStream.username}?start=stream_{str(inserted_id)}"
                 )
             ]]))
 
@@ -210,12 +216,12 @@ async def reply_handler(
                                           reply_to_msg_id=None,
                                           chat_id=Telegram.PFLOG_CHANNEL)
 
-        reply_markup, stream_text = await gen_link(_id=file_info['_id'])
+        response = await gen_link(_id=file_info['_id'])
         await replied_message.edit_text(
-            text=f"{message_txt}\n{stream_text}",
+            text=f"{message_txt}\n{response['stream_text']}",
             parse_mode=ParseMode.HTML,
             disable_web_page_preview=True,
-            reply_markup=reply_markup,
+            reply_markup=response['reply_markup'],
         )
         instruction = {
             "privacy_type":"PRIVATE",

FileStream/utils/FileProcessors/bot_utils.py

@@ -33,8 +33,7 @@ async def is_user_joined(bot, message: Message):
   if Telegram.FORCE_SUB_ID and Telegram.FORCE_SUB_ID.startswith("-100"):
     channel_chat_id = int(
         Telegram.FORCE_SUB_ID)  # When id startswith with -100
-  elif Telegram.FORCE_SUB_ID and (
-      not Telegram.FORCE_SUB_ID.startswith("-100")):
+  elif Telegram.FORCE_SUB_ID and (not Telegram.FORCE_SUB_ID.startswith("-100")):
     channel_chat_id = Telegram.FORCE_SUB_ID  # When id not startswith -100
   else:
     return 200
@@ -53,18 +52,12 @@ async def is_user_joined(bot, message: Message):
           photo=Telegram.VERIFY_PIC,
           caption="<i>Jᴏɪɴ ᴍʏ ᴜᴘᴅᴀᴛᴇ ᴄʜᴀɴɴᴇʟ ᴛᴏ ᴜsᴇ ᴍᴇ 🔐</i>",
           parse_mode=ParseMode.HTML,
-          reply_markup=InlineKeyboardMarkup([[
-              InlineKeyboardButton("❆ Jᴏɪɴ Oᴜʀ Cʜᴀɴɴᴇʟ ❆",
-                                   url=invite_link.invite_link)
-          ]]))
+          reply_markup=InlineKeyboardMarkup([[InlineKeyboardButton("❆ Jᴏɪɴ Oᴜʀ Cʜᴀɴɴᴇʟ ❆",url=invite_link.invite_link)]]))
     else:
       #---------------------------------------------------------------#
       ver = await message.reply_text(
           text="<i>Jᴏɪɴ ᴍʏ ᴜᴘᴅᴀᴛᴇ ᴄʜᴀɴɴᴇʟ ᴛᴏ ᴜsᴇ ᴍᴇ 🔐</i>",
-          reply_markup=InlineKeyboardMarkup([[
-              InlineKeyboardButton("❆ Jᴏɪɴ Oᴜʀ Cʜᴀɴɴᴇʟ ❆",
-                                   url=invite_link.invite_link)
-          ]]),
+          reply_markup=InlineKeyboardMarkup([[InlineKeyboardButton("❆ Jᴏɪɴ Oᴜʀ Cʜᴀɴɴᴇʟ ❆",url=invite_link.invite_link)]]),
           parse_mode=ParseMode.HTML)
 
     await asyncio.sleep(30)
@@ -76,8 +69,7 @@ async def is_user_joined(bot, message: Message):
     return False
   except Exception:
     await message.reply_text(
-        text=
-        f"<i>Sᴏᴍᴇᴛʜɪɴɢ ᴡʀᴏɴɢ ᴄᴏɴᴛᴀᴄᴛ ᴍʏ ᴅᴇᴠᴇʟᴏᴘᴇʀ</i> <b><a href='https://t.me/{Telegram.UPDATES_CHANNEL}'>[ ᴄʟɪᴄᴋ ʜᴇʀᴇ ]</a></b>",
+        text=f"<i>Sᴏᴍᴇᴛʜɪɴɢ ᴡʀᴏɴɢ ᴄᴏɴᴛᴀᴄᴛ ᴍʏ ᴅᴇᴠᴇʟᴏᴘᴇʀ</i> <b><a href='https://t.me/{Telegram.UPDATES_CHANNEL}'>[ ᴄʟɪᴄᴋ ʜᴇʀᴇ ]</a></b>",
         parse_mode=ParseMode.HTML,
         disable_web_page_preview=True)
     return False
@@ -101,9 +93,9 @@ async def upload_type_func(file_info,replied_message):
   existing_file = await db.get_file_by_fileuniqueid_only(file_info['file']['file_unique_id'],file_info['privacy_type'])
   if existing_file :
 
-    reply_markup, stream_text = await gen_link(existing_file['_id'])
+    response = await gen_link(existing_file['_id'])
     #await update.message.edit_text(text=stream_text,parse_mode=ParseMode.HTML,disable_web_page_preview=True,reply_markup=reply_markup,)
-    return reply_markup, stream_text
+    return {"reply_markup" : response["reply_markup"], "stream_text": response["stream_text"],"poster":response["poster"],"type":"ExistingFile"}
 
   else:
 
@@ -118,7 +110,7 @@ async def upload_type_func(file_info,replied_message):
       ],
       [InlineKeyboardButton("ᴄʟᴏsᴇ", callback_data="close")]
     ])
-    return reply_markup, stream_text
+    return {"reply_markup" : reply_markup, "stream_text": stream_text, "type":"OPTIONS"}
 
 
 async def priv_func(file_name, file_size):
@@ -198,7 +190,7 @@ async def gen_link(_id):
           InlineKeyboardButton("ɢᴇᴛ ғɪʟᴇ", url=file_link),
           InlineKeyboardButton("ʀᴇᴠᴏᴋᴇ ғɪʟᴇ",callback_data=f"msgdelpvt_{_id}")
          ], [InlineKeyboardButton("ᴄʟᴏsᴇ", callback_data="close")]])
-  return reply_markup, stream_text
+  return {"reply_markup": reply_markup, "stream_text": stream_text, "poster":poster}
 
 
 #---------------------[ GEN STREAM LINKS FOR CHANNEL ]---------------------#

FileStream/utils/FileProcessors/custom_ul.py

@@ -59,8 +59,7 @@ class TeleUploader:
       logging.debug(f"Cached file properties for file with ID {db_id}")
     return self.cached_file_ids[db_id]
 
-  async def generate_media_session(self, client: Client,
-                                   file_id: FileId) -> Session:
+  async def generate_media_session(self, client: Client,file_id: FileId) -> Session:
     """
       Generates the media session for the DC that contains the media file.
       This is required for getting the bytes from Telegram servers.
@@ -190,9 +189,7 @@ class TeleUploader:
       media = raw.types.InputMediaUploadedDocument(
           file=final,
           mime_type=file_details['file']["mime_type"],
-          attributes=[
-              raw.types.DocumentAttributeFilename(file_name=file_details['file']["file_name"])
-          ])
+          attributes=[raw.types.DocumentAttributeFilename(file_name=file_details['file']["file_name"])])
 
       try:
         msgs = await client.invoke(
@@ -203,10 +200,8 @@ class TeleUploader:
                 random_id=file['file']["file_id"]))
 
         #print(msgs)
-        message = await FileStream.send_message(
-            Telegram.ULOG_GROUP, "Message sent with **Pyrogram**!")
-        message_id = getattr(
-            getattr(getattr(msgs, "updates", "")[1], "message", ""), "id", "")
+        message = await FileStream.send_message(Telegram.ULOG_GROUP, "Message sent with **Pyrogram**!")
+        message_id = getattr(getattr(getattr(msgs, "updates", "")[1], "message", ""), "id", "")
 
         print("Printing  msg-id", message_id)
         chat_id = Telegram.FLOG_CHANNEL
@@ -227,12 +222,12 @@ class TeleUploader:
         #await db.add_webfile(file_info)
         inserted_id = await db.add_file(file_info=file_info,db_type="TEMPORARY")
         await get_file_ids(False, inserted_id, MessageFile)
-        reply_markup, stream_text = await gen_link(_id=inserted_id)
+        response = await gen_link(_id=inserted_id)
         await message.edit_text(
-            text=stream_text,
+            text=response["stream_text"],
             parse_mode=ParseMode.HTML,
             disable_web_page_preview=True,
-            reply_markup=reply_markup,
+            reply_markup=response["reply_markup"],
         )
 
         #log_msg = await send_file(FileStream, db_id, file_info['file_id'], message)
@@ -241,9 +236,7 @@ class TeleUploader:
         await client.send_message(chat_id=Telegram.ULOG_GROUP,
                                   text=f"**#EʀʀᴏʀTʀᴀᴄᴋᴇʙᴀᴄᴋ:** `{e}`",
                                   disable_web_page_preview=True)
-        print(
-            f"Cᴀɴ'ᴛ Eᴅɪᴛ Bʀᴏᴀᴅᴄᴀsᴛ Mᴇssᴀɢᴇ!\nEʀʀᴏʀ:  **Gɪᴠᴇ ᴍᴇ ᴇᴅɪᴛ ᴘᴇʀᴍɪssɪᴏɴ ɪɴ ᴜᴘᴅᴀᴛᴇs ᴀɴᴅ ʙɪɴ Cʜᴀɴɴᴇʟ!{traceback.format_exc()}**"
-        )
+        print(f"Cᴀɴ'ᴛ Eᴅɪᴛ Bʀᴏᴀᴅᴄᴀsᴛ Mᴇssᴀɢᴇ!\nEʀʀᴏʀ:  **Gɪᴠᴇ ᴍᴇ ᴇᴅɪᴛ ᴘᴇʀᴍɪssɪᴏɴ ɪɴ ᴜᴘᴅᴀᴛᴇs ᴀɴᴅ ʙɪɴ Cʜᴀɴɴᴇʟ!{traceback.format_exc()}**")
       await session.stop()
 
     return response