Changes in Database

FileStream/Database/database.py

@@ -132,7 +132,7 @@ class Database:
       except InvalidId:
         raise FileNotFound
 
-  async def get_file_old(self, _id, privacy_type:str ):
+  async def GetFileByDBName(self, _id, privacy_type:str ):
     if privacy_type == "PUBLIC":
       try:
         file_info = await self.files.find_one({"_id": ObjectId(_id)})
@@ -345,7 +345,7 @@ class Database:
   async def get_search_results(self,query=None, file_type=None, max_results=10, offset=0):
     
     regex = re.compile(re.escape(query), re.IGNORECASE)
-    filter = {'$or': [{'file.file_name': {"$regex": regex}}, {'file.caption': {"$regex": regex}}]}
+    filter = {'$or': [{'file.file_name': {"$regex": regex}}, {'file.caption': {"$regex": regex}}, {'title': {"$regex": regex}}, {'release_date': {"$regex": regex}}]}
 
     if file_type:
       filter['mime_type'] = file_type

FileStream/bot/plugins/Admin/admin.py

@@ -25,7 +25,7 @@ async def iamadmin(c: Client, m: Message):
   if await db.is_admin(m.from_user.id):
     await m.reply_text(
         text=LANG.ADMIN_GUIDELINES_TEXT_Y.format("/add_user <UserID>","/add_admin <UserID>"),
-        parse_mode=ParseMode.MARKDOWN,
+        parse_mode=ParseMode.HTML,
         quote=True)
   
 
@@ -49,7 +49,7 @@ async def add_user(c: Client, m: Message):
     except ValueError or UnboundLocalError:
       return await m.reply_text(f"**Usage:**\n <code> /add_admin <{user_id}> </code> ")
     details= await FileStream.get_users(user_id)
-    print("Details :",details)
+    #print("Details :",details)
     await db.add_user(user_id, details)
     await m.reply_text(f"**User[{m.from_user.first_name} {m.from_user.last_name}] \n  User ID : {user_id} Added Successfully**")
   else:
@@ -65,7 +65,28 @@ async def add_user(c: Client, m: Message):
     except ValueError or UnboundLocalError:
       return await m.reply_text(f"**Usage:**\n <code> /add_admin <{user_id}> </code>")
     details= await FileStream.get_users(user_id)
-    print("Details :",details)
+    #print("Details :",details)
+    """Details : {
+    "_": "User",
+    "id": ,
+    "is_self": false,
+    "is_contact": false,
+    "is_mutual_contact": false,
+    "is_deleted": false,
+    "is_bot": false,
+    "is_verified": false,
+    "is_restricted": false,
+    "is_scam": false,
+    "is_fake": false,
+    "is_support": false,
+    "is_premium": false,
+    "is_contacts_only": false,
+    "first_name": "",
+    "last_name": "",
+    "status": "UserStatus.RECENTLY",
+    "username": "",
+    "language_code": "en"
+    }"""
     await db.add_admin(user_id, details )
     await m.reply_text(f"**Admin [{m.from_user.first_name} {m.from_user.last_name}]\n  {user_id} Added Successfully**")
   else:

FileStream/bot/plugins/FileHandlers/callback.py

@@ -266,10 +266,10 @@ async def cb_data(bot: Client, update: CallbackQuery):
       }
       file_info = get_file_info(message, instruction)
       # Here we are Adding the File Into the database First
-      db_id = await db.add_file(file_info=file_info, db_type="PRIVATE")
+      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.get_file(db_id)
+        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,
@@ -472,8 +472,7 @@ async def gen_privfile_menu(_id, file_list_no, update: CallbackQuery):
     file_type = "Image"
   elif file_id.file_type == FileType.VOICE:
     file_type = "Voice"
-  elif file_id.file_type in (FileType.VIDEO, FileType.ANIMATION,
-                             FileType.VIDEO_NOTE):
+  elif file_id.file_type in (FileType.VIDEO, FileType.ANIMATION,FileType.VIDEO_NOTE):
     file_type = "Video"
   elif file_id.file_type == FileType.DOCUMENT:
     file_type = "Document"
