Common/Utilities: Centralize string -> T conversion in StringConvert.h (PR #25335)

(cherry picked from commit cd30e0b86ce6ee88386a91cebdf353fc55805c57)

2 files changed, 21 insertions, 28 deletions

diff --git a/src/server/game/Chat/ChatCommands/ChatCommandArgs.h b/src/server/game/Chat/ChatCommands/ChatCommandArgs.h
index 271d4850f2a..e2270c0259f 100644
--- a/src/server/game/Chat/ChatCommands/ChatCommandArgs.h
+++ b/src/server/game/Chat/ChatCommands/ChatCommandArgs.h
@@ -21,6 +21,7 @@
 #include "ChatCommandHelpers.h"
 #include "ChatCommandTags.h"
 #include "SmartEnum.h"
+#include "StringConvert.h"
 #include "Util.h"
 #include <charconv>
 #include <map>
@@ -55,20 +56,10 @@ struct ArgInfo<T, std::enable_if_t<std::is_integral_v<T>>>
         char const* next = args;
         std::string_view token(args, Trinity::Impl::ChatCommands::tokenize(next));
 
-        if (!token.length())
-            return nullptr;
-
-        std::from_chars_result result;
-        if (StringStartsWith(token, "0x"))
-            result = std::from_chars(token.data() + 2, token.data() + token.length(), val, 16);
-        else if (StringStartsWith(token, "0b"))
-            result = std::from_chars(token.data() + 2, token.data() + token.length(), val, 2);
+        if (Optional<T> v = StringTo<T>(token, 0))
+            val = *v;
         else
-            result = std::from_chars(token.data(), token.data() + token.length(), val, 10);
-
-        if ((token.data() + token.length()) != result.ptr)
             return nullptr;
-
         return next;
     }
 };
diff --git a/src/server/game/Chat/Hyperlinks.h b/src/server/game/Chat/Hyperlinks.h
index 960c6a10338..2085a27c4e5 100644
--- a/src/server/game/Chat/Hyperlinks.h
+++ b/src/server/game/Chat/Hyperlinks.h
@@ -19,7 +19,7 @@
 #define TRINITY_HYPERLINKS_H
 
 #include "ObjectGuid.h"
-#include "Optional.h"
+#include "StringConvert.h"
 #include <string>
 #include <type_traits>
 #include <utility>
@@ -220,26 +220,28 @@ namespace Trinity::Hyperlinks
                 return true;
             }
 
-            static bool StoreTo(ObjectGuid& val, char const* pos, size_t len)
-            {
-                val = ObjectGuid::FromString(std::string(pos, len));
-                return true;
-            }
-
             template <typename T>
-            static std::enable_if_t<std::is_integral_v<T> && std::is_unsigned_v<T>, bool> StoreTo(T& val, char const* pos, size_t len)
+            static std::enable_if_t<std::is_integral_v<T>, bool> StoreTo(T& val, char const* pos, size_t len)
             {
-                try { val = std::stoull(std::string(pos, len)); }
-                catch (...) { return false; }
-                return true;
+                if (Optional<T> res = Trinity::StringTo<T>(std::string_view(pos, len)))
+                {
+                    val = *res;
+                    return true;
+                }
+                else
+                    return false;
             }
 
-            template <typename T>
-            static std::enable_if_t<std::is_integral_v<T> && std::is_signed_v<T>, bool> StoreTo(T& val, char const* pos, size_t len)
+            static bool StoreTo(ObjectGuid& val, char const* pos, size_t len)
             {
-                try { val = std::stoll(std::string(pos, len)); }
-                catch (...) { return false; }
-                return true;
+                ObjectGuid parsed = ObjectGuid::FromString(std::string(pos, len));
+                if (parsed != ObjectGuid::FromStringFailed)
+                {
+                    val = parsed;
+                    return true;
+                }
+                else
+                    return false;
             }
         };