Core/PacketIO: Reduce the number of catch blocks in WorldSession::Update

2 files changed, 30 insertions, 14 deletions

diff --git a/src/server/game/Server/Packets/PacketUtilities.cpp b/src/server/game/Server/Packets/PacketUtilities.cpp
index 4227833e6b0..34fc9923379 100644
--- a/src/server/game/Server/Packets/PacketUtilities.cpp
+++ b/src/server/game/Server/Packets/PacketUtilities.cpp
@@ -20,20 +20,29 @@
 #include "StringFormat.h"
 #include <utf8.h>
 
-WorldPackets::InvalidStringValueException::InvalidStringValueException(std::string_view value) : ByteBufferInvalidValueException("string", value), _value(value)
+WorldPackets::InvalidStringValueException::InvalidStringValueException(char const* type, std::string_view value)
+    : ByteBufferInvalidValueException(type, value), _value(value)
 {
 }
 
-WorldPackets::InvalidUtf8ValueException::InvalidUtf8ValueException(std::string_view value) : InvalidStringValueException(value)
+WorldPackets::InvalidUtf8ValueException::InvalidUtf8ValueException(std::string_view value)
+    : InvalidStringValueException("utf8 string", value)
 {
 }
 
-WorldPackets::InvalidHyperlinkException::InvalidHyperlinkException(std::string_view value) : InvalidStringValueException(value)
+WorldPackets::InvalidHyperlinkException::InvalidHyperlinkException(std::string_view value, Reason reason)
+    : InvalidStringValueException(GetReasonText(reason), value), _reason(reason)
 {
 }
 
-WorldPackets::IllegalHyperlinkException::IllegalHyperlinkException(std::string_view value) : InvalidStringValueException(value)
+char const* WorldPackets::InvalidHyperlinkException::GetReasonText(Reason reason)
 {
+    switch (reason)
+    {
+        case Malformed: return "malformed hyperlink";
+        case NotAllowed: return "not allowed hyperlink";
+        default: return "hyperlink";
+    }
 }
 
 bool WorldPackets::Strings::Utf8::Validate(std::string_view value)
@@ -46,14 +55,14 @@ bool WorldPackets::Strings::Utf8::Validate(std::string_view value)
 bool WorldPackets::Strings::Hyperlinks::Validate(std::string_view value)
 {
     if (!Trinity::Hyperlinks::CheckAllLinks(value))
-        throw InvalidHyperlinkException(value);
+        throw InvalidHyperlinkException(value, InvalidHyperlinkException::Malformed);
     return true;
 }
 
 bool WorldPackets::Strings::NoHyperlinks::Validate(std::string_view value)
 {
     if (value.find('|') != std::string::npos)
-        throw IllegalHyperlinkException(value);
+        throw InvalidHyperlinkException(value, InvalidHyperlinkException::NotAllowed);
     return true;
 }
 
diff --git a/src/server/game/Server/Packets/PacketUtilities.h b/src/server/game/Server/Packets/PacketUtilities.h
index 3170b11b180..055df04cd90 100644
--- a/src/server/game/Server/Packets/PacketUtilities.h
+++ b/src/server/game/Server/Packets/PacketUtilities.h
@@ -30,7 +30,7 @@ namespace WorldPackets
     class InvalidStringValueException : public ByteBufferInvalidValueException
     {
     public:
-        InvalidStringValueException(std::string_view value);
+        explicit InvalidStringValueException(char const* type, std::string_view value);
 
         std::string const& GetInvalidValue() const { return _value; }
 
@@ -41,19 +41,26 @@ namespace WorldPackets
     class InvalidUtf8ValueException : public InvalidStringValueException
     {
     public:
-        InvalidUtf8ValueException(std::string_view value);
+        explicit InvalidUtf8ValueException(std::string_view value);
     };
 
     class InvalidHyperlinkException : public InvalidStringValueException
     {
     public:
-        InvalidHyperlinkException(std::string_view value);
-    };
+        enum Reason : uint8
+        {
+            Malformed,
+            NotAllowed
+        };
 
-    class IllegalHyperlinkException : public InvalidStringValueException
-    {
-    public:
-        IllegalHyperlinkException(std::string_view value);
+        explicit InvalidHyperlinkException(std::string_view value, Reason reason);
+
+        Reason GetReason() const { return _reason; }
+
+    private:
+        static char const* GetReasonText(Reason reason);
+
+        Reason _reason;
     };
 
     namespace Strings