From 2274c34f076fe78a792f16f6ea0b6b246a0d5312 Mon Sep 17 00:00:00 2001
From: Gordon Pedersen <death.au@death.id.au>
Date: Tue, 2 Jul 2024 10:29:50 +1000
Subject: [PATCH] Cleaned up more warnings

---
 Classes/RestService.cs                  | 10 +++++-----
 Components/Pages/Person.razor           |  6 +++---
 Components/PicCard.razor                |  2 +-
 Components/StatusCard.razor             |  2 +-
 Models/API/AccountResponseData.cs       | 19 +++++++------------
 Models/API/AddressResponseData.cs       |  8 ++++----
 Models/API/BasicResponseData.cs         |  2 +-
 Models/API/DirectoryResponseData.cs     |  6 +++---
 Models/API/EphemeralData.cs             |  2 +-
 Models/API/EphemeralResponseData.cs     |  4 ++--
 Models/API/NowData.cs                   |  6 +++---
 Models/API/NowPageResponseData.cs       |  4 ++--
 Models/API/NowResponseData.cs           |  4 ++--
 Models/API/OmgLolResponse.cs            |  4 ++--
 Models/API/PatchStatus.cs               |  4 ++--
 Models/API/PatchStatusResponseData.cs   |  6 +++---
 Models/API/PutPic.cs                    |  2 +-
 Models/API/PutPicResponseData.cs        |  8 ++++----
 Models/API/SomePicsResponseData.cs      |  2 +-
 Models/API/StatusBioResponseData.cs     |  8 ++++----
 Models/API/StatusResponseData.cs        |  4 ++--
 Models/API/TokenResponseData.cs         |  6 +++---
 Models/Pic.cs                           | 10 +++++-----
 Models/Status.cs                        | 18 +++++++++---------
 Models/TimeData.cs                      |  2 ++
 XamlComponents/LoginWebViewPage.xaml.cs |  2 +-
 26 files changed, 74 insertions(+), 77 deletions(-)

