Fix names in chatbox

OpenShock · May 10, 2024 · 18b06d8 · 18b06d8
1 parent 58ef390
commit 18b06d8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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,