From 8fea42680e4b516814228ba18ab8084ae198b145 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Fri, 12 Aug 2016 19:21:43 +0200 Subject: [PATCH] Moved even more stuff around --- main.py | 23 ++++++++++++++--------- overwatch.py | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/main.py b/main.py index 510bd4a7..4dbe753d 100644 --- a/main.py +++ b/main.py @@ -16,18 +16,23 @@ f = open("discordtoken.txt", "r") token = f.read() f.close() -# Start discord bot client but ignore events -async def discord_connect(): - await d_client.login(token) - print("Discord login was successful!") - d_client.connect() # Something's not right here... - print("Discord connection was successful!") - # List overwatch players ow_players = list() for player in db: if db[player]["overwatch"] is not None: ow_players.append(db[player]["overwatch"]) -# Connect to Discord -loop.run_until_complete(discord_connect()) +# Every 300 seconds, update player status and check for levelups +async def overwatch_level_up(timeout): + while True: + # Update data for every player in list + for ow_player in ow_players: + r = await overwatch.get_player_data(**ow_player) + if r["data"]["level"] > ow_player["level"]: + await d_client.send_message(d_client.get_channel("213655027842154508"), "Level up!") + ow_player["level"] = r["data"]["level"] + # Wait for the timeout + await asyncio.sleep(timeout) + +loop.create_task(overwatch_level_up(30)) +d_client.run(token) \ No newline at end of file diff --git a/overwatch.py b/overwatch.py index e9103bd3..2772fd2a 100644 --- a/overwatch.py +++ b/overwatch.py @@ -3,7 +3,7 @@ import requests loop = asyncio.get_event_loop() # Get player data -async def get_player_data(platform: str, region: str, battletag: str): +async def get_player_data(platform: str, region: str, battletag: str, **kwargs): # Unofficial API requires - for discriminator numbers battletag = battletag.replace("#", "-") # GET the json unofficial API response