From 224fe4cb25b591dca6eb9a668c40eaa005da3bd2 Mon Sep 17 00:00:00 2001
From: Eveldee <eveldee0680@live.fr>
Date: Mon, 10 Apr 2023 11:56:49 +0200
Subject: [PATCH] [Activity] Change event to minigame and add event

---
 Cocotte/Cocotte.csproj                          |  2 +-
 Cocotte/Modules/Activities/ActivityFormatter.cs | 15 +++++++++------
 Cocotte/Modules/Activities/ActivityHelper.cs    | 17 ++++++++---------
 Cocotte/Modules/Activities/ActivityModule.cs    |  4 ++--
 Cocotte/Modules/Activities/ActivityName.cs      |  5 +++--
 Cocotte/Modules/Activities/ActivityType.cs      |  6 +++---
 6 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/Cocotte/Cocotte.csproj b/Cocotte/Cocotte.csproj
index efa8231..8dd69a2 100644
--- a/Cocotte/Cocotte.csproj
+++ b/Cocotte/Cocotte.csproj
@@ -9,7 +9,7 @@
 
     <ItemGroup>
         <PackageReference Include="AppAny.Quartz.EntityFrameworkCore.Migrations.SQLite" Version="0.4.0" />
-        <PackageReference Include="Discord.Net" Version="3.9.0" />
+        <PackageReference Include="Discord.Net" Version="3.10.0" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.4">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/Cocotte/Modules/Activities/ActivityFormatter.cs b/Cocotte/Modules/Activities/ActivityFormatter.cs
index ee040df..172427a 100644
--- a/Cocotte/Modules/Activities/ActivityFormatter.cs
+++ b/Cocotte/Modules/Activities/ActivityFormatter.cs
@@ -31,7 +31,7 @@ public class ActivityFormatter
             ActivityName.InterstellarExploration => "Porte interstellaire",
             ActivityName.BreakFromDestiny => "Échapper au destin (3v3)",
             ActivityName.CriticalAbyss => "Abîme critique (8v8)",
-            ActivityName.Event => "Évènement",
+            ActivityName.Minigame => "Évènement",
             ActivityName.Fishing => "Pêche",
             ActivityName.MirroriaRace => "Course Mirroria",
             _ => throw new ArgumentOutOfRangeException(nameof(activityName), activityName, null)
@@ -77,16 +77,19 @@ public class ActivityFormatter
 
         fields.Add(playersField);
 
+        string countTitlePart = activity.MaxPlayers == ActivityHelper.UnlimitedPlayers
+            ? ""
+            : $"({participants.Length}/{activity.MaxPlayers})";
         var title = activity switch
         {
             StagedActivity stagedActivity =>
-                $"{FormatActivityName(activity.Name)} ({participants.Length}/{activity.MaxPlayers}) - Étage {stagedActivity.Stage}",
+                $"{FormatActivityName(activity.Name)} {countTitlePart} - Étage {stagedActivity.Stage}",
             InterstellarActivity interstellar =>
-                $"{FormatActivityName(activity.Name)} {_interstellarFormatter.FormatInterstellarColor(interstellar.Color)} ({players.Count}/{activity.MaxPlayers})",
+                $"{FormatActivityName(activity.Name)} {_interstellarFormatter.FormatInterstellarColor(interstellar.Color)} {countTitlePart}",
             OrganizedActivity =>
-                $"{(ActivityHelper.IsEventActivity(activity.Type) ? "Organisation d'évènement" : $"Proposition d'aide - {FormatActivityName(activity.Name)}")} ({participants.Length}/{activity.MaxPlayers})",
+                $"{(ActivityHelper.IsEventActivity(activity.Type) ? "Organisation d'évènement" : $"Proposition d'aide - {FormatActivityName(activity.Name)}")} {countTitlePart}",
             _ =>
-                $"{FormatActivityName(activity.Name)} ({participants.Length}/{activity.MaxPlayers})"
+                $"{FormatActivityName(activity.Name)} {countTitlePart}"
         };
 
         // Build description
@@ -156,7 +159,7 @@ public class ActivityFormatter
         ActivityName.BreakFromDestiny => "BR",
         ActivityName.CriticalAbyss => "CA",
         ActivityName.Fishing => "FI",
-        ActivityName.Event => "EV",
+        ActivityName.Minigame => "EV",
         ActivityName.MirroriaRace => "MR",
         _ => "NA"
     };