diff --git a/Classes/RestService.cs b/Classes/RestService.cs
index 91b5b7b..f7aefe9 100644
--- a/Classes/RestService.cs
+++ b/Classes/RestService.cs
@@ -42,7 +42,7 @@ namespace Neighbourhood.omg.lol
           string str = await response.Content.ReadAsStringAsync();
           try {
             OmgLolResponse<T>? responseObj = await response.Content.ReadFromJsonAsync<OmgLolResponse<T>>(_serializerOptions, cancellationToken: cancellationToken);
-            if (responseObj != null && responseObj.Request.Success) {
+            if (responseObj?.Request?.Success ?? false) {
               responseData = responseObj.Response;
             }
           }
@@ -66,7 +66,7 @@ namespace Neighbourhood.omg.lol
         string str = await response.Content.ReadAsStringAsync();
         if (response.IsSuccessStatusCode) {
           OmgLolResponse<TResponse>? responseObj = await response.Content.ReadFromJsonAsync<OmgLolResponse<TResponse>>(_serializerOptions, cancellationToken: cancellationToken);
-          if (responseObj != null && responseObj.Request.Success) {
+          if (responseObj?.Request?.Success ?? false) {
             responseData = responseObj.Response;
           }
         }
@@ -87,7 +87,7 @@ namespace Neighbourhood.omg.lol
         HttpResponseMessage response = await _client.SendAsync(request, cancellationToken: cancellationToken);
         if (response.IsSuccessStatusCode) {
           OmgLolResponse<TResponse>? responseObj = await response.Content.ReadFromJsonAsync<OmgLolResponse<TResponse>>(_serializerOptions, cancellationToken: cancellationToken);
-          if (responseObj != null && responseObj.Request.Success) {
+          if (responseObj?.Request?.Success ?? false) {
             responseData = responseObj.Response;
           }
         }
@@ -106,7 +106,7 @@ namespace Neighbourhood.omg.lol
         string str = await response.Content.ReadAsStringAsync();
         if (response.IsSuccessStatusCode) {
           OmgLolResponse<TResponse>? responseObj = await response.Content.ReadFromJsonAsync<OmgLolResponse<TResponse>>(_serializerOptions, cancellationToken: cancellationToken);
-          if (responseObj != null && responseObj.Request.Success) {
+          if (responseObj?.Request?.Success ?? false) {
             responseData = responseObj.Response;
           }
         }
@@ -126,7 +126,7 @@ namespace Neighbourhood.omg.lol
           string str = await response.Content.ReadAsStringAsync();
           try {
             OmgLolResponse<T>? responseObj = await response.Content.ReadFromJsonAsync<OmgLolResponse<T>>(_serializerOptions, cancellationToken: cancellationToken);
-            if (responseObj != null && responseObj.Request.Success) {
+            if (responseObj?.Request?.Success ?? false) {
               responseData = responseObj.Response;
             }
           }
diff --git a/Components/Pages/Person.razor b/Components/Pages/Person.razor
index 8057a82..3506f14 100644
--- a/Components/Pages/Person.razor
+++ b/Components/Pages/Person.razor
@@ -100,7 +100,7 @@
 </div>
 
 @code {
-  private string _address;
+  private string _address = string.Empty;
   [Parameter]
   public string Address { 
     get => _address;
@@ -121,8 +121,8 @@
   public ExternalPageComponent? NowPage { get; set; }
   public ExternalPageComponent? ProfilePage { get; set; }
 
-  private StatusList StatusList { get; set; }
-  private PicList PicList { get; set; }
+  private StatusList? StatusList { get; set; }
+  private PicList? PicList { get; set; }
 
   private bool IsMe { 
     get => Address == State.SelectedAddressName;
diff --git a/Components/PicCard.razor b/Components/PicCard.razor
index 6c33ccb..5b5c3ba 100644
--- a/Components/PicCard.razor
+++ b/Components/PicCard.razor
@@ -1,7 +1,7 @@
 @inject IJSRuntime JS
 
 <article class="no-padding">
-  <img src="@Pic.Url" loading="lazy">
+  <img src="@Pic!.Url" loading="lazy">
   <div class="padding">
     <nav>
       <a class="author" href="/person/@Pic.Address#pics">
diff --git a/Components/StatusCard.razor b/Components/StatusCard.razor
index 2d9a5f5..5ecd1c8 100644
--- a/Components/StatusCard.razor
+++ b/Components/StatusCard.razor
@@ -1,6 +1,6 @@
 @inject IJSRuntime JS
 
-<article class="status gray-9-fg" style="background-color:@(Status.Background)">
+<article class="status gray-9-fg" style="background-color:@(Status!.Background)">
   <div class="row">
     <div class="emoji" data-emoji="@Status.EmojiOrDefault">@Status.EmojiOrDefault</div>
     <div class="max">
diff --git a/Models/API/AccountResponseData.cs b/Models/API/AccountResponseData.cs
index 17697eb..06ebe9b 100644
--- a/Models/API/AccountResponseData.cs
+++ b/Models/API/AccountResponseData.cs
@@ -1,14 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Neighbourhood.omg.lol.Models {
+namespace Neighbourhood.omg.lol.Models {
   public  class AccountResponseData : IOmgLolResponseData {
-        public string Message { get; set; }
-        public string Email { get; set; }
-        public string Name { get; set; }
-        // created, api_key and settings
-    }
+    public string Message { get; set; } = string.Empty;
+    public string Email { get; set; } = string.Empty;
+    public string Name { get; set; } = string.Empty;
+    public TimeData Created { get; set; } = TimeData.Empty;
+    //TODO: api_key and settings
+  }
 }
diff --git a/Models/API/AddressResponseData.cs b/Models/API/AddressResponseData.cs
index 263c7c8..26b78be 100644
--- a/Models/API/AddressResponseData.cs
+++ b/Models/API/AddressResponseData.cs
@@ -6,10 +6,10 @@ using System.Threading.Tasks;
 
 namespace Neighbourhood.omg.lol.Models {
   public class AddressResponseData : IOmgLolResponseData {
-    public string Address { get; set; }
-    public string Message { get; set; }
-    public RegistrationData Registration { get; set; }
-    public ExpirationData Expiration { get; set; }
+    public string Address { get; set; } = string.Empty;
+    public string Message { get; set; } = string.Empty;
+    public RegistrationData? Registration { get; set; }
+    public ExpirationData? Expiration { get; set; }
     public PreferenceData? Preferences { get; set; }
 
     public class RegistrationData : TimeData {
diff --git a/Models/API/BasicResponseData.cs b/Models/API/BasicResponseData.cs
index bf48b16..6c89cd8 100644
--- a/Models/API/BasicResponseData.cs
+++ b/Models/API/BasicResponseData.cs
@@ -6,6 +6,6 @@ using System.Threading.Tasks;
 
 namespace Neighbourhood.omg.lol.Models {
   public class BasicResponseData : IOmgLolResponseData {
-    public string Message { get; set; }
+    public string Message { get; set; } = string.Empty;
   }
 }
diff --git a/Models/API/DirectoryResponseData.cs b/Models/API/DirectoryResponseData.cs
index b46dd32..34486c0 100644
--- a/Models/API/DirectoryResponseData.cs
+++ b/Models/API/DirectoryResponseData.cs
@@ -6,8 +6,8 @@ using System.Threading.Tasks;
 
 namespace Neighbourhood.omg.lol.Models {
   public class DirectoryResponseData : IOmgLolResponseData {
-    public string Message { get; set; }
-    public string Url { get; set; }
-    public List<string> Directory { get; set; }
+    public string Message { get; set; } = string.Empty;
+    public string Url { get; set; } = string.Empty;
+    public List<string> Directory { get; set; } = new List<string>();
   }
 }
diff --git a/Models/API/EphemeralData.cs b/Models/API/EphemeralData.cs
index 81d96e7..df884d1 100644
--- a/Models/API/EphemeralData.cs
+++ b/Models/API/EphemeralData.cs
@@ -6,6 +6,6 @@ using System.Threading.Tasks;
 
 namespace Neighbourhood.omg.lol.Models {
   public class EphemeralData {
-    public string Content { get; set; }
+    public string Content { get; set; } = string.Empty;
   }
 }
diff --git a/Models/API/EphemeralResponseData.cs b/Models/API/EphemeralResponseData.cs
index ed106cd..46a3c5c 100644
--- a/Models/API/EphemeralResponseData.cs
+++ b/Models/API/EphemeralResponseData.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace Neighbourhood.omg.lol.Models {
   public class EphemeralResponseData : IOmgLolResponseData {
-    public string Message { get; set; }
-    public List<string> Content { get; set; }
+    public string Message { get; set; } = string.Empty;
+    public List<string> Content { get; set; } = new List<string>();
   }
 }
diff --git a/Models/API/NowData.cs b/Models/API/NowData.cs
index 1fa2145..f58e3aa 100644
--- a/Models/API/NowData.cs
+++ b/Models/API/NowData.cs
@@ -1,9 +1,9 @@
 namespace Neighbourhood.omg.lol.Models
 {
     public class NowData {
-    public string Address { get; set; }
-    public string Url { get; set; }
-    public TimeData Updated {  get; set; }
+    public string Address { get; set; } = string.Empty;
+    public string Url { get; set; } = string.Empty;
+    public TimeData Updated { get; set; } = TimeData.Empty;
 
     public string UpdatedRelative {
       get => Utilities.RelativeTimeFromUnix(Convert.ToInt64(Updated.UnixEpochTime));
diff --git a/Models/API/NowPageResponseData.cs b/Models/API/NowPageResponseData.cs
index 78a89f6..3bfb50a 100644
--- a/Models/API/NowPageResponseData.cs
+++ b/Models/API/NowPageResponseData.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace Neighbourhood.omg.lol.Models {
   public class NowPageResponseData : IOmgLolResponseData {
-    public string Message { get; set; }
-    public NowContentData Now { get; set; }
+    public string Message { get; set; } = string.Empty;
+    public NowContentData? Now { get; set; }
   }
 }
diff --git a/Models/API/NowResponseData.cs b/Models/API/NowResponseData.cs
index fd22dc9..2805eaf 100644
--- a/Models/API/NowResponseData.cs
+++ b/Models/API/NowResponseData.cs
@@ -6,8 +6,8 @@ using System.Threading.Tasks;
 
 namespace Neighbourhood.omg.lol.Models {
   public class NowResponseData : IOmgLolResponseData {
-    public string Message { get; set; }
+    public string Message { get; set; } = string.Empty;
     public long Count { get; set; }
-    public List<NowData> Garden { get; set; }
+    public List<NowData> Garden { get; set; } = new List<NowData>();
   }
 }
diff --git a/Models/API/OmgLolResponse.cs b/Models/API/OmgLolResponse.cs
index e869b41..c742d52 100644
--- a/Models/API/OmgLolResponse.cs
+++ b/Models/API/OmgLolResponse.cs
@@ -1,6 +1,6 @@
 namespace Neighbourhood.omg.lol.Models {
   public class OmgLolResponse<TResponseData> where TResponseData : IOmgLolResponseData {
-    public OmgLolRequestData Request {  get; set; }
-    public TResponseData Response { get; set; }
+    public OmgLolRequestData? Request {  get; set; }
+    public TResponseData? Response { get; set; }
   }
 }
diff --git a/Models/API/PatchStatus.cs b/Models/API/PatchStatus.cs
index 24b9936..5f1a716 100644
--- a/Models/API/PatchStatus.cs
+++ b/Models/API/PatchStatus.cs
@@ -6,8 +6,8 @@ using System.Threading.Tasks;
 
 namespace Neighbourhood.omg.lol.Models {
   public class PatchStatus {
-    public string Id { get; set; }
-    public string Content { get; set; }
+    public string Id { get; set; } = string.Empty;
+    public string Content { get; set; } = string.Empty;
     public string? Emoji {  get; set; }
   }
 }
diff --git a/Models/API/PatchStatusResponseData.cs b/Models/API/PatchStatusResponseData.cs
index 5766903..f80b0a9 100644
--- a/Models/API/PatchStatusResponseData.cs
+++ b/Models/API/PatchStatusResponseData.cs
@@ -6,8 +6,8 @@ using System.Threading.Tasks;
 
 namespace Neighbourhood.omg.lol.Models {
   public class PatchStatusResponseData : IOmgLolResponseData {
-    public string Message { get; set; }
-    public string Id { get; set; }
-    public string Url { get; set; }
+    public string Message { get; set; } = string.Empty;
+    public string Id { get; set; } = string.Empty;
+    public string Url { get; set; } = string.Empty;
   }
 }
diff --git a/Models/API/PutPic.cs b/Models/API/PutPic.cs
index fc01782..d297ec4 100644
--- a/Models/API/PutPic.cs
+++ b/Models/API/PutPic.cs
@@ -6,6 +6,6 @@ using System.Threading.Tasks;
 
 namespace Neighbourhood.omg.lol.Models {
   public class PutPic {
-    public string Pic { get; set; }
+    public string Pic { get; set; } = string.Empty;
   }
 }
diff --git a/Models/API/PutPicResponseData.cs b/Models/API/PutPicResponseData.cs
index e261fb8..8f5b9b2 100644
--- a/Models/API/PutPicResponseData.cs
+++ b/Models/API/PutPicResponseData.cs
@@ -6,10 +6,10 @@ using System.Threading.Tasks;
 
 namespace Neighbourhood.omg.lol.Models {
   public class PutPicResponseData : IOmgLolResponseData {
-    public string Message { get; set; }
-    public string Id { get; set; }
+    public string Message { get; set; } = string.Empty;
+    public string Id { get; set; } = string.Empty;
     public long Size { get; set; }
-    public string Mime { get; set; }
-    public string Url { get; set; }
+    public string Mime { get; set; } = string.Empty;
+    public string Url { get; set; } = string.Empty;
   }
 }
diff --git a/Models/API/SomePicsResponseData.cs b/Models/API/SomePicsResponseData.cs
index a6cd373..49415df 100644
--- a/Models/API/SomePicsResponseData.cs
+++ b/Models/API/SomePicsResponseData.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace Neighbourhood.omg.lol.Models {
   public class SomePicsResponseData : IOmgLolResponseData {
-    public string Message { get; set; }
+    public string Message { get; set; } = string.Empty;
     public List<Pic>? Pics { get; set; }
   }
 }
diff --git a/Models/API/StatusBioResponseData.cs b/Models/API/StatusBioResponseData.cs
index a5d0c0d..3d07f48 100644
--- a/Models/API/StatusBioResponseData.cs
+++ b/Models/API/StatusBioResponseData.cs
@@ -6,9 +6,9 @@ using System.Threading.Tasks;
 
 namespace Neighbourhood.omg.lol.Models {
   public class StatusBioResponseData : IOmgLolResponseData {
-    public string Message { get; set; }
-    public string Bio { get; set; }
-    public string Css { get; set; }
-    public string Head { get; set; }
+    public string Message { get; set; } = string.Empty;
+    public string Bio { get; set; } = string.Empty;
+    public string Css { get; set; } = string.Empty;
+    public string Head { get; set; } = string.Empty;
   }
 }
diff --git a/Models/API/StatusResponseData.cs b/Models/API/StatusResponseData.cs
index 15870ff..241ebe1 100644
--- a/Models/API/StatusResponseData.cs
+++ b/Models/API/StatusResponseData.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace Neighbourhood.omg.lol.Models {
   public class StatusResponseData : IOmgLolResponseData {
-    public string Message { get; set; }
-    public List<Status> Statuses { get; set; }
+    public string Message { get; set; } = string.Empty;
+    public List<Status> Statuses { get; set; } = new List<Status>();
   }
 }
diff --git a/Models/API/TokenResponseData.cs b/Models/API/TokenResponseData.cs
index 659d8ec..25470f0 100644
--- a/Models/API/TokenResponseData.cs
+++ b/Models/API/TokenResponseData.cs
@@ -1,7 +1,7 @@
 namespace Neighbourhood.omg.lol.Models {
   public class TokenResponseData {
-    public string AccessToken { get; set; }
-    public string TokenType { get; set; }
-    public string Scope { get; set; }
+    public string AccessToken { get; set; } = string.Empty;
+    public string TokenType { get; set; } = string.Empty;
+    public string Scope { get; set; } = string.Empty;
   }
 }
diff --git a/Models/Pic.cs b/Models/Pic.cs
index db68493..fcaca2f 100644
--- a/Models/Pic.cs
+++ b/Models/Pic.cs
@@ -4,13 +4,13 @@ using System.Text.Json.Serialization;
 namespace Neighbourhood.omg.lol.Models
 {
     public class Pic {
-    public string Id { get; set; }
-    public string Url { get; set; }
-    public string Address { get; set; }
+    public string Id { get; set; } = string.Empty;
+    public string Url { get; set; } = string.Empty;
+    public string Address { get; set; } = string.Empty;
     public long Created { get; set; }
     public long Size { get; set; }
-    public string Mime { get; set; }
-    public string Description { get; set; }
+    public string Mime { get; set; } = string.Empty;
+    public string Description { get; set; } = string.Empty;
     public string DescriptionHtml { get => Description == null ? string.Empty : Utilities.MdToHtml(Description); }
 
     public DateTimeOffset CreatedTime { get => DateTimeOffset.UnixEpoch.AddSeconds(Created); }
diff --git a/Models/Status.cs b/Models/Status.cs
index fa314f7..4b7ba2d 100644
--- a/Models/Status.cs
+++ b/Models/Status.cs
@@ -3,16 +3,16 @@
 namespace Neighbourhood.omg.lol.Models
 {
     public class Status {
-    public string Id { get; set; }
-    public string Address { get; set; }
-    public string Created { get; set; }
-    public string RelativeTime { get; set; }
-    public string Emoji { get; set; }
-    public string Background { get; set; }
+    public string Id { get; set; } = string.Empty;
+    public string Address { get; set; } = string.Empty;
+    public string Created { get; set; } = string.Empty;
+    public string RelativeTime { get; set; } = string.Empty;
+    public string Emoji { get; set; } = string.Empty;
+    public string Background { get; set; } = string.Empty;
     public string BackgroundColor { get => Background; set => Background = "#" + value; }
-    public string Content { get; set; }
-    public string RenderedMarkdown { get; set; }
-    public string ExternalUrl { get; set; }
+    public string Content { get; set; } = string.Empty;
+    public string RenderedMarkdown { get; set; } = string.Empty;
+    public string ExternalUrl { get; set; } = string.Empty;
 
     public DateTimeOffset CreatedTime { get => DateTimeOffset.UnixEpoch.AddSeconds(Convert.ToInt64(Created)); }
 
diff --git a/Models/TimeData.cs b/Models/TimeData.cs
index 8ec8c63..2d54df5 100644
--- a/Models/TimeData.cs
+++ b/Models/TimeData.cs
@@ -10,5 +10,7 @@ namespace Neighbourhood.omg.lol.Models {
     public string? Iso8601Time { get; set; }
     public string? Rfc2822Time { get; set; }
     public string? RelativeTime { get; set; }
+
+    public static TimeData Empty { get => new TimeData(); }
   }
 }
diff --git a/XamlComponents/LoginWebViewPage.xaml.cs b/XamlComponents/LoginWebViewPage.xaml.cs
index 95ea2ee..ec1b50e 100644
--- a/XamlComponents/LoginWebViewPage.xaml.cs
+++ b/XamlComponents/LoginWebViewPage.xaml.cs
@@ -49,7 +49,7 @@ public partial class LoginWebViewPage : ContentPage
 				string? token = await api.OAuth(code, client_id, client_secret, redirect_uri);
 				if (!string.IsNullOrEmpty(token)) {
 					await ((CustomAuthenticationStateProvider)this.AuthStateProvider).Login(token);
-					NavigatorService.NavigationManager.NavigateTo(NavigatorService.NavigationManager.Uri, forceLoad: true);
+					NavigatorService?.NavigationManager?.NavigateTo(NavigatorService.NavigationManager.Uri, forceLoad: true);
 					await Shell.Current.GoToAsync("..");
         }
 			}