Fix User GetImageUrl calls

hhvrc · hhvrc · commit 06891cbafc15 · 2024-12-06T15:57:40.000+01:00
diff --git a/API/Controller/Admin/GetOnlineDevices.cs b/API/Controller/Admin/GetOnlineDevices.cs
@@ -1,6 +1,7 @@
 ﻿using System.Net.Mime;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using OpenShock.Common.Extensions;
 using OpenShock.Common.Models;
 using OpenShock.Common.Redis;
 using OpenShock.Common.Utils;
@@ -35,7 +36,7 @@ public async Task<IActionResult> GetOnlineDevices()
                     Owner = new GenericIni
                     {
                         Id = x.OwnerNavigation.Id,
-                        Image = x.OwnerNavigation.GetImage(),
+                        Image = x.OwnerNavigation.GetImageUrl(),
                         Name = x.OwnerNavigation.Name
                     }
                 }).ToListAsync();
diff --git a/API/Controller/Public/PublicShareController.cs b/API/Controller/Public/PublicShareController.cs
@@ -5,6 +5,7 @@
 using OpenShock.API.Models.Response;
 using OpenShock.API.Utils;
 using OpenShock.Common.Errors;
+using OpenShock.Common.Extensions;
 using OpenShock.Common.Models;
 using OpenShock.Common.Problems;
 using OpenShock.Common.Utils;
@@ -30,7 +31,7 @@ public async Task<IActionResult> GetShareLink([FromRoute] Guid shareLinkId)
             {
                 Id = x.Owner.Id,
                 Name = x.Owner.Name,
-                Image = GravatarUtils.GetImageUrl(x.Owner.Email)
+                Image = x.Owner.GetImageUrl()
             },
             x.Id,
             x.Name,
diff --git a/API/Controller/Shares/V2GetShares.cs b/API/Controller/Shares/V2GetShares.cs
@@ -5,6 +5,7 @@
 using Microsoft.EntityFrameworkCore;
 using OpenShock.API.Models.Response;
 using OpenShock.Common.Errors;
+using OpenShock.Common.Extensions;
 using OpenShock.Common.Models;
 using OpenShock.Common.Problems;
 using OpenShock.Common.Utils;
@@ -22,7 +23,7 @@ public async Task<IEnumerable<GenericIni>> GetSharesByUsers()
             .Select(x => new GenericIni
             {
                 Id = x.SharedWithNavigation.Id,
-                Image = x.SharedWithNavigation.GetImage(),
+                Image = x.SharedWithNavigation.GetImageUrl(),
                 Name = x.SharedWithNavigation.Name
             }).OrderBy(x => x.Name).Distinct().ToListAsync();
         return sharedToUsers;
diff --git a/API/Controller/Shares/V2Requests.cs b/API/Controller/Shares/V2Requests.cs
@@ -6,6 +6,7 @@
 using OpenShock.API.Models.Requests;
 using OpenShock.API.Models.Response;
 using OpenShock.Common.Errors;
+using OpenShock.Common.Extensions;
 using OpenShock.Common.Models;
 using OpenShock.Common.Problems;
 using OpenShock.Common.Utils;
