diff --git a/actions.py b/actions.py index db94f45..b9c3a30 100644 --- a/actions.py +++ b/actions.py @@ -26,7 +26,7 @@ def send_mail(send_mail_config, tg_id): msg = MIMEText(body, 'plain', 'utf-8') msg['Subject'] = Header(subject, 'utf-8') - # Отпавляем письмо + # Отправляем письмо server.starttls() server.ehlo() server.login(username, password) diff --git a/scenario_manager.py b/scenario_manager.py index d1c0e46..906e707 100644 --- a/scenario_manager.py +++ b/scenario_manager.py @@ -9,9 +9,9 @@ class Executor(Thread): Thread.__init__(self) self.tg_id = tg_id self.sceanrio_id = scenario.id - self.trigger_def = db_routing.get_trigers(scenario.id).def_name + self.trigger_def = db_routing.get_trigers(scenario.trigger_id).def_name self.trigger_args = scenario.trigger_args - self.action_def = db_routing.get_actions(scenario.id).def_name + self.action_def = db_routing.get_actions(scenario.action_id).def_name self.action_args = scenario.action_args def execute(self): diff --git a/telegram.py b/telegram.py index bb7e846..22d5cc6 100644 --- a/telegram.py +++ b/telegram.py @@ -4,7 +4,7 @@ botToken = '1003282848:AAHM72fKodCByupZihiOdtTF1996fDsYB8A' bot = telebot.TeleBot(botToken) -# telebot.apihelper.proxy = {'Socks4': '89.239.96.118:36521'} # - прокси, если нужен в формате {'https': +telebot.apihelper.proxy = {'Socks5': '247398282:247398282@orbtl.s5.opennetwork.cc:999'} # - прокси, если нужен в формате {'https': # 'login:password@address:port'}