diff --git a/API/API.csproj b/API/API.csproj index 70acac39..9e2ce2ef 100644 --- a/API/API.csproj +++ b/API/API.csproj @@ -6,7 +6,7 @@ enable OpenShock.API OpenShock.API - 3.3.0 + 3.3.1 true OpenShock API diff --git a/API/Controller/Shockers/SharedShockersController.cs b/API/Controller/Shockers/SharedShockersController.cs index 74169a8f..233d34fb 100644 --- a/API/Controller/Shockers/SharedShockersController.cs +++ b/API/Controller/Shockers/SharedShockersController.cs @@ -4,6 +4,7 @@ using OpenShock.API.Models.Response; using OpenShock.Common.Models; using OpenShock.ServicesCommon.Problems; +using OpenShock.ServicesCommon.Utils; namespace OpenShock.API.Controller.Shockers; @@ -23,6 +24,7 @@ public async Task>> ListSharedSho { OwnerId = x.Shocker.DeviceNavigation.OwnerNavigation.Id, OwnerName = x.Shocker.DeviceNavigation.OwnerNavigation.Name, + OwnerEmail = x.Shocker.DeviceNavigation.OwnerNavigation.Email, DeviceId = x.Shocker.DeviceNavigation.Id, DeviceName = x.Shocker.DeviceNavigation.Name, Shocker = new OwnerShockerResponse.SharedDevice.SharedShocker @@ -54,7 +56,8 @@ public async Task>> ListSharedSho shared[shocker.OwnerId] = new OwnerShockerResponse { Id = shocker.OwnerId, - Name = shocker.OwnerName + Name = shocker.OwnerName, + Image = GravatarUtils.GetImageUrl(shocker.OwnerEmail) }; var sharedUser = shared[shocker.OwnerId]; diff --git a/API/Models/Response/OwnerShockerResponse.cs b/API/Models/Response/OwnerShockerResponse.cs index a6dca8c8..b88c7e38 100644 --- a/API/Models/Response/OwnerShockerResponse.cs +++ b/API/Models/Response/OwnerShockerResponse.cs @@ -1,9 +1,9 @@ -namespace OpenShock.API.Models.Response; +using OpenShock.Common.Models; -public class OwnerShockerResponse +namespace OpenShock.API.Models.Response; + +public class OwnerShockerResponse : GenericIni { - public required Guid Id { get; set; } - public required string Name { get; set; } public IList Devices { get; set; } = new List(); public class SharedDevice diff --git a/Cron/Cron.csproj b/Cron/Cron.csproj index 8a6930cc..91a6f70d 100644 --- a/Cron/Cron.csproj +++ b/Cron/Cron.csproj @@ -7,7 +7,7 @@ OpenShock.Cron OpenShock.Cron OpenShock - 3.3.0 + 3.3.1 a2109c1e-fb11-44d7-8127-346ef60cb9a5 diff --git a/LiveControlGateway/LiveControlGateway.csproj b/LiveControlGateway/LiveControlGateway.csproj index 60e0985f..15690d35 100644 --- a/LiveControlGateway/LiveControlGateway.csproj +++ b/LiveControlGateway/LiveControlGateway.csproj @@ -7,7 +7,7 @@ OpenShock.LiveControlGateway OpenShock.LiveControlGateway OpenShock - 3.3.0 + 3.3.1 LiveControlGateway true 12