Fixes
This commit is contained in:
parent
6af43f76b0
commit
421bd7c9e3
@ -5,6 +5,7 @@ from urllib.parse import urlencode
|
|||||||
|
|
||||||
ENV_FILE_TEMPLATE = """
|
ENV_FILE_TEMPLATE = """
|
||||||
POSTGRES_DB=tgvkbot
|
POSTGRES_DB=tgvkbot
|
||||||
|
POSTGRES_PASSWORD=postgres
|
||||||
BOT_TOKEN=%(tg_token)s
|
BOT_TOKEN=%(tg_token)s
|
||||||
VK_APP_ID=%(vk_app_id)s
|
VK_APP_ID=%(vk_app_id)s
|
||||||
"""
|
"""
|
||||||
|
10
telegram.py
10
telegram.py
@ -192,7 +192,10 @@ async def upload_attachment(msg, vk_user, file_id, peer_id, attachment_type, upl
|
|||||||
file_on_server = ujson.loads(await upload.text())
|
file_on_server = ujson.loads(await upload.text())
|
||||||
if msg.content_type != 'sticker':
|
if msg.content_type != 'sticker':
|
||||||
content['content'].close()
|
content['content'].close()
|
||||||
os.remove(os.path.join(content['temp_path'], content['file_name'] + content['custom_ext']))
|
try:
|
||||||
|
os.remove(os.path.join(content['temp_path'], content['file_name'] + content['custom_ext']))
|
||||||
|
except:
|
||||||
|
pass
|
||||||
if attachment_type == 'photo':
|
if attachment_type == 'photo':
|
||||||
save_options = {'server': file_on_server['server'], on_server_field: file_on_server[on_server_field],
|
save_options = {'server': file_on_server['server'], on_server_field: file_on_server[on_server_field],
|
||||||
'hash': file_on_server['hash']}
|
'hash': file_on_server['hash']}
|
||||||
@ -452,7 +455,10 @@ async def set_info(call: types.CallbackQuery):
|
|||||||
content = await get_content(dialog_info['photo'])
|
content = await get_content(dialog_info['photo'])
|
||||||
await bot.set_chat_photo(call.message.chat.id, content['content'])
|
await bot.set_chat_photo(call.message.chat.id, content['content'])
|
||||||
content['content'].close()
|
content['content'].close()
|
||||||
os.remove(os.path.join(content['temp_path'], content['file_name'] + content['custom_ext']))
|
try:
|
||||||
|
os.remove(os.path.join(content['temp_path'], content['file_name'] + content['custom_ext']))
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
if dialog_info['type'] == 'user':
|
if dialog_info['type'] == 'user':
|
||||||
dialog_info = await get_dialog_info(api, vk_chat_id, name_case='ins')
|
dialog_info = await get_dialog_info(api, vk_chat_id, name_case='ins')
|
||||||
|
Loading…
x
Reference in New Issue
Block a user