Merge branch 'master' into v1.1-prep

qJake · Aug 11, 2020 · dbe7620 · dbe7620
2 parents 215d8d1 + 69bc6a3
commit dbe7620
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/Docker/BuildHaccContainers.ps1 b/Docker/BuildHaccContainers.ps1
@@ -1,4 +1,4 @@
-$version = '1.0.18'
+$version = '1.0.19'
 
 function Test-ExitCode ([int] $Expected = 0)
 {

diff --git a/HADotNet.CommandCenter/Models/Config/Tiles/SwitchTile.cs b/HADotNet.CommandCenter/Models/Config/Tiles/SwitchTile.cs
@@ -45,6 +45,12 @@ public class SwitchTile : BaseEntityTile
         /// <remarks>Switches are weird... some of them don't like the homeassistant.toggle service. So we do our own logic.</remarks>
         public override async Task OnClick(ServiceClient serviceClient)
         {
+            var serviceDomain = EntityId.Split('.')[0].ToLower();
+            if (serviceDomain.ToUpper() == "GROUP")
+            {
+                serviceDomain = "homeassistant";
+            }
+
             var stateClient = ClientFactory.GetClient<StatesClient>();
             var state = await stateClient.GetState(EntityId);
             var serviceName = 
@@ -54,7 +60,8 @@ public override async Task OnClick(ServiceClient serviceClient)
                 || state.State.ToUpper() == "STANDBY"
                 || state.State.ToUpper() == "IDLE"
                 ? "turn_on" : "turn_off";
-            await serviceClient.CallService(EntityId.Split('.')[0].ToLower(), serviceName, new { entity_id = EntityId });
+
+            await serviceClient.CallService(serviceDomain, serviceName, new { entity_id = EntityId });
         }
     }
 }