diff --git a/Cocotte/Modules/Activities/ActivityHelper.cs b/Cocotte/Modules/Activities/ActivityHelper.cs
index 5e56260..c82121f 100644
--- a/Cocotte/Modules/Activities/ActivityHelper.cs
+++ b/Cocotte/Modules/Activities/ActivityHelper.cs
@@ -9,7 +9,7 @@ namespace Cocotte.Modules.Activities;
 
 public class ActivityHelper
 {
-    private const uint UnlimitedPlayers = uint.MaxValue;
+    public const uint UnlimitedPlayers = uint.MaxValue;
 
     private readonly ActivityOptions _options;
     private readonly ActivitiesRepository _activitiesRepository;
@@ -57,32 +57,31 @@ public class ActivityHelper
 
         ActivityName.BreakFromDestiny => ActivityType.Pvp3Players,
 
-        ActivityName.Event or
-            ActivityName.Fishing => ActivityType.Event8Players,
+        ActivityName.Minigame => ActivityType.Other8Players,
 
-        ActivityName.MirroriaRace => ActivityType.Event4Players,
+        ActivityName.MirroriaRace => ActivityType.Other4Players,
 
-        _ => ActivityType.Other
+        _ => ActivityType.OtherUnlimitedPlayers
     };
 
     public static uint ActivityTypeToMaxPlayers(ActivityType activityType) => activityType switch
     {
         ActivityType.Pve4Players or
-        ActivityType.Event4Players => 4,
+        ActivityType.Other4Players => 4,
 
         ActivityType.Pve8Players or
         ActivityType.Pvp8Players or
-        ActivityType.Event8Players => 8,
+        ActivityType.Other8Players => 8,
 
         ActivityType.Pvp3Players => 3,
 
-        ActivityType.Other => UnlimitedPlayers,
+        ActivityType.OtherUnlimitedPlayers => UnlimitedPlayers,
 
         _ => 0
     };
 
     public static bool IsEventActivity(ActivityType activityType) =>
-        activityType is ActivityType.Event8Players or ActivityType.Event4Players or ActivityType.Other;
+        activityType is ActivityType.Other8Players or ActivityType.Other4Players or ActivityType.OtherUnlimitedPlayers;
 
     public bool IsOrganizer(OrganizedActivity organizedActivity, SocketGuildUser user)
     {
diff --git a/Cocotte/Modules/Activities/ActivityModule.cs b/Cocotte/Modules/Activities/ActivityModule.cs
index 3c90db4..b3d79f9 100644
--- a/Cocotte/Modules/Activities/ActivityModule.cs
+++ b/Cocotte/Modules/Activities/ActivityModule.cs
@@ -142,12 +142,12 @@ public partial class ActivityModule : InteractionModuleBase<SocketInteractionCon
 
     [SlashCommand("evenement", "Créer un groupe pour les évènements")]
     [Alias("event")]
-    public async Task ActivityEvent(
+    public async Task ActivityMinigame(
         [Summary("joueurs", "Nombre de joueurs maximum pour cette activité")] [MinValue(2), MaxValue(16)]
         uint maxPlayers = 8, [Summary("heure", "Heure à laquelle l'activité est prévue")] string? timeInput = null,
         [Summary("description", "Message accompagnant la demande de groupe")] string description = "")
     {
-        await CreateActivity(ActivityName.Event, timeInput, description, areRolesEnabled: false,
+        await CreateActivity(ActivityName.Minigame, timeInput, description, areRolesEnabled: false,
             maxPlayers: maxPlayers);
     }
 
diff --git a/Cocotte/Modules/Activities/ActivityName.cs b/Cocotte/Modules/Activities/ActivityName.cs
index 1793a02..5bb23d0 100644
--- a/Cocotte/Modules/Activities/ActivityName.cs
+++ b/Cocotte/Modules/Activities/ActivityName.cs
@@ -12,6 +12,7 @@ public enum ActivityName
     BreakFromDestiny,
     CriticalAbyss,
     Fishing,
-    Event,
-    MirroriaRace
+    Minigame,
+    MirroriaRace,
+    Event
 }
\ No newline at end of file
diff --git a/Cocotte/Modules/Activities/ActivityType.cs b/Cocotte/Modules/Activities/ActivityType.cs
index 5e9bacf..3ad5a93 100644
--- a/Cocotte/Modules/Activities/ActivityType.cs
+++ b/Cocotte/Modules/Activities/ActivityType.cs
@@ -6,7 +6,7 @@ public enum ActivityType
     Pve8Players,
     Pvp8Players,
     Pvp3Players,
-    Event8Players,
-    Event4Players,
-    Other
+    Other8Players,
+    Other4Players,
+    OtherUnlimitedPlayers
 }
\ No newline at end of file