@@ -533,21 +532,17 @@ async def gen_allfile_list_button(file_list_no: int, user_id: int):
   file_list = []
   async for x in user_files:
     file_list.append([
-        InlineKeyboardButton(
-            f"📦 {x['file']['caption']}",
-            callback_data=f"allfile_{x['_id']}_{file_list_no}")
+        InlineKeyboardButton(f"📦 {x['file']['caption']}", callback_data=f"allfile_{x['_id']}_{file_list_no}")
     ])
   if total_files > 10:
     file_list.append([
-        InlineKeyboardButton(
-            "◄",
+        InlineKeyboardButton( "◄",
             callback_data="{}".format("userallfiles_" +
                                       str(file_list_no -
                                           1) if file_list_no > 1 else 'N/A')),
         InlineKeyboardButton(f"{file_list_no}/{math.ceil(total_files/10)}",
                              callback_data="N/A"),
-        InlineKeyboardButton(
-            "►",
+        InlineKeyboardButton("►",
             callback_data="{}".format("userallfiles_" +
                                       str(file_list_no +
                                           1) if total_files > file_list_no *
@@ -572,8 +567,7 @@ async def gen_allfile_menu(_id, file_list_no, update: CallbackQuery):
     file_type = "Image"
   elif file_id.file_type == FileType.VOICE:
     file_type = "Voice"
-  elif file_id.file_type in (FileType.VIDEO, FileType.ANIMATION,
-                             FileType.VIDEO_NOTE):
+  elif file_id.file_type in (FileType.VIDEO, FileType.ANIMATION,FileType.VIDEO_NOTE):
     file_type = "Video"
   elif file_id.file_type == FileType.DOCUMENT:
     file_type = "Document"
@@ -589,34 +583,26 @@ async def gen_allfile_menu(_id, file_list_no, update: CallbackQuery):
   if "video" in file_type.lower():
     MYFILES_BUTTONS = InlineKeyboardMarkup([
         [
-            InlineKeyboardButton("sᴛʀᴇᴀᴍ", url=page_link),
-            InlineKeyboardButton("ᴅᴏᴡɴʟᴏᴀᴅ", url=stream_link)
+          InlineKeyboardButton("sᴛʀᴇᴀᴍ", url=page_link),
+          InlineKeyboardButton("ᴅᴏᴡɴʟᴏᴀᴅ", url=stream_link)
         ],
-        [
-            InlineKeyboardButton(
-                "ɢᴇᴛ ғɪʟᴇ", callback_data=f"sendfile_{myfile_info['_id']}"),
-            InlineKeyboardButton(
-                "ʀᴇᴠᴏᴋᴇ ғɪʟᴇ",
-                callback_data=f"msgdelete_{myfile_info['_id']}_{file_list_no}")
+        [          
+          InlineKeyboardButton("ɢᴇᴛ ғɪʟᴇ", callback_data=f"sendfile_{myfile_info['_id']}"),
+          InlineKeyboardButton("ʀᴇᴠᴏᴋᴇ ғɪʟᴇ",callback_data=f"msgdelete_{myfile_info['_id']}_{file_list_no}")
         ],
         [
-            InlineKeyboardButton(
-                "ʙᴀᴄᴋ", callback_data="userfiles_{}".format(file_list_no))
+          InlineKeyboardButton("ʙᴀᴄᴋ", callback_data="userfiles_{}".format(file_list_no))
         ]
     ])
   else:
     MYFILES_BUTTONS = InlineKeyboardMarkup([
         [InlineKeyboardButton("ᴅᴏᴡɴʟᴏᴀᴅ", url=stream_link)],
         [
-            InlineKeyboardButton(
-                "ɢᴇᴛ ғɪʟᴇ", callback_data=f"sendfile_{myfile_info['_id']}"),
-            InlineKeyboardButton(
-                "ʀᴇᴠᴏᴋᴇ ғɪʟᴇ",
-                callback_data=f"msgdelete_{myfile_info['_id']}_{file_list_no}")
+          InlineKeyboardButton("ɢᴇᴛ ғɪʟᴇ", callback_data=f"sendfile_{myfile_info['_id']}"),
+          InlineKeyboardButton("ʀᴇᴠᴏᴋᴇ ғɪʟᴇ",callback_data=f"msgdelete_{myfile_info['_id']}_{file_list_no}")
         ],
         [
-            InlineKeyboardButton(
-                "ʙᴀᴄᴋ", callback_data="userfiles_{}".format(file_list_no))
+          InlineKeyboardButton("ʙᴀᴄᴋ", callback_data="userfiles_{}".format(file_list_no))
         ]
     ])
 
@@ -642,20 +628,15 @@ async def delete_user_file(_id, file_list_no: int, update: CallbackQuery):
       await db.delete_one_privfile(myfile_info['_id'])
       #await db.count_links(update.from_user.id, "-")
       await update.message.edit_caption(
-          caption="**Fɪʟᴇ Dᴇʟᴇᴛᴇᴅ Sᴜᴄᴄᴇssғᴜʟʟʏ !**" +
-          update.message.caption.replace("Cᴏɴғɪʀᴍ ʏᴏᴜ ᴡᴀɴᴛ ᴛᴏ ᴅᴇʟᴇᴛᴇ ᴛʜᴇ Fɪʟᴇ",
-                                         ""),
-          reply_markup=InlineKeyboardMarkup(
-              [[InlineKeyboardButton("ʙᴀᴄᴋ", callback_data=f"userfiles_1")]]))
+          caption="**Fɪʟᴇ Dᴇʟᴇᴛᴇᴅ Sᴜᴄᴄᴇssғᴜʟʟʏ !**" + update.message.caption.replace("Cᴏɴғɪʀᴍ ʏᴏᴜ ᴡᴀɴᴛ ᴛᴏ ᴅᴇʟᴇᴛᴇ ᴛʜᴇ Fɪʟᴇ",""),
+          reply_markup=InlineKeyboardMarkup([[InlineKeyboardButton("ʙᴀᴄᴋ", callback_data=f"userfiles_1")]]))
     else:
       await db.delete_one_file(myfile_info['_id'])
       await db.count_links(update.from_user.id, "-")
       await update.message.edit_caption(
-          caption="**Fɪʟᴇ Dᴇʟᴇᴛᴇᴅ Sᴜᴄᴄᴇssғᴜʟʟʏ !**" +
-          update.message.caption.replace("Cᴏɴғɪʀᴍ ʏᴏᴜ ᴡᴀɴᴛ ᴛᴏ ᴅᴇʟᴇᴛᴇ ᴛʜᴇ Fɪʟᴇ",
-                                         ""),
-          reply_markup=InlineKeyboardMarkup(
-              [[InlineKeyboardButton("ʙᴀᴄᴋ", callback_data=f"userfiles_1")]]))
+          caption="**Fɪʟᴇ Dᴇʟᴇᴛᴇᴅ Sᴜᴄᴄᴇssғᴜʟʟʏ !**" + update.message.caption.replace("Cᴏɴғɪʀᴍ ʏᴏᴜ ᴡᴀɴᴛ ᴛᴏ ᴅᴇʟᴇᴛᴇ ᴛʜᴇ Fɪʟᴇ", ""),
+          reply_markup=InlineKeyboardMarkup([[InlineKeyboardButton("ʙᴀᴄᴋ", callback_data=f"userfiles_1")]])
+      )
 
   except FileNotFound:
     await update.answer("File Already Deleted")

FileStream/bot/plugins/FileHandlers/files.py

@@ -149,12 +149,10 @@ async def handle_inline_query(client, query):
             title=file['file']['file_name'],
             document_file_id=file['file']['file_id'],
             caption=file['file']['file_name'] or "",
-            description=
-            f" Size: {humanbytes(file['file']['file_size'])}\nType:{file['file']['mime_type']} ",
-            reply_markup=InlineKeyboardMarkup([[
-                InlineKeyboardButton('Search',
-                                     switch_inline_query_current_chat='')
-            ]])))
+            description=f"Size: {humanbytes(file['file']['file_size'])}\nType:{file['file']['mime_type']} ",
+            reply_markup=InlineKeyboardMarkup([[InlineKeyboardButton('Search',switch_inline_query_current_chat='')]])
+        )
+    )
   if results:
     switch_pm_text = f"Results"
     if text:

FileStream/utils/FileProcessors/bot_utils.py

@@ -171,13 +171,16 @@ async def gen_link(_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=file_info["release_date"],
   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(file_name, file_size, stream_link, page_link, file_link)
+    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),

FileStream/utils/FileProcessors/translation.py

@@ -35,6 +35,9 @@ class LANG(object):
 
     STREAM_TEXT = """
 <i><u>𝗬𝗼𝘂𝗿 𝗟𝗶𝗻𝗸 𝗚𝗲𝗻𝗲𝗿𝗮𝘁𝗲𝗱 !</u></i>\n
+<img src="{}"  width="150" height="300">\n
+<b>📣 ᴅᴇꜱᴄʀɪᴘᴛɪᴏɴ :</b> {} \n
+<b>📊 ⒾⓂⒹⒷ :</b> {} 📦 રειελȘε {} \n
 <b>📂 Fɪʟᴇ ɴᴀᴍᴇ :</b> <b><code>{}</code></b>\n
 <b>📦 Fɪʟᴇ ꜱɪᴢᴇ :</b> <code>{}</code>\n
 <b>📥 Dᴏᴡɴʟᴏᴀᴅ :</b> <code>{}</code>\n
@@ -48,7 +51,7 @@ class LANG(object):
 <b>📦 Fɪʟᴇ ꜱɪᴢᴇ :</b> <code>{}</code>\n
   """
     ADMIN_GUIDELINES_TEXT_Y = """
-<b>🪂 ✩░▒▓▆▅▃▂▁🅰🅳🅼🅸🅽 🅶🆄🅸🅳🅴🅻🅸🅽🅴🆂▁▂▃▅▆▓▒░✩ 🪂</b>\n
+<b>🪂 ✩🅰🅳🅼🅸🅽 🅶🆄🅸🅳🅴🅻🅸🅽🅴🆂✩ 🪂</b>\n
 <b>🔗 ᴄᴏᴍᴍᴀɴᴅ 1:</b> <b>{}</b>\n
 <b>🔗 ᴄᴏᴍᴍᴀɴᴅ 2 :</b> <b>{}</b>\n
   """