From ee1f619e997293ef4903e7b0d47b4ba5ed7650bf Mon Sep 17 00:00:00 2001 From: Jessica James Date: Sun, 7 Jun 2020 03:53:48 -0500 Subject: [PATCH] ModRequest command now requires a reason to be specified --- src/Plugins/RenX/RenX.Commands/RenX_Commands.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Plugins/RenX/RenX.Commands/RenX_Commands.cpp b/src/Plugins/RenX/RenX.Commands/RenX_Commands.cpp index f65da09..5e9f129 100644 --- a/src/Plugins/RenX/RenX.Commands/RenX_Commands.cpp +++ b/src/Plugins/RenX/RenX.Commands/RenX_Commands.cpp @@ -3336,13 +3336,18 @@ GAME_COMMAND_INIT(RulesGameCommand) void ModRequestGameCommand::create() { - this->addTrigger(STRING_LITERAL_AS_REFERENCE("modrequest")); - this->addTrigger(STRING_LITERAL_AS_REFERENCE("requestmod")); - this->addTrigger(STRING_LITERAL_AS_REFERENCE("mod")); + this->addTrigger("modrequest"_jrs); + this->addTrigger("requestmod"_jrs); + this->addTrigger("mod"_jrs); } void ModRequestGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, const Jupiter::ReadableString ¶meters) { + if (parameters.isEmpty()) { + source->sendMessage(*player, "Please specify a reason for requesting moderator assistance."_jrs); + return; + } + const Jupiter::ReadableString &staff_word = pluginInstance.getStaffTitle(); Jupiter::String fmtName = RenX::getFormattedPlayerName(*player); Jupiter::StringL user_message = Jupiter::StringL::Format(IRCCOLOR "12[%.*s Request] " IRCCOLOR IRCBOLD "%.*s" IRCBOLD IRCCOLOR "07 has requested assistance in-game for \"%.*s\"; please look in ", staff_word.size(), staff_word.ptr(), fmtName.size(), fmtName.ptr(), parameters.size(), parameters.ptr()); @@ -3391,7 +3396,7 @@ void ModRequestGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *play const Jupiter::ReadableString &ModRequestGameCommand::getHelp(const Jupiter::ReadableString &) { - static STRING_LITERAL_AS_NAMED_REFERENCE(defaultHelp, "Notifies staff on IRC that assistance is required. Syntax: modRequest"); + static STRING_LITERAL_AS_NAMED_REFERENCE(defaultHelp, "Notifies staff on IRC that assistance is required. Syntax: modRequest "); return defaultHelp; }