diff --git a/db.py b/db.py index 04438aa2..b8ab01b6 100644 --- a/db.py +++ b/db.py @@ -1215,6 +1215,33 @@ mini_list = [Royal, Telegram, Steam, Dota, LeagueOfLegends, Osu, Discord, Overwa Terraria13] +class Matchmaker(Base): + __tablename__ = "matchmakers" + + id = Column(Integer, primary_key=True) + + matchmaking_name = Column(String) + matchmaking_desc = Column(Text) + + min_players = Column(Integer) + max_players = Column(Integer) + + timestamp = Column(DateTime) + expires_in = Column(DateTime) + + players = relationship("MatchmakingEntry", lazy="joined") + + +class MatchmakingEntry(Base): + __tablename__ = "matchmakingentry" + + royal_id = Column(Integer, ForeignKey("royals.id"), primary_key=True) + royal = relationship("Royal", backref="matchmades", lazy="joined") + + + + + # If run as script, create all the tables in the db if __name__ == "__main__": print("Creating new tables...") diff --git a/statsupdate.py b/statsupdate.py index c4224a82..3073b184 100644 --- a/statsupdate.py +++ b/statsupdate.py @@ -114,20 +114,20 @@ def osu_pp_change(item, change: typing.Tuple[DirtyDelta, DirtyDelta, DirtyDelta, try: if std.delta >= 1: telegram_bot.send_message(config["Telegram"]["main_group"], - f"✳️ {item.royal.username} ha ora **{int(std.value)}pp** (+{int(std.delta)}) su osu!", - parse_mode="Markdown") + f"✳️ {item.royal.username} ha ora {int(std.value)}pp (+{int(std.delta)}) su osu!", + parse_mode="HTML") if taiko.delta >= 1: telegram_bot.send_message(config["Telegram"]["main_group"], - f"✳️ {item.royal.username} ha ora **{int(taiko.value)}pp** (+{int(taiko.delta)}) su osu!taiko!", - parse_mode="Markdown") + f"✳️ {item.royal.username} ha ora {int(taiko.value)}pp (+{int(taiko.delta)}) su osu!taiko!", + parse_mode="HTML") if catch.delta >= 1: telegram_bot.send_message(config["Telegram"]["main_group"], - f"✳️ {item.royal.username} ha ora **{int(catch.value)}pp** (+{int(catch.delta)}) su osu!catch!", - parse_mode="Markdown") + f"✳️ {item.royal.username} ha ora {int(catch.value)}pp (+{int(catch.delta)}) su osu!catch!", + parse_mode="HTML") if mania.delta >= 1: telegram_bot.send_message(config["Telegram"]["main_group"], - f"✳️ {item.royal.username} ha ora **{int(mania.value)}pp** (+{int(mania.delta)}) su osu!mania!", - parse_mode="Markdown") + f"✳️ {item.royal.username} ha ora {int(mania.value)}pp (+{int(mania.delta)}) su osu!mania!", + parse_mode="HTML") except Exception: logger.warning(f"Couldn't notify on Telegram: {item}") sentry.captureException()