dm1sh/tgvkbot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(по возможности) Используем сообщения из ТГ при пересылке и реплае

Browse Source
This commit is contained in:
Sergey 2020-10-08 23:28:37 +03:00
parent 8ba6a4ea4c
commit f3d1d97d70
1 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
vk_messages.py
View File

@ -586,6 +586,18 @@ async def process_message(msg, token=None, is_multichat=None, vk_chat_id=None, u
header = f'<b>{name} @ {quote_html(full_chat["title"])}</b>' + '\n' header = f'<b>{name} @ {quote_html(full_chat["title"])}</b>' + '\n'
to_tg_chat = vkuser.owner.uid to_tg_chat = vkuser.owner.uid
# Логика реплая на сообщение, которое уже есть в чате
# Таким кейсом нельзя управлять. Может упасть
if not main_message:
if vk_msg.get('reply_message'):
reply_msg_in_db = Message.objects.filter(
vk_chat=vk_chat_id,
vk_id=vk_msg['reply_message']['id'],
tg_chat=to_tg_chat
).first()
if reply_msg_in_db:
main_message = reply_msg_in_db.tg_id
body_parts = [] body_parts = []
body = quote_html(vk_msg.get('text', '')) body = quote_html(vk_msg.get('text', ''))
@ -760,12 +772,32 @@ async def process_message(msg, token=None, is_multichat=None, vk_chat_id=None, u
if vk_msg.get('fwd_messages'): if vk_msg.get('fwd_messages'):
await bot.send_chat_action(to_tg_chat, ChatActions.TYPING) await bot.send_chat_action(to_tg_chat, ChatActions.TYPING)
for fwd_message in vk_msg['fwd_messages']: for fwd_message in vk_msg['fwd_messages']:
await process_message(msg, token=token, is_multichat=is_multichat, vk_chat_id=vk_chat_id, fwd_msgs_in_db = Message.objects.filter(
user_id=fwd_message['from_id'], vk_chat=vk_chat_id,
forward_settings=forward_settings, vk_msg_id=vk_msg_id, vkchat=vkchat, vk_id=fwd_message['id'],
full_msg={'items': [fwd_message]}, forwarded=True, tg_chat=to_tg_chat
main_message=header_message.message_id if header_message else None, )
known_users=known_users, force_disable_notify=disable_notify) if fwd_msgs_in_db:
for fwd_msg_in_db in fwd_msgs_in_db:
try:
await bot.forward_message(to_tg_chat, to_tg_chat, fwd_msg_in_db.tg_id,
disable_notification=disable_notify)
except:
await process_message(msg, token=token, is_multichat=is_multichat,
vk_chat_id=vk_chat_id,
user_id=fwd_message['from_id'],
forward_settings=forward_settings, vk_msg_id=vk_msg_id,
vkchat=vkchat,
full_msg={'items': [fwd_message]}, forwarded=True,
main_message=header_message.message_id if header_message else None,
known_users=known_users, force_disable_notify=disable_notify)
else:
await process_message(msg, token=token, is_multichat=is_multichat, vk_chat_id=vk_chat_id,
user_id=fwd_message['from_id'],
forward_settings=forward_settings, vk_msg_id=vk_msg_id, vkchat=vkchat,
full_msg={'items': [fwd_message]}, forwarded=True,
main_message=header_message.message_id if header_message else None,
known_users=known_users, force_disable_notify=disable_notify)
async def get_name(identifier, api): async def get_name(identifier, api):