mirror of
https://github.com/Llloooggg/Jarvis.git
synced 2026-03-06 03:56:23 +03:00
Исправил ошибку при повторной регистрации
This commit is contained in:
@@ -69,13 +69,13 @@ def workshop():
|
||||
actionArgs)
|
||||
return redirect(url_for('workshop'))
|
||||
|
||||
# if 'NewScenarioName' in request.form:
|
||||
|
||||
if 'TGUsername' in request.form:
|
||||
new_tg_username = request.form['TGUsername']
|
||||
db_routing.tg_username_update(current_user.get_id(), new_tg_username)
|
||||
return redirect(url_for('workshop'))
|
||||
|
||||
# if 'NewScenarioName' in request.form:
|
||||
|
||||
triggers_list = db_routing.get_trigers()
|
||||
actions_list = db_routing.get_actions()
|
||||
user_scripts_list = db_routing.get_user_scripts(current_user.get_id())
|
||||
|
||||
13
actions.py
13
actions.py
@@ -1,10 +1,10 @@
|
||||
# Парсер почты
|
||||
import datetime
|
||||
import imaplib
|
||||
import time
|
||||
import email
|
||||
import imaplib
|
||||
# будильник
|
||||
import threading
|
||||
import time
|
||||
|
||||
# То, что нужно будет передавать функциям
|
||||
|
||||
@@ -20,11 +20,14 @@ sec_Alarm_Clock=0
|
||||
gmail_user = '' # Login
|
||||
gmail_pass = '' # Password
|
||||
|
||||
|
||||
# Сами функции
|
||||
|
||||
# Будильник
|
||||
def alarm_clock(year_Alarm_Clock, month_Alarm_Clock, day_Alarm_Clock, hour_Alarm_Clock, min_Alarm_Clock, sec_Alarm_Clock):
|
||||
dt = datetime.datetime(year_Alarm_Clock, month_Alarm_Clock, day_Alarm_Clock, hour_Alarm_Clock, min_Alarm_Clock, sec_Alarm_Clock)
|
||||
def alarm_clock(year_Alarm_Clock, month_Alarm_Clock, day_Alarm_Clock, hour_Alarm_Clock, min_Alarm_Clock,
|
||||
sec_Alarm_Clock):
|
||||
dt = datetime.datetime(year_Alarm_Clock, month_Alarm_Clock, day_Alarm_Clock, hour_Alarm_Clock, min_Alarm_Clock,
|
||||
sec_Alarm_Clock)
|
||||
diff = (dt - datetime.datetime.now()).total_seconds()
|
||||
try:
|
||||
time.sleep(diff)
|
||||
@@ -62,7 +65,6 @@ def check_email(gmail_user, gmail_pass):
|
||||
time.sleep(15) # частота проверки нового письма
|
||||
|
||||
|
||||
|
||||
# Чтобы запустить будильник 1, Парсер 2
|
||||
Mode = 2
|
||||
|
||||
@@ -81,6 +83,5 @@ if __name__ == '__main__':
|
||||
if Mode == 2:
|
||||
check_email(gmail_user, gmail_pass)
|
||||
|
||||
|
||||
# сценарии должны хранить логины и пароль
|
||||
# запилить бота, возврат темы и отправителя в словаре.
|
||||
|
||||
@@ -56,7 +56,7 @@ class Scenario(db.Model):
|
||||
|
||||
|
||||
def add_user(user_name, passw_hash):
|
||||
if not get_user(user_name):
|
||||
if not get_user(username=user_name):
|
||||
new_user = User(username=user_name, password=passw_hash)
|
||||
db.session.add(new_user)
|
||||
db.session.commit()
|
||||
|
||||
Reference in New Issue
Block a user