From a6d7903c57b79ad1985d738958757d508a9e750e Mon Sep 17 00:00:00 2001
From: Alexandr <ab@sun.hexor.ru>
Date: Sat, 26 Jan 2019 14:31:01 +0300
Subject: [PATCH] Add +min feature to alert

---
 database.py |  3 ++-
 worker.py   | 12 +++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/database.py b/database.py
index a44b78d..aa0ce97 100755
--- a/database.py
+++ b/database.py
@@ -109,6 +109,8 @@ class DataBase:
 
     def add_alert(self, user_id, conf_id, alert_time, message):
         date = int(dt.datetime.now().strftime("%s"))
+        if len(alert_time) < 4:
+            alert_time = (dt.datetime.now() + dt.timedelta(minutes=int(alert_time[1:]))).strftime("%H%M")
         sql = """INSERT OR IGNORE INTO 
         alert('conf_id', 'user_id', 'created', 'time', 'message') 
         VALUES ('%s','%s','%s','%s','%s')""" % (
@@ -118,7 +120,6 @@ class DataBase:
             alert_time,
             message
         )
-        print('ALERT: ', sql)
         self.execute(sql)
 
     def get_top(self, user_id, conf_id, limit=10):
diff --git a/worker.py b/worker.py
index d7bc8c9..19a9720 100755
--- a/worker.py
+++ b/worker.py
@@ -44,9 +44,16 @@ class MessageWorker:
     def isTime(self, string):
         try:
             time.strptime(string, '%H%M')
-            return True
+            return string
         except ValueError:
-            return False
+            pass
+        try:
+            if (int(string[1:]) > 0) and (string[0] == '+') and (len(string[1:]) < 3):
+              return string
+        except:
+            pass
+        return False
+
 
     def colorize(self, code):
         code_tag = code[code.rfind('#') + 1:]
@@ -209,7 +216,6 @@ class MessageWorker:
                 chat_title = msg['message']['chat']['title']
                 self.db.add_conf(conf_id, chat_title)
                 if len(msg['message']['text'][6:]) < 10000:
-                    print(msg['message']['text'][6:])
                     try:
                         self.colorize(msg['message']['text'][6:])
                     except Exception as e: