From ed236340cdb2f5b3f8135d3dc4ea023c6ad31619 Mon Sep 17 00:00:00 2001
From: exsersewo <exsersewo@systemexit.co.uk>
Date: Sat, 28 Mar 2020 13:58:59 +0000
Subject: [PATCH] Fix Null Refs with ImageUrl

---
 Booru.Net.Tests/Booru.Net.Tests.csproj   | 4 ++--
 Booru.Net.Tests/Program.cs               | 2 +-
 Booru.Net/Booru.Net.csproj               | 6 +++---
 Booru.Net/Models/Boards/DanBooruImage.cs | 6 ++++++
 Booru.Net/Models/Boards/GelbooruImage.cs | 6 ++++++
 Booru.Net/Models/BooruImage.cs           | 4 ++--
 6 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/Booru.Net.Tests/Booru.Net.Tests.csproj b/Booru.Net.Tests/Booru.Net.Tests.csproj
index 24d1af4..2e818e3 100644
--- a/Booru.Net.Tests/Booru.Net.Tests.csproj
+++ b/Booru.Net.Tests/Booru.Net.Tests.csproj
@@ -3,8 +3,8 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <AssemblyVersion>2020.3.24.0</AssemblyVersion>
-    <FileVersion>2020.3.24.0</FileVersion>
+    <AssemblyVersion>2020.3.25.0</AssemblyVersion>
+    <FileVersion>2020.3.25.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Booru.Net.Tests/Program.cs b/Booru.Net.Tests/Program.cs
index 2de2edf..4a1fc69 100644
--- a/Booru.Net.Tests/Program.cs
+++ b/Booru.Net.Tests/Program.cs
@@ -56,7 +56,7 @@ namespace Booru.Net.Tests
 
                 if (posts != null)
                 {
-                    Console.WriteLine(posts.All(x => x != null));
+                    Console.WriteLine(posts.All(x => x.ImageUrl != null));
                 }
             }
             catch(Exception ex)
diff --git a/Booru.Net/Booru.Net.csproj b/Booru.Net/Booru.Net.csproj
index b633709..e14a93a 100644
--- a/Booru.Net/Booru.Net.csproj
+++ b/Booru.Net/Booru.Net.csproj
@@ -24,10 +24,10 @@ Yande.re</Description>
     <PackageTags>booru imageboard api wrapper</PackageTags>
     <PackageLicenseUrl></PackageLicenseUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <Version>2.0.2</Version>
+    <Version>2.0.3</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <AssemblyVersion>2.0.2.0</AssemblyVersion>
-    <FileVersion>2.0.2.0</FileVersion>
+    <AssemblyVersion>2.0.3.0</AssemblyVersion>
+    <FileVersion>2.0.3.0</FileVersion>
     <PackageReleaseNotes>Readded DanBooruImage#Score from Inheritence Rework</PackageReleaseNotes>
   </PropertyGroup>
 
diff --git a/Booru.Net/Models/Boards/DanBooruImage.cs b/Booru.Net/Models/Boards/DanBooruImage.cs
index 0569e4d..d500517 100644
--- a/Booru.Net/Models/Boards/DanBooruImage.cs
+++ b/Booru.Net/Models/Boards/DanBooruImage.cs
@@ -8,6 +8,12 @@ namespace Booru.Net
 		[JsonProperty("score")]
 		public int? Score { get; set; }
 
+		[JsonProperty("file_url")]
+		private string FileUrl { get; set; }
+
+		public override string ImageUrl
+			=> FileUrl;
+
 		[JsonProperty("tag_string")]
 		private string TagString { get; set; }
 
diff --git a/Booru.Net/Models/Boards/GelbooruImage.cs b/Booru.Net/Models/Boards/GelbooruImage.cs
index 07b3973..73898d0 100644
--- a/Booru.Net/Models/Boards/GelbooruImage.cs
+++ b/Booru.Net/Models/Boards/GelbooruImage.cs
@@ -11,6 +11,12 @@ namespace Booru.Net
 		[JsonProperty("directory")]
 		public string Directory { get; set; }
 
+		[JsonProperty("file_url")]
+		private string FileUrl { get; set; }
+
+		public override string ImageUrl
+			=> FileUrl;
+
 		[JsonProperty("tags")]
 		private string Ptags { get; set; }
 
diff --git a/Booru.Net/Models/BooruImage.cs b/Booru.Net/Models/BooruImage.cs
index 1ebb516..8318a72 100644
--- a/Booru.Net/Models/BooruImage.cs
+++ b/Booru.Net/Models/BooruImage.cs
@@ -10,9 +10,9 @@ namespace Booru.Net
 		[JsonProperty("rating")]
 		private string Prating { get; set; }
 
-        public virtual string ImageUrl { get; set; }
+        public virtual string ImageUrl { get; private set; }
 
-        public virtual string PostUrl { get; set; }
+        public virtual string PostUrl { get; private set; }
 
 		public Rating Rating
 		{