From 57a87296ccfb7720c77780105c14e4c64ff72076 Mon Sep 17 00:00:00 2001
From: Raymond <daemitus@gmail.com>
Date: Thu, 15 Jul 2021 21:03:14 -0400
Subject: [PATCH 1/2] Expose MakeItalics as a helper method, add params to
 SeString ctor

---
 Dalamud/Game/ChatHandlers.cs                  | 35 ++++++++-----------
 .../Game/Text/SeStringHandling/SeString.cs    |  4 +--
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/Dalamud/Game/ChatHandlers.cs b/Dalamud/Game/ChatHandlers.cs
index 9fa2411df..6a03c4b5b 100644
--- a/Dalamud/Game/ChatHandlers.cs
+++ b/Dalamud/Game/ChatHandlers.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using System.Reflection;
 using System.Text;
@@ -11,7 +10,6 @@ using CheapLoc;
 using Dalamud.Game.Text;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Game.Text.SeStringHandling.Payloads;
-using Dalamud.Interface.Internal.Windows;
 using Serilog;
 
 namespace Dalamud.Game
@@ -121,24 +119,21 @@ namespace Dalamud.Game
         /// </summary>
         public string LastLink { get; private set; }
 
-        // /// <summary>
-        // /// Convert a string to SeString and wrap in italics payloads.
-        // /// </summary>
-        // /// <param name="text">Text to convert.</param>
-        // /// <returns>SeString payload of italicized text.</returns>
-        // private static SeString MakeItalics(string text)
-        // {
-        //     // TODO: when the code OnCharMessage is switched to SeString, this can be a straight insertion of the
-        //     // italics payloads only, and be a lot cleaner
-        //     var italicString = new SeString(new List<Payload>(new Payload[]
-        //     {
-        //         EmphasisItalicPayload.ItalicsOn,
-        //         new TextPayload(text),
-        //         EmphasisItalicPayload.ItalicsOff,
-        //     }));
-        //
-        //     return italicString;
-        // }
+        /// <summary>
+        /// Convert a TextPayload to SeString and wrap in italics payloads.
+        /// </summary>
+        /// <param name="text">Text to convert.</param>
+        /// <returns>SeString payload of italicized text.</returns>
+        public static SeString MakeItalics(string text)
+            => MakeItalics(new TextPayload(text));
+
+        /// <summary>
+        /// Convert a TextPayload to SeString and wrap in italics payloads.
+        /// </summary>
+        /// <param name="text">Text to convert.</param>
+        /// <returns>SeString payload of italicized text.</returns>
+        public static SeString MakeItalics(TextPayload text)
+            => new(EmphasisItalicPayload.ItalicsOn, text, EmphasisItalicPayload.ItalicsOff);
 
         private void OnCheckMessageHandled(XivChatType type, uint senderid, ref SeString sender, ref SeString message, ref bool isHandled)
         {
diff --git a/Dalamud/Game/Text/SeStringHandling/SeString.cs b/Dalamud/Game/Text/SeStringHandling/SeString.cs
index 43ae7600e..7bce9e1c5 100644
--- a/Dalamud/Game/Text/SeStringHandling/SeString.cs
+++ b/Dalamud/Game/Text/SeStringHandling/SeString.cs
@@ -29,7 +29,7 @@ namespace Dalamud.Game.Text.SeStringHandling
         /// Creates a new SeString from an ordered list of payloads.
         /// </summary>
         /// <param name="payloads">The Payload objects to make up this string.</param>
-        public SeString(Payload[] payloads)
+        public SeString(params Payload[] payloads)
         {
             this.Payloads = new List<Payload>(payloads);
         }
@@ -61,7 +61,7 @@ namespace Dalamud.Game.Text.SeStringHandling
         /// </summary>
         /// <param name="str">string to convert.</param>
         /// <returns>Equivalent SeString.</returns>
-        public static implicit operator SeString(string str) => new(new Payload[] { new TextPayload(str) });
+        public static implicit operator SeString(string str) => new(new TextPayload(str));
 
         /// <summary>
         /// Creates a SeString from a json. (For testing - not recommended for production use.)

From e524a18eadb3b45c02fe995e2da100701d3174e5 Mon Sep 17 00:00:00 2001
From: Raymond <daemitus@gmail.com>
Date: Thu, 15 Jul 2021 21:28:13 -0400
Subject: [PATCH 2/2] Fix comments

---
 Dalamud/Game/Text/SeStringHandling/Payload.cs                 | 2 +-
 Dalamud/Game/Text/SeStringHandling/Payloads/NewLinePayload.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dalamud/Game/Text/SeStringHandling/Payload.cs b/Dalamud/Game/Text/SeStringHandling/Payload.cs
index 36c0e213c..ebf689646 100644
--- a/Dalamud/Game/Text/SeStringHandling/Payload.cs
+++ b/Dalamud/Game/Text/SeStringHandling/Payload.cs
@@ -300,7 +300,7 @@ namespace Dalamud.Game.Text.SeStringHandling
             EmphasisItalic = 0x1A,
 
             /// <summary>
-            /// See the <see cref="NewLinePayload"/>
+            /// See the <see cref="NewLinePayload"/>.
             /// </summary>
             NewLine = 0x10,
 
diff --git a/Dalamud/Game/Text/SeStringHandling/Payloads/NewLinePayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/NewLinePayload.cs
index 48e2c8215..13aba8077 100644
--- a/Dalamud/Game/Text/SeStringHandling/Payloads/NewLinePayload.cs
+++ b/Dalamud/Game/Text/SeStringHandling/Payloads/NewLinePayload.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 
 namespace Dalamud.Game.Text.SeStringHandling.Payloads
@@ -16,7 +16,7 @@ namespace Dalamud.Game.Text.SeStringHandling.Payloads
         public static NewLinePayload Payload => new();
 
         /// <summary>
-        /// Gets the text of this payload, evaluates to <c>Environment.NewLine</c>
+        /// Gets the text of this payload, evaluates to <c>Environment.NewLine</c>.
         /// </summary>
         public string Text => Environment.NewLine;