Llloooggg/Jarvis
1
0
Fork 0
mirror of https://github.com/Llloooggg/Jarvis.git synced 2026-03-06 03:56:23 +03:00
Code Issues 21 Packages Projects Releases Wiki Activity

Воссатновил работу сценариев

Browse Source
This commit is contained in:
Denis Podshivalov
2020-03-22 17:11:53 +03:00
parent 848847d335
commit ffa5038e45
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actions.py
View File

@@ -26,7 +26,7 @@ def send_mail(send_mail_config, tg_id):
msg = MIMEText(body, 'plain', 'utf-8') msg = MIMEText(body, 'plain', 'utf-8')
msg['Subject'] = Header(subject, 'utf-8') msg['Subject'] = Header(subject, 'utf-8')
# Отпавляем письмо # Отправляем письмо
server.starttls() server.starttls()
server.ehlo() server.ehlo()
server.login(username, password) server.login(username, password)

4
scenario_manager.py
View File

@@ -9,9 +9,9 @@ class Executor(Thread):
Thread.__init__(self) Thread.__init__(self)
self.tg_id = tg_id self.tg_id = tg_id
self.sceanrio_id = scenario.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.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 self.action_args = scenario.action_args
def execute(self): def execute(self):

2
telegram.py
View File

@@ -4,7 +4,7 @@ botToken = '1003282848:AAHM72fKodCByupZihiOdtTF1996fDsYB8A'
bot = telebot.TeleBot(botToken) 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'} # 'login:password@address:port'}