Changes in Database

FileStream/bot/plugins/FileHandlers/callback.py

@@ -268,15 +268,14 @@ async def cb_data(bot: Client, update: CallbackQuery):
       # Here we are Adding the File Into the database First
       db_id = await db.add_file(file_info=file_info, db_type="TEMPORARY")
       await get_file_ids(False, db_id, message)
-      if True:
-        file_info = await db.GetFileByDBName(db_id, privacy_type="TEMPORARY")
-        reply_markup, stream_text = await priv_func(file_info['file']['file_name'], file_info['file']['file_size'])
-        await update.message.edit_text(
-            text=stream_text,
-            parse_mode=ParseMode.HTML,
-            disable_web_page_preview=True,
-            reply_markup=reply_markup,
-        )
+      file_info = await db.GetFileByDBName(db_id, privacy_type="TEMPORARY")
+      reply_markup, stream_text = await priv_func(file_info['file']['file_name'], file_info['file']['file_size'])
+      await update.message.edit_text(
+          text=stream_text,
+          parse_mode=ParseMode.HTML,
+          disable_web_page_preview=True,
+          reply_markup=reply_markup,
+      )
     except FloodWait as e:
       print(f"Sleeping for {str(e.value)}s")
       await asyncio.sleep(e.value)

FileStream/utils/FileProcessors/bot_utils.py

