Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge upstream (#15)

Browse Source 
* 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 <Password> or /changepass <Moderator> <Password>, rather than /changepass <Password> '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>
This commit is contained in:
Salanto 2022-05-07 12:27:31 +02:00 committed by Rosemary Witchaven
parent 97d9c1253b
commit 2073371d08
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/commands/authentication.cpp
View File

@ -234,8 +234,7 @@ void AOClient::cmdChangePassword(int argc, QStringList argv)
l_username = m_moderator_name; l_username = m_moderator_name;
} }
else if (argc == 2 && checkPermission(ACLRole::SUPER)) { else if (argc == 2 && checkPermission(ACLRole::SUPER)) {
l_username = argv[0]; l_username = argv[1];
l_password = argv[1];
} }
else { else {
sendServerMessage("Invalid command syntax."); sendServerMessage("Invalid command syntax.");

2
core/src/commands/messaging.cpp
View File

@ -76,7 +76,7 @@ void AOClient::cmdG(int argc, QStringList argv)
QString l_sender_name = m_ooc_name; QString l_sender_name = m_ooc_name;
QString l_sender_area = server->getAreaName(m_current_area); QString l_sender_area = server->getAreaName(m_current_area);
QString l_sender_message = argv.join(" "); 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_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}); 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); server->broadcast(l_user_packet, l_mod_packet, Server::TARGET_TYPE::AUTHENTICATED);