From ffa5038e45918c42931ab01659b19a0e759e5b80 Mon Sep 17 00:00:00 2001 From: burzuf Date: Sun, 22 Mar 2020 17:11:53 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D0=BE=D1=81=D1=81=D0=B0=D1=82=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=B8=D0=BB=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=83?= =?UTF-8?q?=20=D1=81=D1=86=D0=B5=D0=BD=D0=B0=D1=80=D0=B8=D0=B5=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- actions.py | 2 +- scenario_manager.py | 4 ++-- telegram.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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'}