From 2073371d086f95dfb0f7132d272d8c9d8c8e7a4f Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Sat, 7 May 2022 12:27:31 +0200 Subject: [PATCH] Merge upstream (#15) * Don't Display IPIDs to Users via Global Chat Slightly better variable names too while we're at it * Ensure /changepass always has arg 1 as the password Otherwise, the syntax is /changepass or /changepass , rather than /changepass 'Moderator', like how it's specified to be * All hail the mightly clang-format check Co-authored-by: AwesomeAim <30537683+AwesomeAim@users.noreply.github.com> Co-authored-by: Rosemary Witchaven <32779090+in1tiate@users.noreply.github.com> --- core/src/commands/authentication.cpp | 3 +-- core/src/commands/messaging.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/src/commands/authentication.cpp b/core/src/commands/authentication.cpp index fb33158..4c2a0ce 100644 --- a/core/src/commands/authentication.cpp +++ b/core/src/commands/authentication.cpp @@ -234,8 +234,7 @@ void AOClient::cmdChangePassword(int argc, QStringList argv) l_username = m_moderator_name; } else if (argc == 2 && checkPermission(ACLRole::SUPER)) { - l_username = argv[0]; - l_password = argv[1]; + l_username = argv[1]; } else { sendServerMessage("Invalid command syntax."); diff --git a/core/src/commands/messaging.cpp b/core/src/commands/messaging.cpp index 6438e8c..0fb9d96 100644 --- a/core/src/commands/messaging.cpp +++ b/core/src/commands/messaging.cpp @@ -76,7 +76,7 @@ void AOClient::cmdG(int argc, QStringList argv) QString l_sender_name = m_ooc_name; QString l_sender_area = server->getAreaName(m_current_area); QString l_sender_message = argv.join(" "); - //Slightly better readability + // Better readability thanks to AwesomeAim. AOPacket l_mod_packet = AOPacket("CT", {"[G][" + m_ipid + "][" + l_sender_area + "]" + l_sender_name, l_sender_message}); AOPacket l_user_packet = AOPacket("CT", {"[G][" + l_sender_area + "]" + l_sender_name, l_sender_message}); server->broadcast(l_user_packet, l_mod_packet, Server::TARGET_TYPE::AUTHENTICATED);