Merge branch 'develop' into main

oliverbooth · oliverbooth · commit b7306d1b509e · 2022-12-28T19:15:16.000Z
diff --git a/Present/Commands/GiveawayCommand.ViewEntrants.cs b/Present/Commands/GiveawayCommand.ViewEntrants.cs
@@ -0,0 +1,47 @@
+﻿using CSharpVitamins;
+using DSharpPlus.Entities;
+using DSharpPlus.SlashCommands;
+using DSharpPlus.SlashCommands.Attributes;
+using Present.Data;
+using Present.Resources;
+using X10D.DSharpPlus;
+
+namespace Present.Commands;
+
+internal sealed partial class GiveawayCommand
+{
+    [SlashCommand(CommandNames.ViewEntrants, CommandDescriptions.ViewEntrants, false)]
+    [SlashRequireGuild]
+    public async Task ViewEntrantsAsync(InteractionContext context,
+        [Option(OptionNames.Id, OptionDescriptions.ViewGiveawayId)] string idRaw
+    )
+    {
+        var embed = new DiscordEmbedBuilder();
+        embed.WithColor(DiscordColor.Red);
+        embed.WithTitle(EmbedStrings.InvalidGiveawayId);
+
+        if (!ShortGuid.TryParse(idRaw, out ShortGuid giveawayId))
+        {
+            embed.WithDescription(string.Format(EmbedStrings.InvalidId, idRaw));
+            await context.CreateResponseAsync(embed, true).ConfigureAwait(false);
+            return;
+        }
+
+        DiscordGuild guild = context.Guild;
+        if (!_giveawayService.TryGetGiveaway(giveawayId, out Giveaway? giveaway) || giveaway.GuildId != guild.Id)
+        {
+            embed.WithDescription(string.Format(EmbedStrings.NoGiveawayFound, giveawayId));
+            await context.CreateResponseAsync(embed, true).ConfigureAwait(false);
+            return;
+        }
+
+        embed.WithColor(DiscordColor.CornflowerBlue);
+        embed.WithTitle(EmbedStrings.GiveawayEntrants);
+
+        embed.AddField("Entrants", giveaway.Entrants.Count.ToString("0"));
+        if (giveaway.Entrants.Count > 0)
+            embed.WithDescription(string.Join('\n', giveaway.Entrants.Select(e => $"• {MentionUtility.MentionUser(e)} ({e:0})")));
+
+        await context.CreateResponseAsync(embed).ConfigureAwait(false);
+    }
+}
diff --git a/Present/Present.csproj b/Present/Present.csproj
@@ -6,7 +6,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-        <VersionPrefix>1.4.0</VersionPrefix>
+        <VersionPrefix>1.5.0</VersionPrefix>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' == ''">
diff --git a/Present/Resources/CommandDescriptions.cs b/Present/Resources/CommandDescriptions.cs
@@ -12,5 +12,6 @@ internal static class CommandDescriptions
     public const string SetWinners = "Updates the number of winners in an ongoing giveaway.";
     public const string UnblockRole = "Unblocks a role, so they are able to win giveaways.";
     public const string UnblockUser = "Unblocks a user, so they are able to win giveaways.";
+    public const string ViewEntrants = "View the entrants of a giveaway.";
     public const string ViewGiveaway = "View the details of a giveaway.";
 }
diff --git a/Present/Resources/CommandNames.cs b/Present/Resources/CommandNames.cs
@@ -11,6 +11,7 @@ internal static class CommandNames
     public const string Redraw = "redraw";
     public const string SetWinners = "setwinners";
     public const string View = "view";
+    public const string ViewEntrants = "viewentrants";
     public const string UnblockRole = "unblockrole";
     public const string UnblockUser = "unblockuser";
 }
diff --git a/Present/Resources/EmbedStrings.Designer.cs b/Present/Resources/EmbedStrings.Designer.cs
diff --git a/Present/Resources/EmbedStrings.resx b/Present/Resources/EmbedStrings.resx
@@ -126,6 +126,9 @@
         <value>The following IDs were ignored because they correspond to invalid or excluded members: {0}</value>
     </data>
 
+    <data name="GiveawayEntrants" xml:space="preserve">
+        <value>Giveaway Entrants</value>
+    </data>
     <data name="GiveawayInformation" xml:space="preserve">
         <value>Giveaway Information</value>
     </data>

Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,6 @@ internal static class CommandDescriptions`
`12`	`12`	`public const string SetWinners = "Updates the number of winners in an ongoing giveaway.";`
`13`	`13`	`public const string UnblockRole = "Unblocks a role, so they are able to win giveaways.";`
`14`	`14`	`public const string UnblockUser = "Unblocks a user, so they are able to win giveaways.";`
	`15`	`+ public const string ViewEntrants = "View the entrants of a giveaway.";`
`15`	`16`	`public const string ViewGiveaway = "View the details of a giveaway.";`
`16`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ internal static class CommandNames`
`11`	`11`	`public const string Redraw = "redraw";`
`12`	`12`	`public const string SetWinners = "setwinners";`
`13`	`13`	`public const string View = "view";`
	`14`	`+ public const string ViewEntrants = "viewentrants";`
`14`	`15`	`public const string UnblockRole = "unblockrole";`
`15`	`16`	`public const string UnblockUser = "unblockuser";`
`16`	`17`	`}`