From 314c046ec965c3ce6fa15bdb73a7825427324d27 Mon Sep 17 00:00:00 2001
From: Kaz Wolfe <root@kazwolfe.io>
Date: Mon, 24 Mar 2025 17:43:49 -0700
Subject: [PATCH] feat: Add CStringPointer#ExtractText

- Move CString extensions to their own class.
- Add some words to our dictionary.
---
 Dalamud.sln.DotSettings               |  2 ++
 Dalamud/Utility/CStringExtensions.cs  | 32 +++++++++++++++++++++++++++
 Dalamud/Utility/SeStringExtensions.cs | 10 ---------
 3 files changed, 34 insertions(+), 10 deletions(-)
 create mode 100644 Dalamud/Utility/CStringExtensions.cs

diff --git a/Dalamud.sln.DotSettings b/Dalamud.sln.DotSettings
index b0f66b736..6d0e1fdcd 100644
--- a/Dalamud.sln.DotSettings
+++ b/Dalamud.sln.DotSettings
@@ -54,6 +54,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EFormat_002ESettingsUpgrade_002EAlignmentTabFillStyleMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=bannedplugin/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=clientopcode/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=collectability/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Dalamud/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=FFXIV/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Flytext/@EntryIndexedValue">True</s:Boolean>
@@ -66,6 +67,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=PLUGINR/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Refilter/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=serveropcode/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=spiritbond/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Universalis/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=unsanitized/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Uploaders/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/Dalamud/Utility/CStringExtensions.cs b/Dalamud/Utility/CStringExtensions.cs
new file mode 100644
index 000000000..a1848c512
--- /dev/null
+++ b/Dalamud/Utility/CStringExtensions.cs
@@ -0,0 +1,32 @@
+using InteropGenerator.Runtime;
+
+using Lumina.Text.ReadOnly;
+
+namespace Dalamud.Utility;
+
+/// <summary>
+/// A set of helpful utilities for working with <see cref="CStringPointer"/>s from ClientStructs.
+/// </summary>
+public static class CStringExtensions
+{
+    /// <summary>
+    /// Convert a CStringPointer to a ReadOnlySeStringSpan.
+    /// </summary>
+    /// <param name="ptr">The pointer to convert.</param>
+    /// <returns>A span.</returns>
+    public static unsafe ReadOnlySeStringSpan AsReadOnlySeStringSpan(this CStringPointer ptr)
+    {
+        return ptr.AsSpan();
+    }
+
+    /// <summary>
+    /// Extract text from this CStringPointer following <see cref="ReadOnlySeStringSpan.ExtractText()"/>'s rules. Only
+    /// useful for SeStrings.
+    /// </summary>
+    /// <param name="ptr">The CStringPointer to process.</param>
+    /// <returns>Extracted text.</returns>
+    public static string ExtractText(this CStringPointer ptr)
+    {
+        return ptr.AsReadOnlySeStringSpan().ExtractText();
+    }
+}
diff --git a/Dalamud/Utility/SeStringExtensions.cs b/Dalamud/Utility/SeStringExtensions.cs
index f2c28bd7d..904375250 100644
--- a/Dalamud/Utility/SeStringExtensions.cs
+++ b/Dalamud/Utility/SeStringExtensions.cs
@@ -228,14 +228,4 @@ public static class SeStringExtensions
         var replaced = ReplaceText(new ReadOnlySeString(builder.GetViewAsMemory()), toFind, replacement);
         builder.Clear().Append(replaced);
     }
-
-    /// <summary>
-    /// Convert a CStringPointer to a ReadOnySeStringSpan.
-    /// </summary>
-    /// <param name="ptr">The pointer to convert.</param>
-    /// <returns>A span.</returns>
-    public static unsafe ReadOnlySeStringSpan AsReadOnlySeStringSpan(this CStringPointer ptr)
-    {
-        return new ReadOnlySeStringSpan(ptr.Value);
-    }
 }