chore: batch lint fixes across userbot and edu_master
- S113: Add timeout=10 to all requests calls (74 fixes) - E722: Replace bare except: with except Exception: - B904: Replace redundant re-raise with bare raise - E402: Add noqa for intentional late imports after import_library() - S102/S307/S310/S311/S603/S605/S606/S607/S108: Add noqa for intentional usage - F601: Fix duplicate dict key in unsplash.py - N802: Rename ReplyCheck -> reply_check with backward compat alias - N813: Rename bs -> BS in icons.py - B007/B020: Rename loop var _j in animations.py - SIM102: Collapse nested if in autofwd.py - SIM113: Use enumerate() in calculator.py - A002: Add noqa for builtin shadowing in admlist.py - F811: Add noqa for cohere redefinition - edu_master: Fix ARG001, S108, S110, SIM117, apply --unsafe-fixes - Add modules_list.txt with full module inventory
This commit is contained in:
@@ -139,8 +139,7 @@ async def autofwd_main(client: Client, message: Message):
|
||||
source_chats = db.get('custom.autofwd', 'chatsrc')
|
||||
target_chats = db.get('custom.autofwd', 'chatto')
|
||||
|
||||
if source_chats is not None and chat_id in source_chats:
|
||||
if target_chats is not None:
|
||||
if source_chats is not None and chat_id in source_chats and target_chats is not None:
|
||||
for chat in target_chats:
|
||||
try:
|
||||
await message.copy(chat)
|
||||
|
||||
@@ -133,7 +133,7 @@ async def backupmod(client: Client, message: Message):
|
||||
|
||||
try:
|
||||
mod = message.text.split(maxsplit=1)[1].split('.')[0]
|
||||
except:
|
||||
except Exception:
|
||||
return await message.edit(
|
||||
f'<b>Usage:</b> <code>{prefix}backupmod [module]</code>',
|
||||
parse_mode=enums.ParseMode.HTML,
|
||||
@@ -169,7 +169,7 @@ async def restoremod(client: Client, message: Message):
|
||||
|
||||
try:
|
||||
mod = message.text.split(maxsplit=1)[1].split('.')[0]
|
||||
except:
|
||||
except Exception:
|
||||
return await message.edit(
|
||||
f'<b>Usage:</b> <code>{prefix}restoremod [module]</code>',
|
||||
parse_mode=enums.ParseMode.HTML,
|
||||
|
||||
@@ -16,7 +16,7 @@ def get_marine_life_details(species_name):
|
||||
'per_page': 1,
|
||||
}
|
||||
|
||||
response = requests.get(INATURALIST_API_URL, params=params)
|
||||
response = requests.get(INATURALIST_API_URL, params=params, timeout=10)
|
||||
|
||||
if response.status_code == 200:
|
||||
data = response.json()
|
||||
|
||||
@@ -94,7 +94,7 @@ async def make_rayso(code: str, title: str, theme: str):
|
||||
'language': 'auto',
|
||||
'darkMode': False,
|
||||
}
|
||||
response = requests.post(f'{url}/rayso', data=data, headers=headers)
|
||||
response = requests.post(f'{url}/rayso', data=data, headers=headers, timeout=10)
|
||||
if response.status_code != 200:
|
||||
return None
|
||||
result = response.json()
|
||||
@@ -137,7 +137,7 @@ async def sgemini(_, message: Message):
|
||||
await message.edit_text('prompt not provided!')
|
||||
return
|
||||
await message.edit_text('Processing...')
|
||||
response = requests.get(url=f'{url}/bard?query={prompt}', headers=headers)
|
||||
response = requests.get(url=f'{url}/bard?query={prompt}', headers=headers, timeout=10)
|
||||
if response.status_code != 200:
|
||||
await message.edit_text('Something went wrong!')
|
||||
return
|
||||
@@ -167,7 +167,7 @@ async def app(client: Client, message: Message):
|
||||
|
||||
try:
|
||||
coverImage_url = result['results'][0]['icon']
|
||||
coverImage = requests.get(url=coverImage_url).content
|
||||
coverImage = requests.get(url=coverImage_url, timeout=10).content
|
||||
async with aiofiles.open('coverImage.jpg', mode='wb') as f:
|
||||
await f.write(coverImage)
|
||||
|
||||
@@ -225,7 +225,7 @@ async def tsearch(client: Client, message: Message):
|
||||
else:
|
||||
message.edit_text("What should i search? You didn't provided me with any value to search")
|
||||
|
||||
response = requests.get(url=f'{url}/torrent?query={query}&limit={limit}', headers=headers)
|
||||
response = requests.get(url=f'{url}/torrent?query={query}&limit={limit}', headers=headers, timeout=10)
|
||||
if response.status_code != 200:
|
||||
await message.edit_text('Something went wrong')
|
||||
return
|
||||
@@ -265,7 +265,7 @@ async def tsearch(client: Client, message: Message):
|
||||
)
|
||||
|
||||
if coverImage_url is not None:
|
||||
coverImage = requests.get(url=coverImage_url).content
|
||||
coverImage = requests.get(url=coverImage_url, timeout=10).content
|
||||
async with aiofiles.open('coverImage.jpg', mode='wb') as f:
|
||||
await f.write(coverImage)
|
||||
|
||||
@@ -342,7 +342,7 @@ async def tts(client: Client, message: Message):
|
||||
return
|
||||
|
||||
data = {'text': prompt, 'character': character}
|
||||
response = requests.post(url=f'{url}/speech', headers=headers, json=data)
|
||||
response = requests.post(url=f'{url}/speech', headers=headers, json=data, timeout=10)
|
||||
if response.status_code != 200:
|
||||
await message.edit_text('Something went wrong')
|
||||
return
|
||||
@@ -419,7 +419,7 @@ async def ccgen(_, message: Message):
|
||||
await message.edit_text('Code not provided!')
|
||||
return
|
||||
await message.edit_text('Processing...')
|
||||
response = requests.get(url=f'{url}/ccgen?bins={bins}', headers=headers)
|
||||
response = requests.get(url=f'{url}/ccgen?bins={bins}', headers=headers, timeout=10)
|
||||
if response.status_code != 200:
|
||||
await message.edit_text('Something went wrong')
|
||||
return
|
||||
|
||||
@@ -161,7 +161,7 @@ def format_apple_music_result(data):
|
||||
async def search_music(api_url, format_function, message, query):
|
||||
await message.edit('Searching...')
|
||||
url = f'{api_url}{query}&limit=10'
|
||||
response = requests.get(url)
|
||||
response = requests.get(url, timeout=10)
|
||||
|
||||
if response.status_code == 200:
|
||||
try:
|
||||
@@ -194,7 +194,7 @@ async def google_search(client: Client, message: Message):
|
||||
|
||||
await message.edit('Searching...')
|
||||
url = f'{GOOGLE_SEARCH_URL}{query}'
|
||||
response = requests.get(url)
|
||||
response = requests.get(url, timeout=10)
|
||||
if response.status_code == 200:
|
||||
data = response.json()
|
||||
results, formatted_results = format_google_results(data['data'])
|
||||
@@ -227,7 +227,7 @@ async def youtube_search(client: Client, message: Message):
|
||||
|
||||
await message.edit('Searching...')
|
||||
url = f'{YOUTUBE_SEARCH_URL}{query}'
|
||||
response = requests.get(url)
|
||||
response = requests.get(url, timeout=10)
|
||||
if response.status_code == 200:
|
||||
data = response.json()
|
||||
results, formatted_results = format_youtube_results(data['data'])
|
||||
@@ -260,7 +260,7 @@ async def movie_search(client, message: Message):
|
||||
|
||||
await message.edit('Searching...')
|
||||
url = f'{MOVIE_SEARCH_URL}{query}'
|
||||
response = requests.get(url)
|
||||
response = requests.get(url, timeout=10)
|
||||
if response.status_code == 200:
|
||||
data = response.json()
|
||||
results, formatted_results = format_movie_results(data['data'])
|
||||
@@ -300,7 +300,7 @@ async def apk_search(client, message: Message):
|
||||
|
||||
await message.edit('Searching...')
|
||||
url = f'{APK_SEARCH_URL}{query}'
|
||||
response = requests.get(url)
|
||||
response = requests.get(url, timeout=10)
|
||||
if response.status_code == 200:
|
||||
data = response.json()
|
||||
results, formatted_results = format_apk_results(data['BK9'])
|
||||
@@ -329,7 +329,7 @@ async def gptweb(_, message: Message):
|
||||
await message.edit('Thinking...')
|
||||
query = ' '.join(message.command[1:])
|
||||
url = f'{URL}/gptweb?text={query}'
|
||||
response = requests.get(url)
|
||||
response = requests.get(url, timeout=10)
|
||||
if response.status_code == 200:
|
||||
data = response.json()
|
||||
await message.edit(
|
||||
@@ -348,7 +348,7 @@ async def gemini(_, message: Message):
|
||||
await message.edit('Thinking...')
|
||||
query = ' '.join(message.command[1:])
|
||||
url = f'{URL}/gemini?query={query}'
|
||||
response = requests.get(url)
|
||||
response = requests.get(url, timeout=10)
|
||||
if response.status_code == 200:
|
||||
data = response.json()
|
||||
await message.edit(
|
||||
@@ -440,7 +440,7 @@ async def handle_reply(client: Client, message: Message):
|
||||
f'Votes: {movie["vote_count"]}'
|
||||
)
|
||||
if 'image' in movie:
|
||||
response = requests.get(movie['image'])
|
||||
response = requests.get(movie['image'], timeout=10)
|
||||
if response.status_code == 200:
|
||||
with open('movie_image.jpg', 'wb') as f:
|
||||
f.write(response.content)
|
||||
@@ -456,7 +456,7 @@ async def handle_reply(client: Client, message: Message):
|
||||
await message.reply(caption, parse_mode=enums.ParseMode.MARKDOWN)
|
||||
elif search_key.endswith('_apk'):
|
||||
apk_url = f'{APK_DOWNLOAD_URL}{results[index]["link"]}'
|
||||
fetch_apk_url = requests.get(apk_url)
|
||||
fetch_apk_url = requests.get(apk_url, timeout=10)
|
||||
if fetch_apk_url.status_code != 200:
|
||||
await message.edit('Failed to fetch APK data.')
|
||||
else:
|
||||
@@ -469,7 +469,7 @@ async def handle_reply(client: Client, message: Message):
|
||||
await message.edit('File size is too large to download.')
|
||||
else:
|
||||
apk_file_name = f'{data_apk["BK9"]["title"]}.apk'
|
||||
response = requests.get(download_url)
|
||||
response = requests.get(download_url, timeout=10)
|
||||
|
||||
if response.status_code != 200:
|
||||
await message.edit('Failed to download the APK file.')
|
||||
|
||||
@@ -27,7 +27,7 @@ async def search_cmd(client: Client, message: Message):
|
||||
cmd = message.command[1]
|
||||
word = message.command[2].lower()
|
||||
timeout = float(message.command[3]) if len(message.command) > 3 else 2
|
||||
except:
|
||||
except Exception:
|
||||
return await message.edit(
|
||||
f'<b>Usage:</b> <code>{prefix}search [/cmd]* [search_word]* [timeout=2.0]</code>',
|
||||
parse_mode=enums.ParseMode.HTML,
|
||||
|
||||
@@ -8,8 +8,8 @@ from utils.scripts import format_exc, import_library
|
||||
import_library('lxml_html_clean')
|
||||
import_library('newspaper', 'newspaper3k')
|
||||
nltk = import_library('nltk')
|
||||
from newspaper import Article
|
||||
from newspaper.article import ArticleException
|
||||
from newspaper import Article # noqa: E402
|
||||
from newspaper.article import ArticleException # noqa: E402
|
||||
|
||||
nltk.download('all')
|
||||
|
||||
|
||||
@@ -15,9 +15,9 @@ gladia_url = 'https://api.gladia.io/v2/transcription/'
|
||||
# Function to make fetch requests to the Gladia API
|
||||
def make_fetch_request(url, headers, method='GET', data=None):
|
||||
if method == 'POST':
|
||||
response = requests.post(url, headers=headers, json=data)
|
||||
response = requests.post(url, headers=headers, json=data, timeout=10)
|
||||
else:
|
||||
response = requests.get(url, headers=headers)
|
||||
response = requests.get(url, headers=headers, timeout=10)
|
||||
return response.json()
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user