From e8336919f90fc508e8f88614546eeabe45124a3f Mon Sep 17 00:00:00 2001 From: Kitzunu <24550914+Kitzunu@users.noreply.github.com> Date: Wed, 29 Nov 2023 13:38:03 +0100 Subject: [PATCH] fix(Scripts/Command): ticket comment should allow input (#17891) fix(Scripts/Command): gm comment should allow input * closes https://github.com/azerothcore/azerothcore-wotlk/issues/17877 --- src/server/scripts/Commands/cs_ticket.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/server/scripts/Commands/cs_ticket.cpp b/src/server/scripts/Commands/cs_ticket.cpp index 8e29933bc..da1452c75 100644 --- a/src/server/scripts/Commands/cs_ticket.cpp +++ b/src/server/scripts/Commands/cs_ticket.cpp @@ -158,10 +158,9 @@ public: return true; } - static bool HandleGMTicketCommentCommand(ChatHandler* handler, uint32 ticketId) + static bool HandleGMTicketCommentCommand(ChatHandler* handler, uint32 ticketId, Tail comment) { - char* comment = strtok(nullptr, "\n"); - if (!comment) + if (comment.empty()) return false; GmTicket* ticket = sTicketMgr->GetTicket(ticketId); @@ -180,14 +179,14 @@ public: } CharacterDatabaseTransaction trans = CharacterDatabaseTransaction(nullptr); - ticket->SetComment(comment); + ticket->SetComment(comment.data()); ticket->SaveToDB(trans); sTicketMgr->UpdateLastChange(); std::string const assignedName = ticket->GetAssignedToName(); std::string msg = ticket->FormatMessageString(*handler, assignedName.empty() ? nullptr : assignedName.c_str(), nullptr, nullptr, nullptr); - msg += handler->PGetParseString(LANG_COMMAND_TICKETLISTADDCOMMENT, player ? player->GetName().c_str() : "Console", comment); + msg += handler->PGetParseString(LANG_COMMAND_TICKETLISTADDCOMMENT, player ? player->GetName().c_str() : "Console", comment.data()); handler->SendGlobalGMSysMessage(msg.c_str()); return true;