diff --git a/bot.py b/bot.py index 1c18e64..a41030c 100644 --- a/bot.py +++ b/bot.py @@ -1,25 +1,20 @@ +import cherrypy import logging import os import re +import redis import requests import telebot import threading import time import traceback import ujson -from telebot import types - -import redis import vk import wget from PIL import Image - from telebot import types -import cherrypy - from credentials import token, vk_app_id, bot_url, local_port - from vk_messages import VkMessage, VkPolling vk_threads = {} @@ -183,7 +178,7 @@ def callback_buttons(call): bot.send_message(call.from_user.id, 'Вы в беседе {}'.format(chat['title']), parse_mode='HTML').wait() - currentchat[str(call.from_user.id)] = call.data + currentchat[str(call.from_user.id)] = {'title': chat['title'], 'id': 'group' + str(chat['chat_id'])} elif call.data.lstrip('-').isdigit(): session = VkMessage(vk_tokens.get(str(call.from_user.id))).session if '-' in call.data: @@ -696,7 +691,6 @@ def reply_text(message): # bot.polling(none_stop=True) class WebhookServer(object): - # index равнозначно /, т.к. отсутствию части после ip-адреса (грубо говоря) @cherrypy.expose def index(self):