From 18b06d8ba42b0cf484f4312db6718ce4c38889fd Mon Sep 17 00:00:00 2001
From: Luca <luca@perugia.ovh>
Date: Sat, 11 May 2024 01:24:23 +0200
Subject: [PATCH] Fix names in chatbox

---
 ShockOsc/Config/ChatboxConf.cs | 8 ++++----
 ShockOsc/Services/ShockOsc.cs  | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ShockOsc/Config/ChatboxConf.cs b/ShockOsc/Config/ChatboxConf.cs
index 37895c4..6e29d79 100644
--- a/ShockOsc/Config/ChatboxConf.cs
+++ b/ShockOsc/Config/ChatboxConf.cs
@@ -20,7 +20,7 @@ public sealed class ChatboxConf
                 ControlType.Stop, new ControlTypeConf
                 {
                     Enabled = true,
-                    Local = "⏸ '{ShockerName}'",
+                    Local = "⏸ '{GroupName}'",
                     Remote = "⏸ '{ShockerName}' by {Name}",
                     RemoteWithCustomName = "⏸ '{ShockerName}' by {CustomName} [{Name}]"
                 }
@@ -29,7 +29,7 @@ public sealed class ChatboxConf
                 ControlType.Shock, new ControlTypeConf
                 {
                     Enabled = true,
-                    Local = "⚡ '{ShockerName}' {Intensity}%:{DurationSeconds}s",
+                    Local = "⚡ '{GroupName}' {Intensity}%:{DurationSeconds}s",
                     Remote = "⚡ '{ShockerName}' {Intensity}%:{DurationSeconds}s by {Name}",
                     RemoteWithCustomName =
                         "⚡ '{ShockerName}' {Intensity}%:{DurationSeconds}s by {CustomName} [{Name}]"
@@ -39,7 +39,7 @@ public sealed class ChatboxConf
                 ControlType.Vibrate, new ControlTypeConf
                 {
                     Enabled = true,
-                    Local = "〜 '{ShockerName}' {Intensity}%:{DurationSeconds}s",
+                    Local = "〜 '{GroupName}' {Intensity}%:{DurationSeconds}s",
                     Remote = "〜 '{ShockerName}' {Intensity}%:{DurationSeconds}s by {Name}",
                     RemoteWithCustomName =
                         "〜 '{ShockerName}' {Intensity}%:{DurationSeconds}s by {CustomName} [{Name}]"
@@ -49,7 +49,7 @@ public sealed class ChatboxConf
                 ControlType.Sound, new ControlTypeConf
                 {
                     Enabled = true,
-                    Local = "🔈 '{ShockerName}' {Intensity}%:{DurationSeconds}s",
+                    Local = "🔈 '{GroupName}' {Intensity}%:{DurationSeconds}s",
                     Remote = "🔈 '{ShockerName}' {Intensity}%:{DurationSeconds}s by {Name}",
                     RemoteWithCustomName =
                         "🔈 '{ShockerName}' {Intensity}%:{DurationSeconds}s by {CustomName} [{Name}]"
diff --git a/ShockOsc/Services/ShockOsc.cs b/ShockOsc/Services/ShockOsc.cs
index 72819b4..7c86246 100644
--- a/ShockOsc/Services/ShockOsc.cs
+++ b/ShockOsc/Services/ShockOsc.cs
@@ -420,6 +420,7 @@ private async Task InstantShock(ProgramGroup programGroup, uint duration, byte i
         // Chatbox message local
         var dat = new
         {
+            GroupName = programGroup.Name,
             ShockerName = programGroup.Name,
             Intensity = intensity,
             IntensityPercentage = intensityPercentage,