Feat/new counter n history fixes

Commands/History/RecordEntity.cs

@@ -32,8 +32,10 @@ public RecordEntity(ulong discordMemberId, CounterCategory category, string moti
     public long Timestamp { get; set; }
 
 
-    public override string ToString()
+    public string ToString(bool shouldIncludeCategory = false)
     {
-        return $"*« {Motive} »* – {DateHelper.FromDateTimeToStringDate(RecordedAt)}";
+        return shouldIncludeCategory
+            ? $"*« {Motive} »* – {DateHelper.FromDateTimeToStringDate(RecordedAt)} as {Category}"
+            : $"*« {Motive} »* – {DateHelper.FromDateTimeToStringDate(RecordedAt)}";
     }
 }

Commands/History/RecordService.cs

@@ -19,11 +19,13 @@ namespace Bishop.Commands.History;
 [Description("History-related commands")]
 public class RecordService : BaseCommandModule
 {
+    private const int DefaultLimit = 10;
     public Random Random { private get; set; } = null!;
     public UserNameCache Cache { private get; set; } = null!;
     public RecordRepository Repository { private get; set; } = null!;
 
     [Command("rand")]
+    [Aliases("r")]
     [Description("Picks a random record to expose")]
     public async Task PickRandom(CommandContext context)
     {
@@ -87,14 +89,14 @@ private async Task Consult(CommandContext context,
         [Description("Category to know the history of")]
         CounterCategory counterCategory,
         [Description("Number of records to pull")]
-        int? limit = 10
+        int? limit = DefaultLimit
     )
     {
         var records = await Repository.FindByUserAndCategory(member.Id, counterCategory);
         var trueLimit = limit <= 0 ? records.Count : limit ?? records.Count;
 
         if (records.Any())
-            await FormatRecordList(context, records, trueLimit);
+            await FormatRecordList(context, records, trueLimit, false);
         else
             await context.RespondAsync(
                 $"No history recorded for category user {member.Username} and {counterCategory}");
@@ -105,13 +107,13 @@ private async Task Consult(CommandContext context,
         [Description("@User to know the history of")]
         DiscordUser member,
         [Description("Number of records to pull")]
-        int? limit = 10
+        int? limit = DefaultLimit
     )
     {
         var records = await Repository.FindByUser(member.Id);
 
         if (records.Any())
-            await FormatRecordList(context, records, limit ?? 10);
+            await FormatRecordList(context, records, limit ?? DefaultLimit, true);
         else
             await context.RespondAsync(
                 $"No history recorded for user {member.Username}");
@@ -122,24 +124,27 @@ private async Task Consult(CommandContext context,
         [Description("Category to pull records of")]
         CounterCategory category,
         [Description("Number of records to pull")]
-        int? limit = 10
+        int? limit = DefaultLimit
     )
     {
         var records = await Repository.FindByCategory(category);
 
         if (records.Any())
-            await FormatRecordList(context, records, limit ?? 10);
+            await FormatRecordList(context, records, limit ?? DefaultLimit, false);
         else
             await context.RespondAsync(
                 $"No history recorded for category {category}");
     }
 
-    private async Task FormatRecordList(CommandContext context, IReadOnlyCollection<RecordEntity> records, int limit)
+    private static async Task FormatRecordList(CommandContext context,
+        IReadOnlyCollection<RecordEntity> records,
+        int limit,
+        bool shouldIncludeCategory)
     {
         var trueLimit = limit <= 0 ? records.Count : limit;
 
         var toSend = records
-            .Select(entity => entity.ToString())
+            .Select(record => record.ToString(shouldIncludeCategory))
             .Take(trueLimit)
             .ToList();
 

Commands/Meter/Aliases/MaufoiCounter.cs

@@ -0,0 +1,48 @@
+using System.Threading.Tasks;
+using DSharpPlus.CommandsNext;
+using DSharpPlus.CommandsNext.Attributes;
+using DSharpPlus.Entities;
+
+namespace Bishop.Commands.Meter.Aliases;
+
+public class MaufoiCounter : BaseCommandModule
+{
+    public CounterService Service { private get; set; } = null!;
+
+    [Command("maufoi")]
+    [Description("Adds a provided value to @someone’s maufoi score")]
+    public async Task ScoreMaufoi(CommandContext context,
+        [Description("User to increment the maufoi score of")]
+        DiscordMember member,
+        [Description("To increment by")] long nb)
+    {
+        await Service.Score(context, member, CounterCategory.Maufoi, nb);
+    }
+
+    [Command("maufoi")]
+    [Description("Returns the value of @someone’s maufoi score")]
+    public async Task ScoreMaufoi(CommandContext context,
+        [Description("User to know the maufoi score of")]
+        DiscordMember member)
+    {
+        await Service.Score(context, member, CounterCategory.Maufoi);
+    }
+
+    [Command("maufoi")]
+    [Description("Returns all maufoi scores")]
+    public async Task ScoreMaufoi(CommandContext context)
+    {
+        await Service.Score(context, CounterCategory.Maufoi);
+    }
+
+    [Command("maufoi")]
+    [Description("Adds a provided value to @someone’s maufoi score")]
+    public async Task ScoreMaufoi(CommandContext context,
+        [Description("User to increment the maufoi score of by 1")]
+        DiscordMember member,
+        [RemainingText] [Description("Reason for the increment")]
+        string reason)
+    {
+        await Service.Score(context, member, CounterCategory.Maufoi, reason);
+    }
+}

Commands/Meter/Aliases/WindCounter.cs

@@ -0,0 +1,70 @@
+using System.Threading.Tasks;
+using DSharpPlus.CommandsNext;
+using DSharpPlus.CommandsNext.Attributes;
+using DSharpPlus.Entities;
+
+namespace Bishop.Commands.Meter.Aliases;
+
+public class WindCounter : BaseCommandModule
+{
+    public CounterService Service { private get; set; } = null!;
+
+    [Command("wind")]
+    [Description("Adds a provided value to @someone’s wind score")]
+    public async Task ScoreWind(CommandContext context,
+        [Description("User to increment the wind score of")]
+        DiscordMember member,
+        [Description("To increment by")] long nb)
+    {
+        await Service.Score(context, member, CounterCategory.Wind, nb);
+    }
+
+    [Command("wind")]
+    [Description("Returns the value of @someone’s wind score")]
+    public async Task ScoreWind(CommandContext context,
+        [Description("User to know the wind score of")]
+        DiscordMember member)
+    {
+        await Service.Score(context, member, CounterCategory.Wind);
+    }
+
+    [Command("wind")]
+    [Description("Returns all wind scores")]
+    public async Task ScoreWind(CommandContext context)
+    {
+        await Service.Score(context, CounterCategory.Wind);
+    }
+
+    [Command("wind")]
+    [Description("Adds a record to @someone’s wind history and increments their score")]
+    public async Task ScoreWind(CommandContext context,
+        [Description("User to increment the wind score of by 1")]
+        DiscordMember member,
+        [RemainingText] [Description("Reason for the increment")]
+        string reason)
+    {
+        await Service.Score(context, member, CounterCategory.Wind, reason);
+    }
+
+    [Command("rot")]
+    [Description("Adds a rot to @someone’s wind history and increments their score")]
+    public async Task ScoreRot(CommandContext context,
+        [Description("User to increment the wind score of by 1")]
+        DiscordMember member,
+        [RemainingText] [Description("Reason for the increment")]
+        string reason)
+    {
+        await Service.Score(context, member, CounterCategory.Wind, "(rot) " + reason);
+    }
+
+    [Command("pet")]
+    [Description("Adds a pet to @someone’s wind history and increments their score")]
+    public async Task ScorePet(CommandContext context,
+        [Description("User to increment the wind score of by 1")]
+        DiscordMember member,
+        [RemainingText] [Description("Reason for the increment")]
+        string reason)
+    {
+        await Service.Score(context, member, CounterCategory.Wind, "(pet) " + reason);
+    }
+}

Commands/Meter/CounterCategory.cs

@@ -10,5 +10,7 @@ public enum CounterCategory
     Sauce,
     Sel,
     Beauf,
-    Rass
+    Rass,
+    Maufoi,
+    Wind
 }

Config/Converters/MeterKeysConverter.cs

@@ -16,11 +16,14 @@ public Task<Optional<CounterCategory>> ConvertAsync(string value, CommandContext
     {
         return value.ToLower() switch
         {
-            "add" => Task.FromResult(Optional.FromValue(CounterCategory.Bdm)),
+            "bdm" => Task.FromResult(Optional.FromValue(CounterCategory.Bdm)),
             "beauf" => Task.FromResult(Optional.FromValue(CounterCategory.Beauf)),
             "sauce" => Task.FromResult(Optional.FromValue(CounterCategory.Sauce)),
             "sel" => Task.FromResult(Optional.FromValue(CounterCategory.Sel)),
             "rass" => Task.FromResult(Optional.FromValue(CounterCategory.Rass)),
+            "maufoi" => Task.FromResult(Optional.FromValue(CounterCategory.Maufoi)),
+            "maufoy" => Task.FromResult(Optional.FromValue(CounterCategory.Maufoi)),
+            "wind" => Task.FromResult(Optional.FromValue(CounterCategory.Maufoi)),
             _ => Task.FromResult(Optional.FromNoValue<CounterCategory>())
         };
     }

Program.cs

@@ -67,7 +67,9 @@ private static async Task MainAsync()
             typeof(BdmCounter),
             typeof(BeaufCounter),
             typeof(SauceCounter),
+            typeof(MaufoiCounter),
             typeof(SelCounter),
+            typeof(WindCounter),
             typeof(RassCounter),
             typeof(CounterService),
             typeof(RecordService),