diff --git a/src/modules/pomodoro/graphics.py b/src/modules/pomodoro/graphics.py index 1d8904e2..7fc9de8b 100644 --- a/src/modules/pomodoro/graphics.py +++ b/src/modules/pomodoro/graphics.py @@ -46,6 +46,10 @@ async def get_timer_card(bot: LionBot, timer: 'Timer', stage: 'Stage'): else: card_cls = BreakTimerCard + skin = await bot.get_cog('CustomSkinCog').get_skinargs_for( + timer.data.guildid, None, card_cls.card_id + ) + return card_cls( name, remaining, diff --git a/src/modules/statistics/graphics/goals.py b/src/modules/statistics/graphics/goals.py index 86181bed..6dfe94cd 100644 --- a/src/modules/statistics/graphics/goals.py +++ b/src/modules/statistics/graphics/goals.py @@ -122,6 +122,11 @@ async def get_goals_card( badges = await data.ProfileTag.fetch_tags(guildid, userid) card_cls = WeeklyGoalCard if weekly else MonthlyGoalCard + + skin = await bot.get_cog('CustomSkinCog').get_skinargs_for( + guildid, userid, card_cls.card_id + ) + card = card_cls( name=username[0], discrim=username[1], @@ -134,6 +139,6 @@ async def get_goals_card( attendance=attendance, goals=tasks, date=today, - skin={'mode': mode} + skin=skin | {'mode': mode} ) return card diff --git a/src/modules/statistics/graphics/leaderboard.py b/src/modules/statistics/graphics/leaderboard.py index 36632634..310cfc93 100644 --- a/src/modules/statistics/graphics/leaderboard.py +++ b/src/modules/statistics/graphics/leaderboard.py @@ -60,8 +60,12 @@ async def get_leaderboard_card( highlight = position # Request Card + + skin = await bot.get_cog('CustomSkinCog').get_skinargs_for( + guildid, None, LeaderboardCard.card_id + ) card = LeaderboardCard( - skin={'mode': mode}, + skin=skin | {'mode': mode}, server_name=guild.name, entries=entries, highlight=highlight diff --git a/src/modules/statistics/graphics/monthly.py b/src/modules/statistics/graphics/monthly.py index c6855a2a..fb47e97e 100644 --- a/src/modules/statistics/graphics/monthly.py +++ b/src/modules/statistics/graphics/monthly.py @@ -121,6 +121,9 @@ async def get_monthly_card(bot: LionBot, userid: int, guildid: int, offset: int, username = (lion.data.display_name, '#????') # Request card + skin = await bot.get_cog('CustomSkinCog').get_skinargs_for( + guildid, userid, MonthlyStatsCard.card_id + ) card = MonthlyStatsCard( user=username, timezone=str(lion.timezone), @@ -129,6 +132,6 @@ async def get_monthly_card(bot: LionBot, userid: int, guildid: int, offset: int, monthly=monthly, current_streak=current_streak, longest_streak=longest_streak, - skin={'mode': mode} + skin=skin | {'mode': mode} ) return card diff --git a/src/modules/statistics/graphics/profile.py b/src/modules/statistics/graphics/profile.py index 38fac587..fc70a68c 100644 --- a/src/modules/statistics/graphics/profile.py +++ b/src/modules/statistics/graphics/profile.py @@ -80,6 +80,10 @@ async def get_profile_card(bot: LionBot, userid: int, guildid: int): achievements = await get_achievements_for(bot, guildid, userid) achieved = tuple(ach.emoji_index for ach in achievements if ach.achieved) + skin = await bot.get_cog('CustomSkinCog').get_skinargs_for( + guildid, userid, ProfileCard.card_id + ) + card = ProfileCard( user=username, avatar=(userid, avatar), @@ -88,6 +92,7 @@ async def get_profile_card(bot: LionBot, userid: int, guildid: int): achievements=achieved, current_rank=current_rank, rank_progress=rank_progress, - next_rank=next_rank + next_rank=next_rank, + skin=skin, ) return card diff --git a/src/modules/statistics/graphics/stats.py b/src/modules/statistics/graphics/stats.py index 042151b8..aa4eacaa 100644 --- a/src/modules/statistics/graphics/stats.py +++ b/src/modules/statistics/graphics/stats.py @@ -117,12 +117,16 @@ async def get_stats_card(bot: LionBot, userid: int, guildid: int, mode: CardMode if streak_start is not None: streaks.append((streak_start, today.day)) + skin = await bot.get_cog('CustomSkinCog').get_skinargs_for( + guildid, userid, StatsCard.card_id + ) + card = StatsCard( (position, 0), period_strings, month_string, 100, streaks, - skin={'mode': mode} + skin=skin | {'mode': mode} ) return card diff --git a/src/modules/statistics/graphics/weekly.py b/src/modules/statistics/graphics/weekly.py index 74b8b103..00f43358 100644 --- a/src/modules/statistics/graphics/weekly.py +++ b/src/modules/statistics/graphics/weekly.py @@ -58,6 +58,10 @@ async def get_weekly_card(bot: LionBot, userid: int, guildid: int, offset: int, else: username = (lion.data.display_name, '#????') + skin = await bot.get_cog('CustomSkinCog').get_skinargs_for( + guildid, userid, WeeklyStatsCard.card_id + ) + card = WeeklyStatsCard( user=username, timezone=str(lion.timezone), @@ -68,6 +72,6 @@ async def get_weekly_card(bot: LionBot, userid: int, guildid: int, offset: int, (int(session['start_time'].timestamp()), int(session['start_time'].timestamp() + int(session['duration']))) for session in sessions ], - skin={'mode': mode} + skin=skin | {'mode': mode} ) return card