From 2b1f607d41b3d4d071c0db0671dbc99b6982909f Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Tue, 3 Dec 2019 21:21:28 -0500
Subject: encapsulate file storage, also handle Pastebin rate limits in JSON
 validator

---
 .../ViewModels/JsonValidator/JsonValidatorModel.cs    | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'src/SMAPI.Web/ViewModels')

diff --git a/src/SMAPI.Web/ViewModels/JsonValidator/JsonValidatorModel.cs b/src/SMAPI.Web/ViewModels/JsonValidator/JsonValidatorModel.cs
index 5b18331f..c0dd7184 100644
--- a/src/SMAPI.Web/ViewModels/JsonValidator/JsonValidatorModel.cs
+++ b/src/SMAPI.Web/ViewModels/JsonValidator/JsonValidatorModel.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -24,7 +25,13 @@ namespace StardewModdingAPI.Web.ViewModels.JsonValidator
         /// <summary>The schema validation errors, if any.</summary>
         public JsonValidatorErrorModel[] Errors { get; set; } = new JsonValidatorErrorModel[0];
 
-        /// <summary>An error which occurred while uploading the JSON to Pastebin.</summary>
+        /// <summary>A non-blocking warning while uploading the file.</summary>
+        public string UploadWarning { get; set; }
+
+        /// <summary>When the uploaded file will no longer be available.</summary>
+        public DateTime? Expiry { get; set; }
+
+        /// <summary>An error which occurred while uploading the JSON.</summary>
         public string UploadError { get; set; }
 
         /// <summary>An error which occurred while parsing the JSON.</summary>
@@ -41,7 +48,7 @@ namespace StardewModdingAPI.Web.ViewModels.JsonValidator
         public JsonValidatorModel() { }
 
         /// <summary>Construct an instance.</summary>
-        /// <param name="pasteID">The paste ID.</param>
+        /// <param name="pasteID">The stored file ID.</param>
         /// <param name="schemaName">The schema name with which the JSON was validated.</param>
         /// <param name="schemaFormats">The supported JSON schemas (names indexed by ID).</param>
         public JsonValidatorModel(string pasteID, string schemaName, IDictionary<string, string> schemaFormats)
@@ -53,14 +60,18 @@ namespace StardewModdingAPI.Web.ViewModels.JsonValidator
 
         /// <summary>Set the validated content.</summary>
         /// <param name="content">The validated content.</param>
-        public JsonValidatorModel SetContent(string content)
+        /// <param name="expiry">When the uploaded file will no longer be available.</param>
+        /// <param name="uploadWarning">A non-blocking warning while uploading the log.</param>
+        public JsonValidatorModel SetContent(string content, DateTime? expiry, string uploadWarning = null)
         {
             this.Content = content;
+            this.Expiry = expiry;
+            this.UploadWarning = uploadWarning;
 
             return this;
         }
 
-        /// <summary>Set the error which occurred while uploading the log to Pastebin.</summary>
+        /// <summary>Set the error which occurred while uploading the JSON.</summary>
         /// <param name="error">The error message.</param>
         public JsonValidatorModel SetUploadError(string error)
         {
-- 
cgit 


From 8ddb60cee636cc17291100c316df4786eb3bb448 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Tue, 3 Dec 2019 23:06:42 -0500
Subject: move supporter list into environment config

---
 src/SMAPI.Web/ViewModels/IndexModel.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/SMAPI.Web/ViewModels')

diff --git a/src/SMAPI.Web/ViewModels/IndexModel.cs b/src/SMAPI.Web/ViewModels/IndexModel.cs
index 82c4e06f..450fdc0e 100644
--- a/src/SMAPI.Web/ViewModels/IndexModel.cs
+++ b/src/SMAPI.Web/ViewModels/IndexModel.cs
@@ -15,6 +15,9 @@ namespace StardewModdingAPI.Web.ViewModels
         /// <summary>A short sentence shown under the beta download button, if any.</summary>
         public string BetaBlurb { get; set; }
 
+        /// <summary>A list of supports to credit on the main page, in Markdown format.</summary>
+        public string SupporterList { get; set; }
+
 
         /*********
         ** Public methods
@@ -26,11 +29,13 @@ namespace StardewModdingAPI.Web.ViewModels
         /// <param name="stableVersion">The latest stable SMAPI version.</param>
         /// <param name="betaVersion">The latest prerelease SMAPI version (if newer than <paramref name="stableVersion"/>).</param>
         /// <param name="betaBlurb">A short sentence shown under the beta download button, if any.</param>
-        internal IndexModel(IndexVersionModel stableVersion, IndexVersionModel betaVersion, string betaBlurb)
+        /// <param name="supporterList">A list of supports to credit on the main page, in Markdown format.</param>
+        internal IndexModel(IndexVersionModel stableVersion, IndexVersionModel betaVersion, string betaBlurb, string supporterList)
         {
             this.StableVersion = stableVersion;
             this.BetaVersion = betaVersion;
             this.BetaBlurb = betaBlurb;
+            this.SupporterList = supporterList;
         }
     }
 }
-- 
cgit