diff --git a/bemani/backend/popn/base.py b/bemani/backend/popn/base.py index 18b6b55..1df8fa2 100644 --- a/bemani/backend/popn/base.py +++ b/bemani/backend/popn/base.py @@ -292,7 +292,7 @@ class PopnMusicBase(CoreHandler, CardManagerHandler, PASELIHandler, Base): # We saved successfully break - def broadcast_score(self, userid: int, songid: int, chart: int, medal: int, points: int, combo: int, stats: Dict[str, int]) -> None: + def broadcast_score(self, userid: UserID, songid: int, chart: int, medal: int, points: int, combo: int, stats: Dict[str, int]) -> None: # Generate scorecard profile = self.get_profile(userid) song = self.data.local.music.get_song(self.game, self.version, songid, chart) @@ -324,13 +324,13 @@ class PopnMusicBase(CoreHandler, CardManagerHandler, PASELIHandler, Base): BroadcastConstants.SONG_NAME: song.name, BroadcastConstants.ARTIST_NAME: song.artist, BroadcastConstants.DIFFICULTY: card_chart, - BroadcastConstants.SCORE: points, + BroadcastConstants.SCORE: str(points), BroadcastConstants.MEDAL: card_medal, - BroadcastConstants.COOLS: stats['cool'], - BroadcastConstants.GREATS: stats['great'], - BroadcastConstants.GOODS: stats['good'], - BroadcastConstants.BADS: stats['bad'], - BroadcastConstants.COMBO: combo, + BroadcastConstants.COOLS: str(stats['cool']), + BroadcastConstants.GREATS: str(stats['great']), + BroadcastConstants.GOODS: str(stats['good']), + BroadcastConstants.BADS: str(stats['bad']), + BroadcastConstants.COMBO: str(combo), } # Try to broadcast out the score to our webhook(s) diff --git a/bemani/backend/popn/eclale.py b/bemani/backend/popn/eclale.py index db1acfe..cc55160 100644 --- a/bemani/backend/popn/eclale.py +++ b/bemani/backend/popn/eclale.py @@ -441,7 +441,7 @@ class PopnMusicEclale(PopnMusicBase): self.update_score(userid, songid, chart, points, medal, combo=combo, stats=stats) if request.child_value('is_image_store') == 1: - self.broadcast_score(userid, songid, chart, medal, combo, stats) + self.broadcast_score(userid, songid, chart, medal, points, combo, stats) return root diff --git a/bemani/backend/popn/usaneko.py b/bemani/backend/popn/usaneko.py index c1dc11b..731c9f2 100644 --- a/bemani/backend/popn/usaneko.py +++ b/bemani/backend/popn/usaneko.py @@ -693,7 +693,7 @@ class PopnMusicUsaNeko(PopnMusicBase): self.update_score(userid, songid, chart, points, medal, combo=combo, stats=stats) if request.child_value('is_image_store') == 1: - self.broadcast_score(userid, songid, chart, medal, combo, stats) + self.broadcast_score(userid, songid, chart, medal, points, combo, stats) return root diff --git a/bemani/frontend/mga/mga.py b/bemani/frontend/mga/mga.py index 2bf88bb..31bc163 100644 --- a/bemani/frontend/mga/mga.py +++ b/bemani/frontend/mga/mga.py @@ -18,7 +18,7 @@ class MetalGearArcadeFrontend(FrontendBase): super().__init__(data, config, cache) self.machines: Dict[int, str] = {} - def all_games(self) -> Iterator[Tuple[str, int, str]]: + def all_games(self) -> Iterator[Tuple[GameConstants, int, str]]: yield from MetalGearArcadeFactory.all_games() def __update_value(self, oldvalue: str, newvalue: bytes) -> str: