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

some fiddling

Browse Source
This commit is contained in:
in1tiate 2021-03-09 14:35:23 -06:00
parent 2a9eb18c5e
commit d2890e6e86
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/commands.cpp
View File

@ -40,12 +40,12 @@ void AOClient::cmdLogin(int argc, QStringList argv)
// TODO: tell the user if no modpass is set // TODO: tell the user if no modpass is set
if (auth_type == "simple") { if (auth_type == "simple") {
if(argv[0] == modpass) { if(argv[0] == modpass) {
//sendServerMessage("Logged in as a moderator."); // This string has to be exactly this, because it is hardcoded in the client sendPacket("AUTH", {"1"}); // Client: "You were granted the Disable Modcalls button."
sendPacket("AUTH", {"1"}); sendServerMessage("Logged in as a moderator."); // for old clients, this is hardcoded to display the mod UI
authenticated = true; authenticated = true;
} else { } else {
sendPacket("AUTH", {"0"}); // Client: "Login unsuccessful."
sendServerMessage("Incorrect password."); sendServerMessage("Incorrect password.");
sendPacket("AUTH", {"0"});
} }
server->areas.value(current_area)->logger->logLogin(this, authenticated, "moderator"); server->areas.value(current_area)->logger->logLogin(this, authenticated, "moderator");
} }
@ -59,12 +59,13 @@ void AOClient::cmdLogin(int argc, QStringList argv)
if (server->db_manager->authenticate(username, password)) { if (server->db_manager->authenticate(username, password)) {
moderator_name = username; moderator_name = username;
authenticated = true; authenticated = true;
sendPacket("AUTH", {"1"}); sendPacket("AUTH", {"1"}); // Client: "You were granted the Disable Modcalls button."
sendServerMessage("Logged in as a moderator."); // for old clients, this is hardcoded to display the mod UI
sendServerMessage("Welcome, " + username); sendServerMessage("Welcome, " + username);
} }
else { else {
sendPacket("AUTH", {"0"}); // Client: "Login unsuccessful."
sendServerMessage("Incorrect password."); sendServerMessage("Incorrect password.");
sendPacket("AUTH", {"0"});
} }
server->areas.value(current_area)->logger->logLogin(this, authenticated, username); server->areas.value(current_area)->logger->logLogin(this, authenticated, username);
} }
@ -361,8 +362,7 @@ void AOClient::cmdLogout(int argc, QStringList argv)
} }
authenticated = false; authenticated = false;
moderator_name = ""; moderator_name = "";
sendServerMessage("You have been logged out."); sendPacket("AUTH", {"-1"}); // Client: "You were logged out."
sendPacket("AUTH", {"-1"});
} }
void AOClient::cmdPos(int argc, QStringList argv) void AOClient::cmdPos(int argc, QStringList argv)

7
src/packets.cpp
View File

@ -346,9 +346,10 @@ AOPacket AOClient::validateIcPacket(AOPacket packet)
} }
// desk modifier // desk modifier
QStringList allowed_desk_mods = ["chat", "0", "1", "2", "3", "4", "5"]; QStringList allowed_desk_mods;
if (allowed_desk_mods.contains(incoming_args[0])) { allowed_desk_mods << "chat" << "0" << "1" << "2" << "3" << "4" << "5";
args.append(incoming_args[0]); if (allowed_desk_mods.contains(incoming_args[0].toString())) {
args.append(incoming_args[0].toString());
} }
else else
return invalid; return invalid;