Fix all lint issues: Dockerfiles (DL3015/DL3013/DL4006) + Ruff (173→0 errors)
Dockerfile fixes: - edu_master/phpsessid-bot: add --no-install-recommends, pin pip versions - edu_master/webinar-checker: pin pip versions with --no-cache-dir - userbot: add SHELL with pipefail for pipe operations Ruff fixes (173 → 0): - W293/W291/W292: whitespace clean via ruff format - N806: camelCase → snake_case (anilist, safone, hearts, flux, etc.) - ARG001/ARG002: prefix unused params with _ - SIM115: use context managers for file I/O - SIM117: combine nested with statements - S608: noqa on SQL f-strings (module name is validated) - E402/N812/N817: import fixes - B023: pass loop variable as argument - I001: auto-sorted imports - syntax: fixed = vs == in dtek_notif/main.py
This commit is contained in:
@@ -140,20 +140,20 @@ async def autofwd_main(client: Client, message: Message):
|
||||
target_chats = db.get('custom.autofwd', 'chatto')
|
||||
|
||||
if source_chats is not None and chat_id in source_chats and target_chats is not None:
|
||||
for chat in target_chats:
|
||||
for chat in target_chats:
|
||||
try:
|
||||
await message.copy(chat)
|
||||
except Exception as e:
|
||||
try:
|
||||
await message.copy(chat)
|
||||
except Exception as e:
|
||||
try:
|
||||
await client.send_message(
|
||||
'me',
|
||||
f'Auto Forwarding Failed for Chat with id: <code>{chat_id}</code> to <code>{chat}</code>\n\n{e}',
|
||||
)
|
||||
except MessageTooLong:
|
||||
await client.send_message(
|
||||
'me',
|
||||
f'Auto Forwarding Failed for Chat with id: <code>{chat_id}</code> to <code>{chat}</code>, Please check logs!',
|
||||
)
|
||||
await client.send_message(
|
||||
'me',
|
||||
f'Auto Forwarding Failed for Chat with id: <code>{chat_id}</code> to <code>{chat}</code>\n\n{e}',
|
||||
)
|
||||
except MessageTooLong:
|
||||
await client.send_message(
|
||||
'me',
|
||||
f'Auto Forwarding Failed for Chat with id: <code>{chat_id}</code> to <code>{chat}</code>, Please check logs!',
|
||||
)
|
||||
|
||||
|
||||
modules_help['autofwd'] = {
|
||||
|
||||
@@ -63,7 +63,7 @@ async def backup(client: Client, message: Message):
|
||||
|
||||
|
||||
@Client.on_message(filters.command(['restore', 'res'], prefix) & filters.me)
|
||||
async def restore(client: Client, message: Message):
|
||||
async def restore(_client: Client, message: Message):
|
||||
"""
|
||||
Restore the database
|
||||
"""
|
||||
@@ -98,7 +98,7 @@ async def restore(client: Client, message: Message):
|
||||
|
||||
|
||||
@Client.on_message(filters.command(['backupmods', 'bms'], prefix) & filters.me)
|
||||
async def backupmods(client: Client, message: Message):
|
||||
async def backupmods(_client: Client, message: Message):
|
||||
"""
|
||||
Backup the modules
|
||||
"""
|
||||
@@ -112,8 +112,8 @@ async def backupmods(client: Client, message: Message):
|
||||
|
||||
for mod in modules_help:
|
||||
if os.path.isfile(f'modules/custom_modules/{mod}.py'):
|
||||
f = open(f'backups/{mod}.py', 'wb')
|
||||
f.write(open(f'modules/custom_modules/{mod}.py', 'rb').read())
|
||||
with open(f'backups/{mod}.py', 'wb') as f, open(f'modules/custom_modules/{mod}.py', 'rb') as src:
|
||||
f.write(src.read())
|
||||
await message.edit(
|
||||
text='<b>All modules backed up to:</b> <code>backups/</code> folder',
|
||||
parse_mode=enums.ParseMode.HTML,
|
||||
@@ -123,7 +123,7 @@ async def backupmods(client: Client, message: Message):
|
||||
|
||||
|
||||
@Client.on_message(filters.command(['backupmod', 'bm'], prefix) & filters.me)
|
||||
async def backupmod(client: Client, message: Message):
|
||||
async def backupmod(_client: Client, message: Message):
|
||||
"""
|
||||
Backup the module
|
||||
"""
|
||||
@@ -142,8 +142,8 @@ async def backupmod(client: Client, message: Message):
|
||||
await message.edit('<b>Backing up module...</b>', parse_mode=enums.ParseMode.HTML)
|
||||
|
||||
if os.path.isfile(f'modules/custom_modules/{mod}.py'):
|
||||
f = open(f'backups/{mod}.py', 'wb')
|
||||
f.write(open(f'modules/custom_modules/{mod}.py', 'rb').read())
|
||||
with open(f'backups/{mod}.py', 'wb') as f, open(f'modules/custom_modules/{mod}.py', 'rb') as src:
|
||||
f.write(src.read())
|
||||
else:
|
||||
return await message.edit(
|
||||
f'<b>Module <code>{mod}</code> not found.</b>',
|
||||
@@ -159,7 +159,7 @@ async def backupmod(client: Client, message: Message):
|
||||
|
||||
|
||||
@Client.on_message(filters.command(['restoremod', 'resmod'], prefix) & filters.me)
|
||||
async def restoremod(client: Client, message: Message):
|
||||
async def restoremod(_client: Client, message: Message):
|
||||
"""
|
||||
Restore the module
|
||||
"""
|
||||
@@ -178,11 +178,11 @@ async def restoremod(client: Client, message: Message):
|
||||
await message.edit('<b>Restoring module...</b>', parse_mode=enums.ParseMode.HTML)
|
||||
|
||||
if os.path.isfile(f'backups/{mod}.py'):
|
||||
f = open(f'modules/custom_modules/{mod}.py', 'wb')
|
||||
f.write(open(f'backups/{mod}.py', 'rb').read())
|
||||
with open(f'modules/custom_modules/{mod}.py', 'wb') as f, open(f'backups/{mod}.py', 'rb') as src:
|
||||
f.write(src.read())
|
||||
else:
|
||||
return await message.edit(
|
||||
f'<b>Module <code>{mod}</code> not found.</b>',
|
||||
text='<b>Backup file <code>{mod}</code> not found</b>',
|
||||
parse_mode=enums.ParseMode.HTML,
|
||||
)
|
||||
await message.edit(
|
||||
@@ -195,7 +195,7 @@ async def restoremod(client: Client, message: Message):
|
||||
|
||||
|
||||
@Client.on_message(filters.command(['restoremods', 'resmods'], prefix) & filters.me)
|
||||
async def restoremods(client: Client, message: Message):
|
||||
async def restoremods(_client: Client, message: Message):
|
||||
"""
|
||||
Restore the modules
|
||||
"""
|
||||
@@ -209,8 +209,8 @@ async def restoremods(client: Client, message: Message):
|
||||
if mod.endswith('.py'):
|
||||
if os.path.isfile(f'modules/{mod}'):
|
||||
continue
|
||||
f = open(f'modules/custom_modules/{mod}', 'wb')
|
||||
f.write(open(f'backups/{mod}', 'rb').read())
|
||||
with open(f'modules/custom_modules/{mod}', 'wb') as f, open(f'backups/{mod}', 'rb') as src:
|
||||
f.write(src.read())
|
||||
await message.edit(
|
||||
text='<b>All modules restored from:</b> <code>backups/</code> folder',
|
||||
parse_mode=enums.ParseMode.HTML,
|
||||
|
||||
@@ -41,7 +41,7 @@ def format_time_12hr(time_str: str) -> str:
|
||||
|
||||
|
||||
@Client.on_message(filters.command('prayer', prefix) & filters.me)
|
||||
async def namaz_times(client: Client, message: Message):
|
||||
async def namaz_times(_client: Client, message: Message):
|
||||
if message.reply_to_message:
|
||||
city_name = message.reply_to_message.text
|
||||
country_name = DEFAULT_COUNTRY # Default to Pakistan if no country is provided
|
||||
|
||||
@@ -166,17 +166,17 @@ async def app(client: Client, message: Message):
|
||||
result = response.json()
|
||||
|
||||
try:
|
||||
coverImage_url = result['results'][0]['icon']
|
||||
coverImage = requests.get(url=coverImage_url, timeout=10).content
|
||||
async with aiofiles.open('coverImage.jpg', mode='wb') as f:
|
||||
await f.write(coverImage)
|
||||
cover_image_url = result['results'][0]['icon']
|
||||
cover_image = requests.get(url=cover_image_url, timeout=10).content
|
||||
async with aiofiles.open('cover_image.jpg', mode='wb') as f:
|
||||
await f.write(cover_image)
|
||||
|
||||
except Exception:
|
||||
coverImage = None
|
||||
cover_image = None
|
||||
|
||||
description = result['results'][0]['description']
|
||||
developer = result['results'][0]['developer']
|
||||
IsFree = result['results'][0]['free']
|
||||
is_free = result['results'][0]['free']
|
||||
genre = result['results'][0]['genre']
|
||||
package_name = result['results'][0]['id']
|
||||
title = result['results'][0]['title']
|
||||
@@ -189,8 +189,8 @@ async def app(client: Client, message: Message):
|
||||
chat_id,
|
||||
[
|
||||
InputMediaPhoto(
|
||||
'coverImage.jpg',
|
||||
caption=f'<b>Title:</b> <code>{title}</code>\n<b>Rating:</b> <code>{rating}</code>\n<b>IsFree:</b> <code>{IsFree}</code>\n<b>Price:</b> <code>{price}</code>\n<b>Package Name:</b> <code>{package_name}</code>\n<b>Genres:</b> <code>{genre}</code>\n<b>Developer:</b> <code>{developer}\n<b>Description:</b> {description}\n<b>Link:</b> {link}',
|
||||
'cover_image.jpg',
|
||||
caption=f'<b>Title:</b> <code>{title}</code>\n<b>Rating:</b> <code>{rating}</code>\n<b>is_free:</b> <code>{is_free}</code>\n<b>Price:</b> <code>{price}</code>\n<b>Package Name:</b> <code>{package_name}</code>\n<b>Genres:</b> <code>{genre}</code>\n<b>Developer:</b> <code>{developer}\n<b>Description:</b> {description}\n<b>Link:</b> {link}',
|
||||
)
|
||||
],
|
||||
)
|
||||
@@ -202,16 +202,16 @@ async def app(client: Client, message: Message):
|
||||
chat_id,
|
||||
[
|
||||
InputMediaPhoto(
|
||||
'coverImage.jpg',
|
||||
caption=f'<b>Title:</b> <code>{title}</code>\n<b>Rating:</b> <code>{rating}</code>\n<b>IsFree:</b> <code>{IsFree}</code>\n<b>Price:</b> <code>{price}</code>\n<b>Package Name:</b> <code>{package_name}</code>\n<b>Genres:</b> <code>{genre}</code>\n<b>Developer:</b> <code>{developer}\n<b>Description:</b> {description}\n<b>Link:</b> {link}',
|
||||
'cover_image.jpg',
|
||||
caption=f'<b>Title:</b> <code>{title}</code>\n<b>Rating:</b> <code>{rating}</code>\n<b>is_free:</b> <code>{is_free}</code>\n<b>Price:</b> <code>{price}</code>\n<b>Package Name:</b> <code>{package_name}</code>\n<b>Genres:</b> <code>{genre}</code>\n<b>Developer:</b> <code>{developer}\n<b>Description:</b> {description}\n<b>Link:</b> {link}',
|
||||
)
|
||||
],
|
||||
)
|
||||
except Exception as e:
|
||||
await message.edit_text(format_exc(e))
|
||||
finally:
|
||||
if os.path.exists('coverImage.jpg'):
|
||||
os.remove('coverImage.jpg')
|
||||
if os.path.exists('cover_image.jpg'):
|
||||
os.remove('cover_image.jpg')
|
||||
|
||||
|
||||
@Client.on_message(filters.command('tsearch', prefix) & filters.me)
|
||||
@@ -232,7 +232,7 @@ async def tsearch(client: Client, message: Message):
|
||||
|
||||
result = response.json()
|
||||
|
||||
coverImage_url = result['results'][0]['thumbnail']
|
||||
cover_image_url = result['results'][0]['thumbnail']
|
||||
description = result['results'][0]['description']
|
||||
genre = result['results'][0]['genre']
|
||||
category = result['results'][0]['category']
|
||||
@@ -264,17 +264,17 @@ async def tsearch(client: Client, message: Message):
|
||||
content=all_results_content,
|
||||
)
|
||||
|
||||
if coverImage_url is not None:
|
||||
coverImage = requests.get(url=coverImage_url, timeout=10).content
|
||||
async with aiofiles.open('coverImage.jpg', mode='wb') as f:
|
||||
await f.write(coverImage)
|
||||
if cover_image_url is not None:
|
||||
cover_image = requests.get(url=cover_image_url, timeout=10).content
|
||||
async with aiofiles.open('cover_image.jpg', mode='wb') as f:
|
||||
await f.write(cover_image)
|
||||
|
||||
await message.delete()
|
||||
await client.send_media_group(
|
||||
chat_id,
|
||||
[
|
||||
InputMediaPhoto(
|
||||
'coverImage.jpg',
|
||||
'cover_image.jpg',
|
||||
caption=f"<b>Title:</b> <code>{title}</code>\n<b>Category:</b> <code>{category}</code>\n<b>Language:</b> <code>{language}</code>\n<b>Size:</b> <code>{size}</code>\n<b>Genres:</b> <code>{genre}</code>\n<b>Description:</b> {description}\n<b>Magnet Link:</b> <a href='{link_result}'>Click Here</a>\n<b>More Results:</b> <a href='{link_results}'>Click Here</a>",
|
||||
)
|
||||
],
|
||||
@@ -292,7 +292,7 @@ async def tsearch(client: Client, message: Message):
|
||||
chat_id,
|
||||
[
|
||||
InputMediaPhoto(
|
||||
'coverImage.jpg',
|
||||
'cover_image.jpg',
|
||||
caption=f"<b>Title:</b> <code>{title}</code>\n<b>Category:</b> <code>{category}</code>\n<b>Language:</b> <code>{language}</code>\n<b>Size:</b> <code>{size}</code>\n<b>Genres:</b> <code>{genre}</code>\n<b>Description:</b> {description}\n<b>Magnet Link:</b> <a href='{link_result}'>Click Here</a>",
|
||||
)
|
||||
],
|
||||
@@ -308,8 +308,8 @@ async def tsearch(client: Client, message: Message):
|
||||
except Exception as e:
|
||||
await message.edit_text(format_exc(e))
|
||||
finally:
|
||||
if os.path.exists('coverImage.jpg'):
|
||||
os.remove('coverImage.jpg')
|
||||
if os.path.exists('cover_image.jpg'):
|
||||
os.remove('cover_image.jpg')
|
||||
|
||||
|
||||
@Client.on_message(filters.command('stts', prefix) & filters.me)
|
||||
|
||||
Reference in New Issue
Block a user