From 3838adf5d909970d53a26876f5fd39864818cc35 Mon Sep 17 00:00:00 2001 From: Toastie <toastie@toastiet0ast.com> Date: Sat, 12 Apr 2025 11:42:54 +1200 Subject: [PATCH] fixed questcommands showing up as a module --- .../Modules/Games/Quests/QuestCommands.cs | 65 ++++++++++--------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/src/EllieBot/Modules/Games/Quests/QuestCommands.cs b/src/EllieBot/Modules/Games/Quests/QuestCommands.cs index 28adddd..a6c6a37 100644 --- a/src/EllieBot/Modules/Games/Quests/QuestCommands.cs +++ b/src/EllieBot/Modules/Games/Quests/QuestCommands.cs @@ -1,38 +1,43 @@ -namespace EllieBot.Modules.Games.Quests; +using EllieBot.Modules.Games.Quests; -public class QuestCommands : EllieModule<QuestService> +namespace EllieBot.Modules.Games; + +public partial class Games { - [Cmd] - public async Task QuestLog() + public class QuestCommands : EllieModule<QuestService> { - var now = DateTime.UtcNow; - var quests = await _service.GetUserQuestsAsync(ctx.User.Id, now); - - var embed = CreateEmbed() - .WithOkColor() - .WithTitle(GetText(strs.quest_log)); - - var allDone = quests.All(x => x.UserQuest.IsCompleted); - - var tmrw = now.AddDays(1).Date; - var desc = GetText(strs.dailies_reset(TimestampTag.FromDateTime(tmrw, TimestampTagStyles.Relative))); - if (allDone) - desc = GetText(strs.dailies_done) + "\n" + desc; - - embed.WithDescription(desc); - - foreach (var res in quests) + [Cmd] + public async Task QuestLog() { - if (res.Quest is null) - continue; + var now = DateTime.UtcNow; + var quests = await _service.GetUserQuestsAsync(ctx.User.Id, now); - embed.AddField( - (res.UserQuest.IsCompleted ? IQuest.COMPLETED : IQuest.INCOMPLETE) + " " + res.Quest.Name, - $"{res.Quest.Desc}\n\n" + - res.Quest.ToString(res.UserQuest.Progress), - true); + var embed = CreateEmbed() + .WithOkColor() + .WithTitle(GetText(strs.quest_log)); + + var allDone = quests.All(x => x.UserQuest.IsCompleted); + + var tmrw = now.AddDays(1).Date; + var desc = GetText(strs.dailies_reset(TimestampTag.FromDateTime(tmrw, TimestampTagStyles.Relative))); + if (allDone) + desc = GetText(strs.dailies_done) + "\n" + desc; + + embed.WithDescription(desc); + + foreach (var res in quests) + { + if (res.Quest is null) + continue; + + embed.AddField( + (res.UserQuest.IsCompleted ? IQuest.COMPLETED : IQuest.INCOMPLETE) + " " + res.Quest.Name, + $"{res.Quest.Desc}\n\n" + + res.Quest.ToString(res.UserQuest.Progress), + true); + } + + await Response().Embed(embed).SendAsync(); } - - await Response().Embed(embed).SendAsync(); } } \ No newline at end of file