@@ -28,15 +29,15 @@ public async Task<IEnumerable<ShareRequestBaseItem>> GetOutstandingRequestsList(
             {
                 Id = x.OwnerNavigation.Id,
                 Name = x.OwnerNavigation.Name,
-                Image = x.OwnerNavigation.GetImage()
+                Image = x.OwnerNavigation.GetImageUrl()
             },
             SharedWith = x.UserNavigation == null
                 ? null
                 : new GenericIni
                 {
                     Id = x.UserNavigation.Id,
                     Name = x.UserNavigation.Name,
-                    Image = x.UserNavigation.GetImage()
+                    Image = x.UserNavigation.GetImageUrl()
                 },
             Counts = new ShareRequestBaseItem.ShareRequestCounts
             {
@@ -61,15 +62,15 @@ public async Task<IEnumerable<ShareRequestBaseItem>> GetIncomingRequestsList()
                 {
                     Id = x.OwnerNavigation.Id,
                     Name = x.OwnerNavigation.Name,
-                    Image = x.OwnerNavigation.GetImage()
+                    Image = x.OwnerNavigation.GetImageUrl()
                 },
                 SharedWith = x.UserNavigation == null
                     ? null
                     : new GenericIni
                     {
                         Id = x.UserNavigation.Id,
                         Name = x.UserNavigation.Name,
-                        Image = x.UserNavigation.GetImage()
+                        Image = x.UserNavigation.GetImageUrl()
                     },
                 Counts = new ShareRequestBaseItem.ShareRequestCounts
                 {
@@ -95,15 +96,15 @@ public async Task<IActionResult> GetRequest(Guid id)
                 {
                     Id = x.OwnerNavigation.Id,
                     Name = x.OwnerNavigation.Name,
-                    Image = x.OwnerNavigation.GetImage()
+                    Image = x.OwnerNavigation.GetImageUrl()
                 },
                 SharedWith = x.UserNavigation == null
                     ? null
                     : new GenericIni
                     {
                         Id = x.UserNavigation.Id,
                         Name = x.UserNavigation.Name,
-                        Image = x.UserNavigation.GetImage()
+                        Image = x.UserNavigation.GetImageUrl()
                     },
                 Shockers = x.ShareRequestsShockers.Select(y => new ShockerPermLimitPairWithId
                 {
diff --git a/API/Controller/Shockers/ControlLogController.cs b/API/Controller/Shockers/ControlLogController.cs
@@ -6,6 +6,7 @@
 using Microsoft.EntityFrameworkCore;
 using OpenShock.API.Models.Response;
 using OpenShock.Common.Errors;
+using OpenShock.Common.Extensions;
 using OpenShock.Common.Models;
 using OpenShock.Common.Problems;
 using OpenShock.Common.Utils;
@@ -52,7 +53,7 @@ [FromQuery] [Range(1, 500)] uint limit = 100)
                     {
                         Id = x.ControlledByNavigation.Id,
                         Name = x.ControlledByNavigation.Name,
-                        Image = GravatarUtils.GetImageUrl(x.ControlledByNavigation.Email),
+                        Image = x.ControlledByNavigation.GetImageUrl(),
                         CustomName = x.CustomName
                     }
             }).ToListAsync();
diff --git a/API/Controller/Shockers/ControlShockerController.cs b/API/Controller/Shockers/ControlShockerController.cs
@@ -6,6 +6,7 @@
 using OpenShock.Common.Authentication.Attributes;
 using OpenShock.Common.DeviceControl;
 using OpenShock.Common.Errors;
+using OpenShock.Common.Extensions;
 using OpenShock.Common.Hubs;
 using OpenShock.Common.Models;
 using OpenShock.Common.Problems;
@@ -38,7 +39,7 @@ public async Task<IActionResult> SendControl(
         {
             Id = CurrentUser.Id,
             Name = CurrentUser.Name,
-            Image = GravatarUtils.GetImageUrl(CurrentUser.Email),
+            Image = CurrentUser.GetImageUrl(),
             ConnectionId = HttpContext.Connection.Id,
             AdditionalItems = EmptyDic,
             CustomName = body.CustomName
diff --git a/API/Controller/Shockers/ShareShockerController.cs b/API/Controller/Shockers/ShareShockerController.cs
@@ -4,6 +4,7 @@
 using OpenShock.API.Models.Requests;
 using OpenShock.API.Models.Response;
 using OpenShock.API.Services;
+using OpenShock.Common.Extensions;
 using OpenShock.Common.Models;
 using OpenShock.Common.OpenShockDb;
 using System.Net;
@@ -40,7 +41,7 @@ public async Task<IActionResult> GetShockerShares([FromRoute] Guid shockerId)
                     {
                         Name = x.SharedWithNavigation.Name,
                         Id = x.SharedWith,
-                        Image = GravatarUtils.GetImageUrl(x.SharedWithNavigation.Email)
+                        Image = x.SharedWithNavigation.GetImageUrl()
                     },
                     CreatedOn = x.CreatedOn,
                     Permissions = new ShockerPermissions
diff --git a/API/Controller/Users/GetSelf.cs b/API/Controller/Users/GetSelf.cs
@@ -20,7 +20,7 @@ public sealed partial class UsersController
             Id = CurrentUser.Id,
             Name = CurrentUser.Name,
             Email = CurrentUser.Email,
-            Image = CurrentUser.GetImageLink(),
+            Image = CurrentUser.GetImageUrl(),
             Rank = CurrentUser.Rank
         }
     };
diff --git a/Common/Extensions/UserExtensions.cs b/Common/Extensions/UserExtensions.cs
@@ -6,7 +6,7 @@ namespace OpenShock.Common.Extensions;
 
 public static class UserExtensions
 {
-    public static Uri GetImageLink(this User user) => GravatarUtils.GetImageUrl(user.Email);
+    public static Uri GetImageUrl(this User user) => GravatarUtils.GetImageUrl(user.Email);
 
     public static bool IsUser(this User user, Guid otherUserId)
     {
diff --git a/Common/Hubs/ShareLinkHub.cs b/Common/Hubs/ShareLinkHub.cs
@@ -2,6 +2,7 @@
 using Microsoft.EntityFrameworkCore;
 using OpenShock.Common.Authentication.Services;
 using OpenShock.Common.DeviceControl;
+using OpenShock.Common.Extensions;
 using OpenShock.Common.Models;
 using OpenShock.Common.OpenShockDb;
 using OpenShock.Common.Redis;
@@ -129,7 +130,7 @@ public Task Control(IEnumerable<Common.Models.WebSocket.User.Control> shocks)
         return await _db.Users.Select(x => new GenericIni
         {
             Id = x.Id,
-            Image = GravatarUtils.GetImageUrl(x.Email),
+            Image = x.GetImageUrl(),
             Name = x.Name
         }).FirstAsync(user => user.Id == session.UserId);
     }
diff --git a/Common/Hubs/UserHub.cs b/Common/Hubs/UserHub.cs
@@ -4,6 +4,7 @@
 using OpenShock.Common.Authentication;
 using OpenShock.Common.Authentication.Services;
 using OpenShock.Common.DeviceControl;
+using OpenShock.Common.Extensions;
 using OpenShock.Common.Models;
 using OpenShock.Common.Models.WebSocket;
 using OpenShock.Common.OpenShockDb;
@@ -85,7 +86,7 @@ public async Task ControlV2(IEnumerable<Common.Models.WebSocket.User.Control> sh
         {
             Id = x.Id,
             Name = x.Name,
-            Image = GravatarUtils.GetImageUrl(x.Email),
+            Image = x.GetImageUrl(),
             ConnectionId = Context.ConnectionId,
             AdditionalItems = additionalItems,
             CustomName = customName
diff --git a/Common/Utils/GravatarUtils.cs b/Common/Utils/GravatarUtils.cs
@@ -8,6 +8,4 @@ public static class GravatarUtils
     private static readonly string DefaultImageUrl = HttpUtility.UrlEncode("https://openshock.app/static/images/Icon512.png");
 
     public static Uri GetImageUrl(string email) => new Uri($"https://www.gravatar.com/avatar/{HashingUtils.HashSha256(email)}?d={DefaultImageUrl}");
-
-    public static Uri GetImage(this User user) => GetImageUrl(user.Email);
 }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public sealed partial class UsersController`
`20`	`20`	`Id = CurrentUser.Id,`
`21`	`21`	`Name = CurrentUser.Name,`
`22`	`22`	`Email = CurrentUser.Email,`
`23`		`- Image = CurrentUser.GetImageLink(),`
	`23`	`+ Image = CurrentUser.GetImageUrl(),`
`24`	`24`	`Rank = CurrentUser.Rank`
`25`	`25`	`}`
`26`	`26`	`};`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace OpenShock.Common.Extensions;`
`6`	`6`
`7`	`7`	`public static class UserExtensions`
`8`	`8`	`{`
`9`		`- public static Uri GetImageLink(this User user) => GravatarUtils.GetImageUrl(user.Email);`
	`9`	`+ public static Uri GetImageUrl(this User user) => GravatarUtils.GetImageUrl(user.Email);`
`10`	`10`
`11`	`11`	`public static bool IsUser(this User user, Guid otherUserId)`
`12`	`12`	`{`