Trim user input so stuff doesn't break

Aether-Tools · Mar 2, 2024 · 7f18030 · 7f18030
1 parent c8e38eb
commit 7f18030
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/CustomizePlus/Core/Extensions/StringExtensions.cs b/CustomizePlus/Core/Extensions/StringExtensions.cs
@@ -16,6 +16,9 @@ public static string Incognify(this string str)
 #if !INCOGNIFY_STRINGS
         return str;
 #endif
+
+        str = str.Trim();
+
         if (str.Contains(" "))
         {
             var split = str.Split(' ');

diff --git a/CustomizePlus/Profiles/Data/Profile.cs b/CustomizePlus/Profiles/Data/Profile.cs
@@ -145,8 +145,8 @@ private static Profile LoadV4(TemplateManager templateManager, JObject obj)
         {
             CreationDate = creationDate,
             UniqueId = obj["UniqueId"]?.ToObject<Guid>() ?? throw new ArgumentNullException("UniqueId"),
-            Name = new LowerString(obj["Name"]?.ToObject<string>() ?? throw new ArgumentNullException("Name")),
-            CharacterName = new LowerString(obj["CharacterName"]?.ToObject<string>() ?? throw new ArgumentNullException("CharacterName")),
+            Name = new LowerString(obj["Name"]?.ToObject<string>()?.Trim() ?? throw new ArgumentNullException("Name")),
+            CharacterName = new LowerString(obj["CharacterName"]?.ToObject<string>()?.Trim() ?? throw new ArgumentNullException("CharacterName")),
             LimitLookupToOwnedObjects = obj["LimitLookupToOwnedObjects"]?.ToObject<bool>() ?? throw new ArgumentNullException("LimitLookupToOwnedObjects"),
             Enabled = obj["Enabled"]?.ToObject<bool>() ?? throw new ArgumentNullException("Enabled"),
             ModifiedDate = obj["ModifiedDate"]?.ToObject<DateTimeOffset>() ?? creationDate,

diff --git a/CustomizePlus/Profiles/ProfileManager.cs b/CustomizePlus/Profiles/ProfileManager.cs
@@ -199,6 +199,8 @@ public Profile Clone(Profile clone, string name, bool handlePath)
     /// </summary>
     public void Rename(Profile profile, string newName)
     {
+        newName = newName.Trim();
+
         var oldName = profile.Name.Text;
         if (oldName == newName)
             return;
@@ -216,6 +218,8 @@ public void Rename(Profile profile, string newName)
     /// </summary>
     public void ChangeCharacterName(Profile profile, string newName)
     {
+        newName = newName.Trim();
+
         var oldName = profile.CharacterName.Text;
         if (oldName == newName)
             return;

diff --git a/CustomizePlus/Templates/Data/Template.cs b/CustomizePlus/Templates/Data/Template.cs
@@ -93,7 +93,7 @@ private static Template LoadV4(JObject obj)
         {
             CreationDate = creationDate,
             UniqueId = obj["UniqueId"]?.ToObject<Guid>() ?? throw new ArgumentNullException("UniqueId"),
-            Name = new LowerString(obj["Name"]?.ToObject<string>() ?? throw new ArgumentNullException("Name")),
+            Name = new LowerString(obj["Name"]?.ToObject<string>()?.Trim() ?? throw new ArgumentNullException("Name")),
             ModifiedDate = obj["ModifiedDate"]?.ToObject<DateTimeOffset>() ?? creationDate,
             Bones = obj["Bones"]?.ToObject<Dictionary<string, BoneTransform>>() ?? throw new ArgumentNullException("Bones"),
             IsWriteProtected = obj["IsWriteProtected"]?.ToObject<bool>() ?? false

diff --git a/CustomizePlus/Templates/TemplateManager.cs b/CustomizePlus/Templates/TemplateManager.cs
@@ -141,6 +141,8 @@ public Template Clone(Template clone, string name, bool handlePath)
     /// </summary>
     public void Rename(Template template, string newName)
     {
+        newName = newName.Trim();
+
         var oldName = template.Name.Text;
         if (oldName == newName)
             return;