Spaces:
Running
Running
BinaryONe
commited on
Commit
·
77c7918
1
Parent(s):
cbf6107
Miseleneous Fixes
Browse files
FileStream/bot/plugins/FileHandlers/callback.py
CHANGED
@@ -134,6 +134,12 @@ async def cb_data(bot: Client, update: CallbackQuery):
|
|
134 |
f"Gᴏᴛ FʟᴏᴏᴅWᴀɪᴛ ᴏғ {str(e.value)}s ғʀᴏᴍ [{message.from_user.first_name}](tg://user?id={message.from_user.id})\n\n**ᴜsᴇʀ ɪᴅ :** `{str(message.from_user.id)}`",
|
135 |
disable_web_page_preview=True,
|
136 |
parse_mode=ParseMode.MARKDOWN)
|
|
|
|
|
|
|
|
|
|
|
|
|
137 |
|
138 |
elif usr_cmd[0] == "privup":
|
139 |
try:
|
|
|
134 |
f"Gᴏᴛ FʟᴏᴏᴅWᴀɪᴛ ᴏғ {str(e.value)}s ғʀᴏᴍ [{message.from_user.first_name}](tg://user?id={message.from_user.id})\n\n**ᴜsᴇʀ ɪᴅ :** `{str(message.from_user.id)}`",
|
135 |
disable_web_page_preview=True,
|
136 |
parse_mode=ParseMode.MARKDOWN)
|
137 |
+
except Exception as e:
|
138 |
+
print(f"An error occurred: {str(e)}")
|
139 |
+
await FileStream.send_message(
|
140 |
+
chat_id=Telegram.ULOG_GROUP,
|
141 |
+
text=f"An error occurred: {str(e)}"
|
142 |
+
)
|
143 |
|
144 |
elif usr_cmd[0] == "privup":
|
145 |
try:
|
FileStream/bot/plugins/FileHandlers/stream.py
CHANGED
@@ -47,7 +47,6 @@ db = Database(Telegram.DATABASE_URL, Telegram.SESSION_NAME)
|
|
47 |
|
48 |
@FileStream.on_message(filters.private & (filters.document | filters.video | filters.video_note | filters.audio | filters.voice | filters.animation | filters.photo), group=4,)
|
49 |
async def private_receive_handler(bot: Client, message: Message):
|
50 |
-
|
51 |
try:
|
52 |
"""
|
53 |
//All Values Generated Here is Decided in get_file_info () so No Need of this Block
|
|
|
47 |
|
48 |
@FileStream.on_message(filters.private & (filters.document | filters.video | filters.video_note | filters.audio | filters.voice | filters.animation | filters.photo), group=4,)
|
49 |
async def private_receive_handler(bot: Client, message: Message):
|
|
|
50 |
try:
|
51 |
"""
|
52 |
//All Values Generated Here is Decided in get_file_info () so No Need of this Block
|
FileStream/utils/FileProcessors/bot_utils.py
CHANGED
@@ -93,11 +93,13 @@ async def upload_type_func(file_info):
|
|
93 |
message_id = file_info['message_id']
|
94 |
"""
|
95 |
|
96 |
-
existing_file =await db.get_file_by_fileuniqueid_only(file_info['file']['file_unique_id'])
|
97 |
if existing_file :
|
|
|
98 |
reply_markup, stream_text = await gen_link(existing_file['_id'])
|
99 |
#await update.message.edit_text(text=stream_text,parse_mode=ParseMode.HTML,disable_web_page_preview=True,reply_markup=reply_markup,)
|
100 |
return reply_markup, stream_text
|
|
|
101 |
else:
|
102 |
stream_text = LANG.STREAM_TEXT_Y.format(file_info['file']['file_name'],humanbytes(file_info['file']['file_size']))
|
103 |
reply_markup = InlineKeyboardMarkup([[
|
|
|
93 |
message_id = file_info['message_id']
|
94 |
"""
|
95 |
|
96 |
+
existing_file = await db.get_file_by_fileuniqueid_only(file_info['file']['file_unique_id'])
|
97 |
if existing_file :
|
98 |
+
|
99 |
reply_markup, stream_text = await gen_link(existing_file['_id'])
|
100 |
#await update.message.edit_text(text=stream_text,parse_mode=ParseMode.HTML,disable_web_page_preview=True,reply_markup=reply_markup,)
|
101 |
return reply_markup, stream_text
|
102 |
+
|
103 |
else:
|
104 |
stream_text = LANG.STREAM_TEXT_Y.format(file_info['file']['file_name'],humanbytes(file_info['file']['file_size']))
|
105 |
reply_markup = InlineKeyboardMarkup([[
|
FileStream/utils/FileProcessors/file_properties.py
CHANGED
@@ -183,7 +183,7 @@ def get_file_info(message, instruction):
|
|
183 |
else:
|
184 |
user_idx = message.chat.id
|
185 |
"""
|
186 |
-
|
187 |
return {
|
188 |
"user_id": instruction['user_id'],
|
189 |
"user_type": instruction['user_type'],
|
@@ -191,7 +191,7 @@ def get_file_info(message, instruction):
|
|
191 |
"location": message.from_user.id if (message.chat.type == ChatType.PRIVATE) else message.chat.id,
|
192 |
"file": {
|
193 |
"file_id": getattr(media, "file_id", ""),
|
194 |
-
"caption": clean_text(
|
195 |
"file_unique_id": getattr(media, "file_unique_id", ""),
|
196 |
"file_name": get_name(message),
|
197 |
"file_size": getattr(media, "file_size", 0),
|
|
|
183 |
else:
|
184 |
user_idx = message.chat.id
|
185 |
"""
|
186 |
+
#"caption": clean_text(getattr(message, "caption", f"{get_name(message)}")),
|
187 |
return {
|
188 |
"user_id": instruction['user_id'],
|
189 |
"user_type": instruction['user_type'],
|
|
|
191 |
"location": message.from_user.id if (message.chat.type == ChatType.PRIVATE) else message.chat.id,
|
192 |
"file": {
|
193 |
"file_id": getattr(media, "file_id", ""),
|
194 |
+
"caption": clean_text(message.caption) if hasattr(message, "caption") else f"{get_name(message)}",
|
195 |
"file_unique_id": getattr(media, "file_unique_id", ""),
|
196 |
"file_name": get_name(message),
|
197 |
"file_size": getattr(media, "file_size", 0),
|