Merge branch 'develop' into stable

1 files changed, 13 insertions, 12 deletions

diff --git a/src/SMAPI.Web/Framework/LogParsing/LogMessageBuilder.cs b/src/SMAPI.Web/Framework/LogParsing/LogMessageBuilder.cs
index 992876ef..a1384b8f 100644
--- a/src/SMAPI.Web/Framework/LogParsing/LogMessageBuilder.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/LogMessageBuilder.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Text;
 using StardewModdingAPI.Web.Framework.LogParsing.Models;
 
@@ -11,7 +12,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
         ** Fields
         *********/
         /// <summary>The local time when the next log was posted.</summary>
-        public string Time { get; set; }
+        public string? Time { get; set; }
 
         /// <summary>The log level for the next log message.</summary>
         public LogLevel Level { get; set; }
@@ -20,16 +21,17 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
         public int ScreenId { get; set; }
 
         /// <summary>The mod name for the next log message.</summary>
-        public string Mod { get; set; }
+        public string? Mod { get; set; }
 
         /// <summary>The text for the next log message.</summary>
-        private readonly StringBuilder Text = new StringBuilder();
+        private readonly StringBuilder Text = new();
 
 
         /*********
         ** Accessors
         *********/
         /// <summary>Whether the next log message has been started.</summary>
+        [MemberNotNullWhen(true, nameof(LogMessageBuilder.Time), nameof(LogMessageBuilder.Mod))]
         public bool Started { get; private set; }
 
 
@@ -70,19 +72,18 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
         }
 
         /// <summary>Get a log message for the accumulated values.</summary>
-        public LogMessage Build()
+        public LogMessage? Build()
         {
             if (!this.Started)
                 return null;
 
-            return new LogMessage
-            {
-                Time = this.Time,
-                Level = this.Level,
-                ScreenId = this.ScreenId,
-                Mod = this.Mod,
-                Text = this.Text.ToString()
-            };
+            return new LogMessage(
+                time: this.Time,
+                level: this.Level,
+                screenId: this.ScreenId,
+                mod: this.Mod,
+                text: this.Text.ToString()
+            );
         }
 
         /// <summary>Reset to start a new log message.</summary>