Skip to content
This repository has been archived by the owner on Jun 15, 2022. It is now read-only.

Commit

Permalink
Фикс глобальных перменных и парсинга документов
Browse files Browse the repository at this point in the history
- Переменные, содержащие id, сумму оплаты, описание для запроса оплаты и содержащие текст и доки для рассылки, переведены в глобальное состояние.
- В документах кроме фото-доков теперь парсятся обычные видео и фото, уже загружённые ВКонтакте.
  • Loading branch information
PaveTranquil committed Jun 3, 2020
1 parent 066c3fa commit 02cb010
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
2 changes: 2 additions & 0 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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---------------------')
Expand All @@ -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:
Expand Down
16 changes: 12 additions & 4 deletions methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 02cb010

Please sign in to comment.