mirror of
https://github.com/Llloooggg/Jarvis.git
synced 2026-03-06 03:56:23 +03:00
Воссатновил работу сценариев
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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):
|
||||
|
||||
@@ -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'}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user