Merge branch 'develop' into stable

1 files changed, 6 insertions, 6 deletions

diff --git a/src/SMAPI.Web/Framework/Clients/Pastebin/PastebinClient.cs b/src/SMAPI.Web/Framework/Clients/Pastebin/PastebinClient.cs
index 1be00be7..0e00f071 100644
--- a/src/SMAPI.Web/Framework/Clients/Pastebin/PastebinClient.cs
+++ b/src/SMAPI.Web/Framework/Clients/Pastebin/PastebinClient.cs
@@ -33,24 +33,24 @@ namespace StardewModdingAPI.Web.Framework.Clients.Pastebin
             try
             {
                 // get from API
-                string content = await this.Client
+                string? content = await this.Client
                     .GetAsync($"raw/{id}")
                     .AsString();
 
                 // handle Pastebin errors
                 if (string.IsNullOrWhiteSpace(content))
-                    return new PasteInfo { Error = "Received an empty response from Pastebin." };
+                    return new PasteInfo(null, "Received an empty response from Pastebin.");
                 if (content.StartsWith("<!DOCTYPE"))
-                    return new PasteInfo { Error = $"Received a captcha challenge from Pastebin. Please visit https://pastebin.com/{id} in a new window to solve it." };
-                return new PasteInfo { Success = true, Content = content };
+                    return new PasteInfo(null, $"Received a captcha challenge from Pastebin. Please visit https://pastebin.com/{id} in a new window to solve it.");
+                return new PasteInfo(content, null);
             }
             catch (ApiException ex) when (ex.Status == HttpStatusCode.NotFound)
             {
-                return new PasteInfo { Error = "There's no log with that ID." };
+                return new PasteInfo(null, "There's no log with that ID.");
             }
             catch (Exception ex)
             {
-                return new PasteInfo { Error = $"Pastebin error: {ex}" };
+                return new PasteInfo(null, $"Pastebin error: {ex}");
             }
         }