|
@@ -6,12 +6,18 @@ import time
|
|
|
import settings
|
|
import settings
|
|
|
from pprint import pprint, pformat
|
|
from pprint import pprint, pformat
|
|
|
|
|
|
|
|
|
|
+debug = False
|
|
|
|
|
+
|
|
|
|
|
+def dprint(text):
|
|
|
|
|
+ if debug:
|
|
|
|
|
+ print(text)
|
|
|
|
|
+
|
|
|
|
|
|
|
|
def send_notification(maintainer, player, property, old_value, new_value):
|
|
def send_notification(maintainer, player, property, old_value, new_value):
|
|
|
name = _name(maintainer, player)
|
|
name = _name(maintainer, player)
|
|
|
- message = f"{name} [{player}] property '{property}' changed from {old_value} to {new_value}"
|
|
|
|
|
|
|
+ message = f"[{name} [{player}]](https://www.torn.com/profiles.php?XID={player}) property '{property}' changed from {old_value} to {new_value}"
|
|
|
|
|
+ print(message)
|
|
|
_send(maintainer, message)
|
|
_send(maintainer, message)
|
|
|
- conn.close()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _name(maintainer, player):
|
|
def _name(maintainer, player):
|
|
@@ -41,14 +47,14 @@ def _send(maintainer, message):
|
|
|
message_json = {"content": message[:2000]}
|
|
message_json = {"content": message[:2000]}
|
|
|
response = requests.post(discord, json=message_json)
|
|
response = requests.post(discord, json=message_json)
|
|
|
if response.status_code in [200, 204]:
|
|
if response.status_code in [200, 204]:
|
|
|
- print("Webhook executed")
|
|
|
|
|
|
|
+ dprint("Webhook executed")
|
|
|
time.sleep(1)
|
|
time.sleep(1)
|
|
|
else:
|
|
else:
|
|
|
- print("status code {}: {}".format(response.status_code, response.content.decode("utf-8")))
|
|
|
|
|
|
|
+ dprint("status code {}: {}".format(response.status_code, response.content.decode("utf-8")))
|
|
|
time.sleep(10)
|
|
time.sleep(10)
|
|
|
|
|
|
|
|
def update_value(maintainer, player, property, new_value):
|
|
def update_value(maintainer, player, property, new_value):
|
|
|
- print(f"update_value({maintainer}, {player}, {property}, {new_value})")
|
|
|
|
|
|
|
+ dprint(f"update_value({maintainer}, {player}, {property}, {new_value})")
|
|
|
query = """INSERT OR REPLACE INTO player (maintainer, player, property, value)
|
|
query = """INSERT OR REPLACE INTO player (maintainer, player, property, value)
|
|
|
VALUES (?, ?, ?, ?)"""
|
|
VALUES (?, ?, ?, ?)"""
|
|
|
conn = sqlite3.connect(settings.db_path + '/slork.sqlite')
|
|
conn = sqlite3.connect(settings.db_path + '/slork.sqlite')
|
|
@@ -59,7 +65,7 @@ def update_value(maintainer, player, property, new_value):
|
|
|
conn.close()
|
|
conn.close()
|
|
|
|
|
|
|
|
def update_missing_value(maintainer, player, property, value):
|
|
def update_missing_value(maintainer, player, property, value):
|
|
|
- print(f"update_missing_value({maintainer}, {player}, {property}, {value})")
|
|
|
|
|
|
|
+ dprint(f"update_missing_value({maintainer}, {player}, {property}, {value})")
|
|
|
query = """INSERT OR REPLACE INTO player (maintainer, player, property, value)
|
|
query = """INSERT OR REPLACE INTO player (maintainer, player, property, value)
|
|
|
VALUES (?, ?, ?, ?);"""
|
|
VALUES (?, ?, ?, ?);"""
|
|
|
conn = sqlite3.connect(settings.db_path + '/slork.sqlite')
|
|
conn = sqlite3.connect(settings.db_path + '/slork.sqlite')
|
|
@@ -90,17 +96,19 @@ def cron():
|
|
|
messages = ''
|
|
messages = ''
|
|
|
for player in players:
|
|
for player in players:
|
|
|
# Rows for this maintainer
|
|
# Rows for this maintainer
|
|
|
- print(f"{player['maintainer']} - {player['api']} - {player['player']} - {player['property']}")
|
|
|
|
|
|
|
+ dprint(f"{player['maintainer']} - {player['api']} - {player['player']} - {player['property']}")
|
|
|
url = f"https://api.torn.com/user/{player['player']}?selections=personalstats,basic,crimes,profile&key={player['api']}"
|
|
url = f"https://api.torn.com/user/{player['player']}?selections=personalstats,basic,crimes,profile&key={player['api']}"
|
|
|
- print(url)
|
|
|
|
|
|
|
+ dprint(url)
|
|
|
response = requests.get(url)
|
|
response = requests.get(url)
|
|
|
player_json = None
|
|
player_json = None
|
|
|
- print(response.text[:10])
|
|
|
|
|
|
|
+ dprint(response.text[:10])
|
|
|
if response and response.text:
|
|
if response and response.text:
|
|
|
player_json = json.loads(response.text)
|
|
player_json = json.loads(response.text)
|
|
|
# pprint(faction_json)
|
|
# pprint(faction_json)
|
|
|
|
|
+ if not player_json:
|
|
|
|
|
+ continue
|
|
|
if 'error' in player_json:
|
|
if 'error' in player_json:
|
|
|
- print(f"maintainer: {player['maintainer']}")
|
|
|
|
|
|
|
+ dprint(f"{player['maintainer']}")
|
|
|
pprint(player_json)
|
|
pprint(player_json)
|
|
|
_send(player['maintainer'], '```'+pformat(player_json)+'```')
|
|
_send(player['maintainer'], '```'+pformat(player_json)+'```')
|
|
|
break
|
|
break
|
|
@@ -141,7 +149,7 @@ def cron():
|
|
|
if messages:
|
|
if messages:
|
|
|
messages += '\n'
|
|
messages += '\n'
|
|
|
name = _name(player['maintainer'], player['player'])
|
|
name = _name(player['maintainer'], player['player'])
|
|
|
- messages += f"{name} [{player['player']}] property '{property}' changed from {p_row['value']} to {new_value}"
|
|
|
|
|
|
|
+ messages += f"[{name} [{player['player']}]](https://www.torn.com/profiles.php?XID={player['player']}) property '{property}' changed from {p_row['value']} to {new_value}"
|
|
|
# send_notification(player['maintainer'], player['player'], property, p_row['value'], new_value)
|
|
# send_notification(player['maintainer'], player['player'], property, p_row['value'], new_value)
|
|
|
update_value(player['maintainer'], player['player'], property, new_value)
|
|
update_value(player['maintainer'], player['player'], property, new_value)
|
|
|
new_properties = []
|
|
new_properties = []
|
|
@@ -163,11 +171,11 @@ def cron():
|
|
|
value = player_json[item]
|
|
value = player_json[item]
|
|
|
except KeyError:
|
|
except KeyError:
|
|
|
value = 0
|
|
value = 0
|
|
|
- print(f"item: {item} -> value: {value}")
|
|
|
|
|
|
|
+ dprint(f"item: {item} -> value: {value}")
|
|
|
update_missing_value(player['maintainer'], player['player'], item, value)
|
|
update_missing_value(player['maintainer'], player['player'], item, value)
|
|
|
time.sleep(2)
|
|
time.sleep(2)
|
|
|
if len(messages) > 0:
|
|
if len(messages) > 0:
|
|
|
- print(messages)
|
|
|
|
|
|
|
+ dprint(messages)
|
|
|
_send(maintainer['maintainer'], messages)
|
|
_send(maintainer['maintainer'], messages)
|
|
|
conn.close()
|
|
conn.close()
|
|
|
|
|
|