diff --git a/main.py b/main.py index 2658cec..2cb912b 100644 --- a/main.py +++ b/main.py @@ -10,6 +10,7 @@ keyboards.carts = data[4] payload, state_chat, id_chat = '', '', 2*10**9+6 internet_text, gadgets_text, games_text = '', '', '' +request_id, request_amount, request_desc, mail_text, mail_docs = '', '', '', '', '' last_request = time.time() print('main.py started!\n---------------------') @@ -18,6 +19,7 @@ def main(): global event, payload, state_chat, id_chat, states, news_types, mails, mute global internet_text, gadgets_text, games_text + global request_id, request_amount, request_desc, mail_text, mail_docs try: print('\nЛовлю события... Поймал {}'.format(event.type)) if event.type == VkBotEventType.MESSAGE_NEW: diff --git a/methods.py b/methods.py index 5897b48..d94c5c6 100644 --- a/methods.py +++ b/methods.py @@ -43,14 +43,22 @@ def isMember(group, id): def parse_docs(attachments): - docs_links = [] + links = [] for attach in attachments: type = attach['type'] object = attach[type] if type == 'doc': - url = object['url'] - docs_links.append(upload(url)) - return ', '.join(docs_links) + is_photo = True if object['type'] == 4 else False + if is_photo: + url = object['url'] + links.append(upload(url)) + elif type == 'photo': + url = object['sizes'][-1]['url'] + links.append(upload(url)) + elif type == 'video': + links.append('video{}_{}_{}'.format(object['owner_id'], object['id'], object['access_key'])) + return ', '.join(links) + def get_allow(): allow_dict, chats_arr, offset = dict(), True, 0