From 1560130261c96921c41b1ac38af8615b33d05056 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Mon, 8 Oct 2018 00:42:45 +0200 Subject: [PATCH] asdfasfarewtw --- db.py | 43 +++++++++++++++++++++++++++++++----- statsupdate.py | 28 ++++++++++++----------- templates/minis/lol.html | 6 +++-- templates/ohciaodinuovo.html | 2 +- 4 files changed, 57 insertions(+), 22 deletions(-) diff --git a/db.py b/db.py index fa931aef..d2f27b97 100644 --- a/db.py +++ b/db.py @@ -163,7 +163,7 @@ class Steam(Base): else: return f"{int(steam_id) - 76561197960265728}" - def update(self, raise_if_private: bool=False): + def update(self, session=None, raise_if_private: bool=False): r = requests.get(f"https://api.steampowered.com/ISteamUser/GetPlayerSummaries/v0002/?key={config['Steam']['api_key']}&steamids={self.steam_id}") if r.status_code != 200: raise RequestError(f"Steam returned {r.status_code}") @@ -212,7 +212,7 @@ class RocketLeague(Base): def __repr__(self): return f"" - def update(self, data=None): + def update(self, session=None, data=None): raise NotImplementedError("rlstats API is no longer available.") def solo_rank_image(self): @@ -310,7 +310,7 @@ class Dota(Base): new_record.update() return new_record - def update(self) -> bool: + def update(self, session=None) -> bool: r = requests.get(f"https://api.opendota.com/api/players/{Steam.to_steam_id_3(self.steam_id)}") if r.status_code != 200: raise RequestError("OpenDota / returned {r.status_code}") @@ -374,7 +374,7 @@ class LeagueOfLegends(Base): return f"" return f"" - def update(self) -> bool: + def update(self, session=None) -> bool: r = requests.get(f"https://euw1.api.riotgames.com/lol/summoner/v3/summoners/{self.summoner_id}?api_key={config['League of Legends']['riot_api_key']}") if r.status_code != 200: raise RequestError(f"League of Legends API /summoner returned {r.status_code}") @@ -468,7 +468,7 @@ class Osu(Base): mania_pp=j3["pp_raw"]) return new_record - def update(self): + def update(self, session=None): r0 = requests.get(f"https://osu.ppy.sh/api/get_user?k={config['Osu!']['ppy_api_key']}&u={self.osu_name}&m=0") r1 = requests.get(f"https://osu.ppy.sh/api/get_user?k={config['Osu!']['ppy_api_key']}&u={self.osu_name}&m=1") r2 = requests.get(f"https://osu.ppy.sh/api/get_user?k={config['Osu!']['ppy_api_key']}&u={self.osu_name}&m=2") @@ -574,7 +574,7 @@ class Overwatch(Base): def icon_url(self): return f"https://d1u1mce87gyfbn.cloudfront.net/game/unlocks/{self.icon}.png" - def update(self): + def update(self, session=None): r = requests.get(f"https://owapi.net/api/v3/u/{self.battletag}-{self.discriminator}/stats", headers={ "User-Agent": "Royal-Bot/4.1", "From": "ste.pigozzi@gmail.com" @@ -962,6 +962,37 @@ class Halloween(Base): if h[i+1]: completed[i] = True return started, completed + + def update(self, session): + if self[1] is None: + # Dota last match + dota = session.query(Dota).join(Steam).join(Royal).filter_by(id=self.royal.id).one_or_none() + if dota is not None: + dota_id = Steam.to_steam_id_3(dota.steam_id) + r = requests.get(f"https://api.opendota.com/api/players/{dota_id}/recentMatches") + if r.status_code != 200: + raise RequestError("Error in the Halloween Dota check.") + j = r.json() + match = j[0] + if match["hero_id"] == 81 and (match["radiant_win"] ^ match["player_slot"] // 128): + logging.debug(f"{self.royal.username} has obtained Moon A via Dota.") + self[1] = datetime.datetime.now() + else: + logging.debug(f"{self.royal.username} hasn't passed the LoL challenge yet.") + # LoL last match + lol = session.query(LeagueOfLegends).join(Royal).filter_by(id=self.royal.id).one_or_none() + if lol is not None: + r = requests.get(f"https://euw1.api.riotgames.com/lol/match/v3/matchlists/by-account/207525171" + f"?api_key={config['League of Legends']['riot_api_key']}") + if r.status_code != 200: + raise RequestError("Error in the Halloween LoL check.") + j = r.json() + match = j["matches"][0] + if match["champion"] == 120: + self[1] = datetime.datetime.now() + logging.debug(f"{self.royal.username} has obtained Moon A via LoL.") + else: + logging.debug(f"{self.royal.username} hasn't passed the LoL challenge yet.") # If run as script, create all the tables in the db if __name__ == "__main__": diff --git a/statsupdate.py b/statsupdate.py index 5d5749cc..78cc6f84 100644 --- a/statsupdate.py +++ b/statsupdate.py @@ -1,3 +1,5 @@ +import requests +import errors import db import time import logging @@ -8,6 +10,7 @@ import typing import telegram import sys import coloredlogs +import datetime logging.getLogger().disabled = True logger = logging.getLogger(__name__) @@ -27,12 +30,12 @@ sentry = raven.Client(config["Sentry"]["token"], telegram_bot = telegram.Bot(config["Telegram"]["bot_token"]) -def update_block(block: list, delay: float=0, change_callback: typing.Callable=None): +def update_block(session: db.Session, block: list, delay: float=0, change_callback: typing.Callable=None): for item in block: logger.debug(f"Updating {repr(item)}.") t = time.clock() try: - change = item.update() + change = item.update(session=session) except Exception as e: logger.error(f"Error {sys.exc_info()} while updating {repr(item)}.") sentry.extra_context({ @@ -63,29 +66,28 @@ def new_lol_rank(item: db.LeagueOfLegends): logger.warning(f"Couldn't notify on Telegram: {item}") -def halloween_checks(item: db.Halloween, session: db.Session): - # Dota last matches - session.query(db.Dota).join(db.Steam).filter_by(id=item.royal).one_or_none() - def process(): while True: - logger.info("Pausing for 30 minutes.") - time.sleep(1800) + # logger.info("Pausing for 30 minutes.") + # time.sleep(1800) session = db.Session() + logger.info("Now updating Halloween data.") + update_block(session, session.query(db.Halloween).all()) + session.commit() logger.info("Now updating Steam data.") - update_block(session.query(db.Steam).all()) + update_block(session, session.query(db.Steam).all()) session.commit() logger.info("Now updating Dota data.") - update_block(session.query(db.Dota).all(), delay=5, change_callback=new_dota_rank) + update_block(session, session.query(db.Dota).all(), delay=5, change_callback=new_dota_rank) session.commit() logger.info("Now updating League of Legends data.") - update_block(session.query(db.LeagueOfLegends).all(), delay=5, change_callback=new_lol_rank) + update_block(session, session.query(db.LeagueOfLegends).all(), delay=5, change_callback=new_lol_rank) session.commit() logger.info("Now updating osu! data.") - update_block(session.query(db.Osu).all(), delay=5) + update_block(session, session.query(db.Osu).all(), delay=5) session.commit() logger.info("Now updating Overwatch data.") - update_block(session.query(db.Overwatch).all(), delay=5) + update_block(session, session.query(db.Overwatch).all(), delay=5) session.commit() diff --git a/templates/minis/lol.html b/templates/minis/lol.html index e9b56be2..b11d423f 100644 --- a/templates/minis/lol.html +++ b/templates/minis/lol.html @@ -7,8 +7,10 @@
- - {{ record.summoner_name }} + + + {{ record.summoner_name }} +
LIVELLO diff --git a/templates/ohciaodinuovo.html b/templates/ohciaodinuovo.html index d2818834..88649621 100644 --- a/templates/ohciaodinuovo.html +++ b/templates/ohciaodinuovo.html @@ -83,7 +83,7 @@
you'll need the help of the horsemen of the apocalypse to dispel the curse.
- lead Chaos to victory in the battle of the ancients, or the War from the shadow isles to victory on the rift, and you'll gain their support. + lead Chaos to victory in the battle of the ancients, or summon War from the shadow isles on the rift, and you'll gain their support.
{% elif loop.index == 2 %} {# la zucca di balu e max #}