Allow permission set for live perm

OpenShock · Jan 14, 2024 · 183a39f · 183a39f
1 parent 69f385e
commit 183a39f
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/API/Controller/Public/PublicShareController.cs b/API/Controller/Public/PublicShareController.cs
@@ -9,9 +9,9 @@ namespace OpenShock.API.Controller.Public;
 
 public sealed partial class PublicController
 {
-    /// <summary>
-    /// Gets information about a public share link.
-    /// </summary>
+    /// <summary>
+    /// Gets information about a public share link.
+    /// </summary>
     /// <param name="id"></param>
     /// <response code="200">The share link information was successfully retrieved.</response>
     /// <response code="404">The share link does not exist.</response>
@@ -50,6 +50,7 @@ public async Task<BaseResponse<PublicShareLinkResponse>> Get([FromRoute] Guid id
                         Vibrate = y.PermVibrate,
                         Sound = y.PermSound,
                         Shock = y.PermShock,
+                        Live = y.PermLive
                     },
                     Paused = ShareLinkUtils.GetPausedReason(y.Paused, y.Shocker.Paused),
                 }

diff --git a/API/Controller/Shares/Links/EditShockerShareLink.cs b/API/Controller/Shares/Links/EditShockerShareLink.cs
@@ -9,12 +9,12 @@ namespace OpenShock.API.Controller.Shares.Links;
 
 public sealed partial class ShareLinksController
 {
-    /// <summary>
-    /// Edit a shocker in a share link
-    /// </summary>
-    /// <param name="id"></param>
-    /// <param name="shockerId"></param>
-    /// <param name="data"></param>
+    /// <summary>
+    /// Edit a shocker in a share link
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="shockerId"></param>
+    /// <param name="data"></param>
     /// <response code="200">Successfully updated shocker</response>
     /// <response code="404">Share link or shocker does not exist</response>
     /// <response code="400">Shocker does not exist in share link</response>
@@ -39,6 +39,7 @@ await _db.ShockerSharesLinksShockers.FirstOrDefaultAsync(x =>
         shocker.PermShock = data.Permissions.Shock;
         shocker.LimitDuration = data.Limits.Duration;
         shocker.LimitIntensity = data.Limits.Intensity;
+        shocker.PermLive = data.Permissions.Live;
         shocker.Cooldown = data.Cooldown;
 
         await _db.SaveChangesAsync();

diff --git a/API/Controller/Shockers/ShareShockerController.cs b/API/Controller/Shockers/ShareShockerController.cs
@@ -47,7 +47,8 @@ public async Task<BaseResponse<IEnumerable<ShareInfo>>> GetShares([FromRoute] Gu
                     {
                         Sound = x.PermSound,
                         Shock = x.PermShock,
-                        Vibrate = x.PermVibrate
+                        Vibrate = x.PermVibrate,
+                        Live = x.PermLive
                     },
                     Limits = new ShockerLimits
                     {
@@ -216,6 +217,7 @@ public async Task<BaseResponse<object>> UpdateShare(
         share.PermVibrate = data.Permissions.Vibrate;
         share.LimitDuration = data.Limits.Duration;
         share.LimitIntensity = data.Limits.Intensity;
+        share.PermLive = data.Permissions.Live;
 
         await _db.SaveChangesAsync();
 

diff --git a/API/Controller/Shockers/SharedShockersController.cs b/API/Controller/Shockers/SharedShockersController.cs
@@ -33,7 +33,8 @@ public async Task<BaseResponse<IEnumerable<OwnerShockerResponse>>> GetSharedShoc
                     {
                         Shock = x.PermShock,
                         Sound = x.PermSound,
-                        Vibrate = x.PermVibrate
+                        Vibrate = x.PermVibrate,
+                        Live = x.PermLive
                     },
                     Limits = new ShockerLimits
                     {

diff --git a/API/Models/Response/ShockerPermissions.cs b/API/Models/Response/ShockerPermissions.cs
@@ -5,4 +5,5 @@ public class ShockerPermissions
     public required bool Vibrate { get; set; }
     public required bool Sound { get; set; }
     public required bool Shock { get; set; }
+    public bool Live { get; set; } = false;
 }
diff --git a/LiveControlGateway/Controllers/DeviceController.cs b/LiveControlGateway/Controllers/DeviceController.cs
@@ -196,8 +196,6 @@ await HcOwner.OtaInstallFailed(
                     payload.OtaInstallFailed.UpdateId,
                     payload.OtaInstallFailed.Fatal,
                     payload.OtaInstallFailed.Message!);
-
-
 
                 _lastStatus = OtaUpdateStatus.Error;
                 break;