Don't re-define functions in a loop

This commit is contained in:
blank X 2020-11-29 11:12:38 +07:00
parent 0508585194
commit af06deebc1
2 changed files with 34 additions and 32 deletions

View File

@ -8,21 +8,7 @@ from .. import config, help_dict, log_errors, session, slave, public_log_errors
help_text = '' help_text = ''
try: def _generate(i):
resp = requests.get('https://nekos.life/api/v2/endpoints')
json = resp.json()
except Exception:
logging.exception('Cannot connect to nekos.life')
else:
for i in json:
_, i = i.split(' ', 1)
i = i.strip()
if i.startswith('/api/v2/img/<\''):
for i in os.path.basename(i)[1:-1].split(', '):
i = i[1:-1]
if 'v3' in i:
continue
def _generate(i):
@Client.on_message(~filters.sticker & ~filters.via_bot & ~filters.edited & filters.me & filters.command(i, prefixes=config['config']['prefixes'])) @Client.on_message(~filters.sticker & ~filters.via_bot & ~filters.edited & filters.me & filters.command(i, prefixes=config['config']['prefixes']))
@log_errors @log_errors
@public_log_errors @public_log_errors
@ -42,6 +28,21 @@ else:
except Forbidden: except Forbidden:
await to_reply.reply_text(result.send_message.message, parse_mode=None) await to_reply.reply_text(result.send_message.message, parse_mode=None)
return func return func
try:
resp = requests.get('https://nekos.life/api/v2/endpoints')
json = resp.json()
except Exception:
logging.exception('Cannot connect to nekos.life')
else:
for i in json:
_, i = i.split(' ', 1)
i = i.strip()
if i.startswith('/api/v2/img/<\''):
for i in os.path.basename(i)[1:-1].split(', '):
i = i[1:-1]
if 'v3' in i:
continue
func = _generate(i) func = _generate(i)
globals()[i] = func globals()[i] = func
locals()[i] = func locals()[i] = func

View File

@ -5,6 +5,19 @@ from pyrogram import Client, filters
from pyrogram.types import InputTextMessageContent, InlineQueryResultArticle, InlineQueryResultPhoto, InlineQueryResultAnimation from pyrogram.types import InputTextMessageContent, InlineQueryResultArticle, InlineQueryResultPhoto, InlineQueryResultAnimation
from .. import log_errors, session, app_user_ids from .. import log_errors, session, app_user_ids
def _generate(i):
@Client.on_inline_query(filters.regex(f'^{i}$'))
@log_errors
async def func(client, inline_query):
if inline_query.from_user.id not in app_user_ids:
await inline_query.answer([InlineQueryResultArticle('...no', InputTextMessageContent('...no'))], cache_time=3600, is_personal=True)
return
async with session.get(f'https://nekos.life/api/v2/img/{i}') as resp:
url = (await resp.json())['url']
call = InlineQueryResultAnimation if '.gif' == os.path.splitext(url)[1] else InlineQueryResultPhoto
await inline_query.answer([call(url, caption=url, parse_mode=None)], cache_time=0)
return func
try: try:
resp = requests.get('https://nekos.life/api/v2/endpoints') resp = requests.get('https://nekos.life/api/v2/endpoints')
json = resp.json() json = resp.json()
@ -19,18 +32,6 @@ else:
i = i[1:-1] i = i[1:-1]
if 'v3' in i: if 'v3' in i:
continue continue
def _generate(i):
@Client.on_inline_query(filters.regex(f'^{i}$'))
@log_errors
async def func(client, inline_query):
if inline_query.from_user.id not in app_user_ids:
await inline_query.answer([InlineQueryResultArticle('...no', InputTextMessageContent('...no'))], cache_time=3600, is_personal=True)
return
async with session.get(f'https://nekos.life/api/v2/img/{i}') as resp:
url = (await resp.json())['url']
call = InlineQueryResultAnimation if '.gif' == os.path.splitext(url)[1] else InlineQueryResultPhoto
await inline_query.answer([call(url, caption=url, parse_mode=None)], cache_time=0)
return func
func = _generate(i) func = _generate(i)
globals()[i] = func globals()[i] = func
locals()[i] = func locals()[i] = func