Image Enhancement

FileStream/bot/plugins/FileHandlers/callback.py

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

FileStream/bot/plugins/FileHandlers/stream.py

@@ -75,20 +75,21 @@ 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
-        response = await upload_type_func(get_file_info(message, instruction),reply)
+        reply_markup,stream_text, poster = await upload_type_func(get_file_info(message, instruction),reply)
         print("Response at Upload_type_func:",response)
-        if response["type"]=="ExistingFile":
-            await reply.reply_photo(photo=str(response["stream_text"]).replace(" ", ""),
-                                  caption=response["stream_text"],
-                                  parse_mode=ParseMode.HTML,
-                                  reply_markup=response["reply_markup"])
-
-        else:
-            await reply.edit_text(text=response["stream_text"],
+        if poster == "None":
+            await reply.edit_text(text=stream_text,
                                 parse_mode=ParseMode.HTML,
                                 disable_web_page_preview=True,
-                                reply_markup= response["reply_markup"],
+                                reply_markup= reply_markup,
                                 )
+        else:
+            await reply.reply_photo(photo=poster,
+                                  caption=stream_text,
+                                  parse_mode=ParseMode.HTML,
+                                  reply_markup=reply_markup
+                                  )
+            
     except FloodWait as e:
         print(f"Sleeping for {str(e.value)}s")
         
@@ -110,7 +111,7 @@ 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)
-        response = await gen_link(_id=inserted_id)
+        reply_markup,streaam_text,poster = await gen_link(_id=inserted_id)
         await bot.edit_message_reply_markup(
             chat_id=message.chat.id,
             message_id=message.id,
@@ -214,12 +215,12 @@ async def reply_handler(
                                           reply_to_msg_id=None,
                                           chat_id=Telegram.PFLOG_CHANNEL)
 
-        response = await gen_link(_id=file_info['_id'])
+        reply_markup,stream_text,poster = await gen_link(_id=file_info['_id'])
         await replied_message.edit_text(
-            text=f"{message_txt}\n{response['stream_text']}",
+            text=f"{message_txt}\n{stream_text}",
             parse_mode=ParseMode.HTML,
             disable_web_page_preview=True,
-            reply_markup=response['reply_markup'],
+            reply_markup=reply_markup,
         )
         instruction = {
             "privacy_type":"PRIVATE",

FileStream/utils/FileProcessors/bot_utils.py

@@ -92,13 +92,14 @@ 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 :
-    response = await gen_link(existing_file['_id'])
+    reply_markup,stream_text,poster = 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" : response.get("reply_markup"), "stream_text": response.get("stream_text"),"poster":response.get("poster"),"type":"ExistingFile"}
-    #return reply_markup,stream_text
+    #return {"reply_markup" : response.get("reply_markup"), "stream_text": response.get("stream_text"),"poster":response.get("poster"),"type":"ExistingFile"}
+    return reply_markup,stream_text,poster
   else:
     name = file_info['file']['caption'] if file_info['file']['caption'] else file_info['file']['file_name']
     title, year = Get_Title_Year(name)
+    poster="None"
     stream_text = LANG.STREAM_TEXT_Y.format(file_info['file']['file_name'],title+" "+str(year),humanbytes(file_info['file']['file_size']))
     reply_markup = InlineKeyboardMarkup([
       [
@@ -108,7 +109,7 @@ async def upload_type_func(file_info,replied_message):
       ],
       [InlineKeyboardButton("ᴄʟᴏsᴇ", callback_data="close")]
     ])
-    return {"reply_markup" : reply_markup, "stream_text": stream_text, "type":"OPTIONS"}
+    return  reply_markup, stream_text, poster
 
 
 async def priv_func(file_name, file_size):
@@ -195,7 +196,7 @@ async def gen_link(_id):
       InlineKeyboardButton("ʀᴇᴠᴏᴋᴇ ғɪʟᴇ",callback_data=f"msgdelpvt_{_id}")
       ], [InlineKeyboardButton("ᴄʟᴏsᴇ", callback_data="close")]
     ])
-  return {"reply_markup": reply_markup, "stream_text": stream_text, "poster": poster }
+  return  reply_markup, stream_text, poster
 
 
 #---------------------[ GEN STREAM LINKS FOR CHANNEL ]---------------------#

FileStream/utils/FileProcessors/custom_ul.py

@@ -222,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)
-        response = await gen_link(_id=inserted_id)
+        reply_markup,stream_text, poster = await gen_link(_id=inserted_id)
         await message.edit_text(
-            text=response["stream_text"],
+            text=stream_text,
             parse_mode=ParseMode.HTML,
             disable_web_page_preview=True,
-            reply_markup=response["reply_markup"],
+            reply_markup=reply_markup,
         )
 
         #log_msg = await send_file(FileStream, db_id, file_info['file_id'], message)