Fix missing header message in telegram connected chats

This commit is contained in:
Kylmakalle 2019-03-25 19:58:15 +03:00
parent fa6e3d14c8
commit 5b5e603b85

View File

@ -530,6 +530,7 @@ async def process_message(msg, token=None, is_multichat=None, vk_chat_id=None, u
vk_msg_id = vk_msg_id or msg.msg_id vk_msg_id = vk_msg_id or msg.msg_id
user_id = user_id or msg.user_id user_id = user_id or msg.user_id
known_users = known_users or {} known_users = known_users or {}
header_message = None
vkuser = VkUser.objects.filter(token=token).first() vkuser = VkUser.objects.filter(token=token).first()
if not vkuser: if not vkuser:
@ -725,7 +726,8 @@ async def process_message(msg, token=None, is_multichat=None, vk_chat_id=None, u
user_id=fwd_message['user_id'], user_id=fwd_message['user_id'],
forward_settings=forward_settings, vk_msg_id=vk_msg_id, vkchat=vkchat, forward_settings=forward_settings, vk_msg_id=vk_msg_id, vkchat=vkchat,
full_msg={'items': [fwd_message]}, forwarded=True, full_msg={'items': [fwd_message]}, forwarded=True,
main_message=header_message.message_id, known_users=known_users) main_message=header_message.message_id if header_message else None,
known_users=known_users)
async def get_name(identifier, api): async def get_name(identifier, api):
@ -1015,6 +1017,9 @@ async def vk_polling(vkuser: VkUser):
break break
except aiohttp.client_exceptions.ServerDisconnectedError: except aiohttp.client_exceptions.ServerDisconnectedError:
log.warning('Longpoll server disconnected id: ' + str(vkuser.pk)) log.warning('Longpoll server disconnected id: ' + str(vkuser.pk))
except VkAPIError:
# Invalid/Inaccessible token
pass
except Exception: except Exception:
log.exception(msg='Error in longpolling', exc_info=True) log.exception(msg='Error in longpolling', exc_info=True)
asyncio.sleep(5) asyncio.sleep(5)