From 1b5ceb3c1ba1c2a1ebfd3c6ee3d293a2b06e1b07 Mon Sep 17 00:00:00 2001
From: UltraDesu <ultradesu@hexor.ru>
Date: Wed, 17 Jan 2018 16:43:10 +0300
Subject: [PATCH] Change project wide timezone to UTC.

---
 settings.ini_example |  8 +++++++-
 updater.py           | 22 +++++++++++++++++-----
 webhook/index.php    |  3 ++-
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/settings.ini_example b/settings.ini_example
index d7bfc8c..1940905 100644
--- a/settings.ini_example
+++ b/settings.ini_example
@@ -1,3 +1,9 @@
 [bot]
 telegram_key = 539154645:ASJDDHaseytrrl9mHzGuKBiqegHAxaRZxVw
-telegram_api = https://api.telegram.org/
\ No newline at end of file
+telegram_api = https://api.telegram.org/
+
+[mysql]
+mysql_user = root
+mysql_pass = 
+mysql_host = localhost
+mysql_db = test
\ No newline at end of file
diff --git a/updater.py b/updater.py
index c7ad32b..47f6c49 100644
--- a/updater.py
+++ b/updater.py
@@ -3,12 +3,22 @@
 import pymysql.cursors
 import urllib.request, json 
 import datetime as dt
+from configparser import ConfigParser
+import pytz
+
+parser = ConfigParser()
+parser.read('settings.ini')
+mysql_user = parser.get('mysql', 'mysql_user')
+mysql_host = parser.get('mysql', 'mysql_host')
+mysql_db = parser.get('mysql', 'mysql_db')
+mysql_pass = parser.get('mysql', 'mysql_pass')
 
 interval = '1 HOUR'
+interval = '1 MINUTE'
 # Connect to the database
-connection = pymysql.connect(host='localhost',
-                             user='root',
-                             db='test',
+connection = pymysql.connect(host=mysql_host,
+                             user=mysql_user,
+                             db=mysql_db,
                              cursorclass=pymysql.cursors.DictCursor)
 
 # If u_date which already stored older than fresh u_date
@@ -18,8 +28,9 @@ def check_updates(id, u_date):
     with urllib.request.urlopen(
         "http://api.rutracker.org/v1/get_tor_topic_data?by=topic_id&val="+id) as url:
         data = json.loads(url.read().decode())
-        last_check = dt.datetime.now()
-        new_u_date = dt.datetime.fromtimestamp(int(data['result'][id]['reg_time']))
+        last_check = dt.datetime.now(tz=pytz.utc)
+        new_u_date = dt.datetime.fromtimestamp(int(data['result'][id]['reg_time']), tz=pytz.utc)
+        u_date = pytz.utc.localize(u_date)
         if new_u_date > u_date:
             print("There is an update. Going to notify.")
 
@@ -36,6 +47,7 @@ try:
     with connection.cursor() as cursor:
         # Read a single record
         sql = "SELECT * FROM url WHERE last_check < DATE_SUB(NOW(), INTERVAL %s)" % interval
+        sql = "SELECT * FROM url"
         cursor.execute(sql)
         result = cursor.fetchall()
         for line in result:
diff --git a/webhook/index.php b/webhook/index.php
index 26307a9..cf77cbb 100644
--- a/webhook/index.php
+++ b/webhook/index.php
@@ -1,6 +1,7 @@
 <?php
 $config = parse_ini_file("../settings.ini");
-$dbh = new PDO('mysql:host=localhost;dbname=test', 'root');
+
+$dbh = new PDO('mysql:host='.$config['mysql_host'].';dbname='.$config['mysql_db'], $config['mysql_user']);
 
 $request = file_get_contents('php://input');
 $request = json_decode( $request, TRUE );