Revert

Author: hhvrc

Common/Models/WebSocket/User/Control.cs

@@ -6,7 +6,7 @@ namespace OpenShock.Common.Models.WebSocket.User;
 // ReSharper disable once ClassNeverInstantiated.Global
 public sealed class Control
 {
-    public required Guid ShockerId { get; set; }
+    public required Guid Id { get; set; }
 
     [EnumDataType(typeof(ControlType))]
     public required ControlType Type { get; set; }

Common/Services/ControlSender.cs

@@ -117,18 +117,18 @@ private async Task<OneOf<Success, ShockerNotFoundOrNoAccess, ShockerPaused, Shoc
         var now = DateTime.UtcNow;
 
         foreach (var (control, shocker) in controls
-                     .Select(c => (Control: c, Shocker: allowedShockers.FirstOrDefault(s => s.ShockerId == c.ShockerId)))
-                     .GroupBy(x => (x.Control.ShockerId, x.Shocker?.ShockerRfId))
+                     .Select(c => (Control: c, Shocker: allowedShockers.FirstOrDefault(s => s.ShockerId == c.Id)))
+                     .GroupBy(x => (ShockerId: x.Control.Id, x.Shocker?.ShockerRfId))
                      .Select(x => x.Last()))
         {
             if (shocker is null)
-                return new ShockerNotFoundOrNoAccess(control.ShockerId);
+                return new ShockerNotFoundOrNoAccess(control.Id);
 
             if (shocker.Paused)
-                return new ShockerPaused(control.ShockerId);
+                return new ShockerPaused(control.Id);
 
             if (!PermissionUtils.IsAllowed(control.Type, false, shocker.PermsAndLimits))
-                return new ShockerNoPermission(control.ShockerId);
+                return new ShockerNoPermission(control.Id);
 
             Clamp(control, shocker.PermsAndLimits);