From 08cd4e0b8e6473dcf8dc18915b00aafc86f13215 Mon Sep 17 00:00:00 2001 From: Dmitrii Morozov Date: Wed, 10 Apr 2024 20:52:53 +0200 Subject: Fix notifications plus minor improvements --- Formatter.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'Formatter.py') diff --git a/Formatter.py b/Formatter.py index b87735b..5cd065d 100644 --- a/Formatter.py +++ b/Formatter.py @@ -36,28 +36,35 @@ async def __formatFriend(friend: fortnitepy.Friend): # User async def formatUser(user: fortnitepy.User): stats = await user.fetch_br_stats() + bp_level: float = await user.fetch_battlepass_level(season=29) combined_stats = stats.get_combined_stats() if 'keyboardmouse' in combined_stats: - return __formatUserDevice(user, combined_stats['keyboardmouse']) + return __formatUserDevice(user, combined_stats['keyboardmouse'], bp_level) else: - return __formatUserDevice(user, combined_stats['gamepad']) + return __formatUserDevice(user, combined_stats['gamepad'], bp_level) -def __formatUserDevice(user: fortnitepy.User, device_stats: dict): +def __formatUserDevice(user: fortnitepy.User, device_stats: dict, bp_level: float): return formatting.format_text( formatting.mbold("User: ") + user.display_name, formatting.mbold("External auth: ") + ', '.join([__formatExternalAuth(external_auth) for external_auth in user.external_auths]), formatting.mbold("ID: ") + user.id, + formatting.mbold("Level: ") + str(int(bp_level//1)), formatting.mbold("Matches played: ") + str(device_stats['matchesplayed']), formatting.mbold("Total kills: ") + str(device_stats['kills']), formatting.mbold("Wins: ") + str(device_stats['wins']), separator='\n') + def __formatExternalAuth(external_auth: fortnitepy.ExternalAuth): return '{} \({}\)'.format(external_auth.external_display_name, external_auth.type) -def formatFriendOnline(display_name: str): +def formatFriendOnline(display_name: str, party_size: int): + if party_size > 1: + text = 'is playing Fortnite with {} friends\!'.format(str(party_size - 1)) + else: + text = 'is playing Fortnite\!' return formatting.format_text( u'\u2b50', formatting.mbold('{}'.format(display_name)), - 'is playing Fortnite\!', + text, u'\u2b50', separator=' ') \ No newline at end of file -- cgit v1.2.3