diff --git a/plugin/discord/ui/rewards.py b/plugin/discord/ui/rewards.py index 5dc6a2d..615c16d 100644 --- a/plugin/discord/ui/rewards.py +++ b/plugin/discord/ui/rewards.py @@ -208,7 +208,6 @@ class RewardList(MessageUI): """ # Title is Reward #n earned by twitch_username # Reward, Earned at, Earned by, Fulfilled at (not fulfilled/date), Ref, Added Notes - name = f"Reward #{reward.earned_id} earned by {reward.twitch_user_name or reward.twitch_user_id}" if reward.fulfilled_at is not None: fat = discord.utils.format_dt(reward.fulfilled_at, "F") @@ -219,17 +218,25 @@ class RewardList(MessageUI): else: fluf = "*Not Fulfilled*" + fluffed_emoji = "✅" if reward.fulfilled_at else "🔳" + earned = discord.utils.format_dt(reward.earned_at, "d") + + name = f"{fluffed_emoji} #{reward.earned_id} earned by {reward.twitch_user_name or reward.twitch_user_id} at {earned}" + table = { - "Reward": "Plus Campaign Sketch", - "Earned At": discord.utils.format_dt(reward.earned_at, "F"), - "Earned From": reward.earned_from, - "Fulfilled At": fluf, + # "Reward": "Plus Campaign Sketch", + # "Earned From": reward.earned_from, + # "Fulfilled At": fluf, "Reference": reward.reference or "*No reference set*", "Further notes": reward.modnote or "*No notes*", } prop_table = "\n".join(tabulate(*table.items())) - return (name, prop_table) + value = '\n'.join(( + "> {reason}", + "{table}", + )).format(reason=reward.earned_from, table=prop_table) + return (name, value) def _format_reward_option(self, reward: EarnedReward) -> SelectOption: """