From d5b2ec15b82cc9723d41d3e5b0dcf657f8593197 Mon Sep 17 00:00:00 2001
From: pancakes <trypancakes@tutanota.com>
Date: Fri, 20 Dec 2024 17:40:14 +1000
Subject: [PATCH] [frontend/pages] Use UserProfileEntity.AvatarAlt and
 .BannerAlt

---
 .../ProfileControllerModel.cs                 |  8 ++---
 .../Pages/Settings/Profile.razor              | 32 +++++++++----------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/Iceshrimp.Frontend/Core/ControllerModels/ProfileControllerModel.cs b/Iceshrimp.Frontend/Core/ControllerModels/ProfileControllerModel.cs
index 75147180..756e15b1 100644
--- a/Iceshrimp.Frontend/Core/ControllerModels/ProfileControllerModel.cs
+++ b/Iceshrimp.Frontend/Core/ControllerModels/ProfileControllerModel.cs
@@ -10,12 +10,8 @@ internal class ProfileControllerModel(ApiClient api)
 	public Task<UserProfileEntity> GetProfileAsync() =>
 		api.CallAsync<UserProfileEntity>(HttpMethod.Get, "/profile");
 
-	public Task UpdateProfileAsync(UserProfileEntity request, string? newAvatarAlt, string? newBannerAlt) =>
-		api.CallAsync(HttpMethod.Put, "/profile",
-		              QueryString.Create(new Dictionary<string, string?>
-		              {
-			              { "newAvatarAlt", newAvatarAlt }, { "newBannerAlt", newBannerAlt }
-		              }), request);
+	public Task UpdateProfileAsync(UserProfileEntity request) =>
+		api.CallAsync(HttpMethod.Put, "/profile", data: request);
 
 	public Task<DriveFileResponse> GetAvatarAsync() =>
 		api.CallAsync<DriveFileResponse>(HttpMethod.Get, "/profile/avatar");
diff --git a/Iceshrimp.Frontend/Pages/Settings/Profile.razor b/Iceshrimp.Frontend/Pages/Settings/Profile.razor
index 20dea95f..35b4f66b 100644
--- a/Iceshrimp.Frontend/Pages/Settings/Profile.razor
+++ b/Iceshrimp.Frontend/Pages/Settings/Profile.razor
@@ -38,7 +38,7 @@
             @if (Banner != null || BannerFile != null)
             {
                 <label for="banner-alt">@(BannerFile != null ? Loc["Set alt text for your new banner"] : Loc["Set alt text for your banner"])</label>
-                <textarea class="input alt-text" @bind="BannerAlt" id="banner-alt" rows="3" placeholder="@Loc["Alt text"]" disabled="@DelBanner"></textarea>
+                <textarea class="input alt-text" @bind="UserProfile.BannerAlt" id="banner-alt" rows="3" placeholder="@Loc["Alt text"]" disabled="@DelBanner"></textarea>
             }
         </div>
         <div class="section">
@@ -55,7 +55,7 @@
             @if (Avatar != null || AvatarFile != null)
             {
                 <label for="avatar-alt">@(AvatarFile != null ? Loc["Set alt text for your new avatar"] : Loc["Set alt text for your avatar"])</label>
-                <textarea class="input alt-text" @bind="AvatarAlt" id="avatar-alt" rows="3" placeholder="@Loc["Alt text"]" disabled="@DelAvatar"></textarea>
+                <textarea class="input alt-text" @bind="UserProfile.AvatarAlt" id="avatar-alt" rows="3" placeholder="@Loc["Alt text"]" disabled="@DelAvatar"></textarea>
             }
         </div>
         <div class="section">
@@ -149,10 +149,8 @@
     private string            FieldValue  { get; set; } = "";
     private StateButton       SaveButton  { get; set; } = null!;
     private IBrowserFile?     AvatarFile  { get; set; } = null;
-    private string?           AvatarAlt   { get; set; }
     private bool              DelAvatar   { get; set; } = false;
     private IBrowserFile?     BannerFile  { get; set; } = null;
-    private string?           BannerAlt   { get; set; }
     private bool              DelBanner   { get; set; } = false;
     private DateTime          Birthday    { get; set; } = DateTime.Now;
     private bool              SetBirthday { get; set; } = false;
@@ -181,8 +179,8 @@
             Avatar = await Api.Profile.GetAvatarAsync();
             Banner = await Api.Profile.GetBannerAsync();
 
-            AvatarAlt = Avatar.Description;
-            BannerAlt = Banner.Description;
+            UserProfile.AvatarAlt = Avatar.Description;
+            UserProfile.BannerAlt = Banner.Description;
         }
         catch (ApiException e)
         {
@@ -217,26 +215,26 @@
             if (DelAvatar)
             {
                 await Api.Profile.DeleteAvatarAsync();
-                AvatarAlt = null;
+                UserProfile.AvatarAlt = null;
             }
             else if (AvatarFile != null)
             {
-                await Api.Profile.UpdateAvatarAsync(AvatarFile, AvatarAlt);
-                AvatarAlt = null;
+                await Api.Profile.UpdateAvatarAsync(AvatarFile, UserProfile.AvatarAlt);
+                UserProfile.AvatarAlt = null;
             }
 
             if (DelBanner)
             {
                 await Api.Profile.DeleteBannerAsync();
-                BannerAlt = null;
+                UserProfile.BannerAlt = null;
             }
             else if (BannerFile != null)
             {
-                await Api.Profile.UpdateBannerAsync(BannerFile, BannerAlt);
-                BannerAlt = null;
+                await Api.Profile.UpdateBannerAsync(BannerFile, UserProfile.BannerAlt);
+                UserProfile.BannerAlt = null;
             }
 
-            await Api.Profile.UpdateProfileAsync(UserProfile, AvatarAlt, BannerAlt);
+            await Api.Profile.UpdateProfileAsync(UserProfile);
             SaveButton.State = StateButton.StateEnum.Success;
         }
         catch (ApiException e)
@@ -248,14 +246,14 @@
 
     private void OnAvatarFileChange(InputFileChangeEventArgs e)
     {
-        AvatarFile = e.GetMultipleFiles().First(p => p.ContentType.StartsWith("image/"));
-        AvatarAlt  = "";
+        AvatarFile            = e.GetMultipleFiles().First(p => p.ContentType.StartsWith("image/"));
+        UserProfile.AvatarAlt = "";
     }
 
     private void OnBannerFileChange(InputFileChangeEventArgs e)
     {
-        BannerFile = e.GetMultipleFiles().First(p => p.ContentType.StartsWith("image/"));
-        BannerAlt  = "";
+        BannerFile            = e.GetMultipleFiles().First(p => p.ContentType.StartsWith("image/"));
+        UserProfile.BannerAlt = "";
     }
 
     private void ToggleEmojiPicker()