@@ -90,15 +90,12 @@ async def upload_type_func(file_info,replied_message):
   user_id = file_info['user_id']
   message_id = file_info['message_id']
   """
-  existing_file = await db.get_file_by_fileuniqueid_only(file_info['file']['file_unique_id'],file_info['privacy_type'])
+  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'])
     #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["reply_markup"], "stream_text": response["stream_text"],"poster":response["poster"],"type":"ExistingFile"}
-
   else:
-
     name = file_info['file']['caption'] if file_info['file']['caption'] else file_info['file']['file_name']
     title, year = Get_Title_Year(name)
     stream_text = LANG.STREAM_TEXT_Y.format(file_info['file']['file_name'],title+" "+str(year),humanbytes(file_info['file']['file_size']))
@@ -146,12 +143,13 @@ async def gen_priv_file_link(_id):
     ])
   else:
     stream_text = LANG.STREAM_TEXT_X.format(file_name, file_size, stream_link,file_link)
-    reply_markup = InlineKeyboardMarkup(
-        [[InlineKeyboardButton("ᴅᴏᴡɴʟᴏᴀᴅ", url=stream_link)],
-         [
-          InlineKeyboardButton("ɢᴇᴛ ғɪʟᴇ", url=file_link),
-          InlineKeyboardButton("ʀᴇᴠᴏᴋᴇ ғɪʟᴇ",callback_data=f"msgdelpvt_{_id}")
-         ], [InlineKeyboardButton("ᴄʟᴏsᴇ", callback_data="close")]])
+    reply_markup = InlineKeyboardMarkup([
+      [InlineKeyboardButton("ᴅᴏᴡɴʟᴏᴀᴅ", url=stream_link)],
+      [
+      InlineKeyboardButton("ɢᴇᴛ ғɪʟᴇ", url=file_link),
+      InlineKeyboardButton("ʀᴇᴠᴏᴋᴇ ғɪʟᴇ",callback_data=f"msgdelpvt_{_id}")
+      ], [InlineKeyboardButton("ᴄʟᴏsᴇ", callback_data="close")]
+    ])
   return reply_markup, stream_text
 
 
@@ -159,37 +157,39 @@ async def gen_priv_file_link(_id):
 
 
 async def gen_link(_id):
-  file_info = await db.get_file(_id)
-  file_name = file_info['file']['file_name']
-  file_size = humanbytes(file_info['file']['file_size'])
-  mime_type = file_info['file']['mime_type']
-  poster = file_info['poster']
-  title=file_info["title"]
-  description=file_info['description']
+  file_info = await db.get_file(_id),
+  file_name = file_info['file']['file_name'],
+  file_size = humanbytes(file_info['file']['file_size']),
+  mime_type = file_info['file']['mime_type'],
+  poster = file_info['poster'],
+  title=file_info["title"],
+  description=file_info['description'],
   release_date=str(file_info["release_date"]),
-  page_link = f"{Server.URL}app/watch/{_id}"
-  stream_link = f"{Server.URL}api/dl/{_id}"
+  page_link = f"{Server.URL}app/watch/{_id}",
+  stream_link = f"{Server.URL}api/dl/{_id}",
   file_link = f"https://t.me/{FileStream.username}?start=file_{_id}"
 
   if "video" in mime_type:
     stream_text = LANG.STREAM_TEXT.format(poster,description,title,release_date,file_name, file_size, stream_link, page_link, file_link)
-    reply_markup = InlineKeyboardMarkup(
-        [[
-          InlineKeyboardButton("sᴛʀᴇᴀᴍ", url=page_link),
-          InlineKeyboardButton("ᴅᴏᴡɴʟᴏᴀᴅ", url=stream_link)
-        ],
-         [
-          InlineKeyboardButton("ɢᴇᴛ ғɪʟᴇ", url=file_link),
-          InlineKeyboardButton("ʀᴇᴠᴏᴋᴇ ғɪʟᴇ",callback_data=f"msgdelpvt_{_id}")
-         ], [InlineKeyboardButton("ᴄʟᴏsᴇ", callback_data="close")]])
+    reply_markup = InlineKeyboardMarkup([
+      [
+        InlineKeyboardButton("sᴛʀᴇᴀᴍ", url=page_link),
+        InlineKeyboardButton("ᴅᴏᴡɴʟᴏᴀᴅ", url=stream_link)
+      ],
+      [
+        InlineKeyboardButton("ɢᴇᴛ ғɪʟᴇ", url=file_link),
+        InlineKeyboardButton("ʀᴇᴠᴏᴋᴇ ғɪʟᴇ",callback_data=f"msgdelpvt_{_id}")
+      ], [InlineKeyboardButton("ᴄʟᴏsᴇ", callback_data="close")]
+    ])
   else:
     stream_text = LANG.STREAM_TEXT_X.format(file_name, file_size, stream_link,file_link)
-    reply_markup = InlineKeyboardMarkup(
-        [[InlineKeyboardButton("ᴅᴏᴡɴʟᴏᴀᴅ", url=stream_link)],
-         [
-          InlineKeyboardButton("ɢᴇᴛ ғɪʟᴇ", url=file_link),
-          InlineKeyboardButton("ʀᴇᴠᴏᴋᴇ ғɪʟᴇ",callback_data=f"msgdelpvt_{_id}")
-         ], [InlineKeyboardButton("ᴄʟᴏsᴇ", callback_data="close")]])
+    reply_markup = InlineKeyboardMarkup([
+      [InlineKeyboardButton("ᴅᴏᴡɴʟᴏᴀᴅ", url=stream_link)],
+      [
+      InlineKeyboardButton("ɢᴇᴛ ғɪʟᴇ", url=file_link),
+      InlineKeyboardButton("ʀᴇᴠᴏᴋᴇ ғɪʟᴇ",callback_data=f"msgdelpvt_{_id}")
+      ], [InlineKeyboardButton("ᴄʟᴏsᴇ", callback_data="close")]
+    ])
   return {"reply_markup": reply_markup, "stream_text": stream_text, "poster":poster}
 
 
@@ -265,10 +265,7 @@ async def is_user_authorized(message):
 async def is_user_exist(bot, message):
   if not bool(await db.get_user(message.from_user.id)):
     #await db.add_user(message.from_user.id)
-    await bot.send_message(
-        Telegram.ULOG_GROUP,
-        f"**#NᴇᴡUsᴇʀ**\n**⬩ ᴜsᴇʀ ɴᴀᴍᴇ :** [{message.from_user.first_name}](tg://user?id={message.from_user.id})\n**⬩ ᴜsᴇʀ ɪᴅ :** `{message.from_user.id}`"
-    )
+    await bot.send_message(Telegram.ULOG_GROUP,f"**#NᴇᴡUsᴇʀ**\n**⬩ ᴜsᴇʀ ɴᴀᴍᴇ :** [{message.from_user.first_name}](tg://user?id={message.from_user.id})\n**⬩ ᴜsᴇʀ ɪᴅ :** `{message.from_user.id}`")
 
 
 #------------------[ User Status]--------------------#
@@ -282,10 +279,7 @@ async def is_channel_exist(bot, message):
   if not bool(await db.get_user(message.chat.id)):
     await db.add_user(message.chat.id)
     members = await bot.get_chat_members_count(message.chat.id)
-    await bot.send_message(
-        Telegram.ULOG_GROUP,
-        f"**#NᴇᴡCʜᴀɴɴᴇʟ** \n**⬩ ᴄʜᴀᴛ ɴᴀᴍᴇ :** `{message.chat.title}`\n**⬩ ᴄʜᴀᴛ ɪᴅ :** `{message.chat.id}`\n**⬩ ᴛᴏᴛᴀʟ ᴍᴇᴍʙᴇʀs :** `{members}`"
-    )
+    await bot.send_message(Telegram.ULOG_GROUP,f"**#NᴇᴡCʜᴀɴɴᴇʟ** \n**⬩ ᴄʜᴀᴛ ɴᴀᴍᴇ :** `{message.chat.title}`\n**⬩ ᴄʜᴀᴛ ɪᴅ :** `{message.chat.id}`\n**⬩ ᴛᴏᴛᴀʟ ᴍᴇᴍʙᴇʀs :** `{members}`" )
 
 
 # Decorator Function to check if user is authorized

FileStream/utils/FileProcessors/file_properties.py

@@ -50,7 +50,7 @@ async def update_file_id(message, MULTI_CLIENTS):
   file_ids = {}
   for client_id, client in MULTI_CLIENTS.items():
     #log_msg = await client.get_messages(message['location'],message['message_id'])
-    media = get_media_from_message(await client.get_messages(message['location'],message['message_id']))
+    media = get_media_from_message(await client.get_messages(message['location'], message['message_id']))
     file_ids[str(client.id)] = getattr(media, "file_id", "")
 
   return file_ids
@@ -63,8 +63,7 @@ async def get_private_file_ids(client: Client | bool, db_id: str,message) -> Opt
   if not str(client.id) in file_id_info:
     logging.debug("Storing file_id in DB")
     #msg = await client.get_messages(Telegram.PFLOG_CHANNEL,file_info['message_id'])
-    media = get_media_from_message(await client.get_messages(
-        Telegram.PFLOG_CHANNEL, file_info['message_id']))
+    media = get_media_from_message(await client.get_messages(Telegram.PFLOG_CHANNEL, file_info['message_id']))
     file_id_info[str(client.id)] = getattr(media, "file_id", "")
     await db.update_private_file_ids(db_id, file_id_info)
     logging.debug("Stored file_id in DB")
@@ -89,7 +88,7 @@ async def get_file_ids(client: Client | bool, db_id: str, message) -> Optional[F
         log_msg = await send_file(FileStream, db_id, file_info, message, source)
         #updated_info = update_file_info(log_msg)
         await db.update_file_info(db_id, update_file_info(log_msg), file_info['privacy_type'])
-        await db.update_file_ids(db_id, await update_file_id(await db.GetFileByDBName(db_id, file_info['privacy_type']),MULTI_CLIENTS), file_info['privacy_type'])
+        await db.update_file_ids(db_id, await update_file_id(await db.GetFileByDBName(db_id, file_info['privacy_type']), MULTI_CLIENTS), file_info['privacy_type'])
 
       logging.debug("Stored file_id of all clients in DB")
       if not client: