diff --git a/bin/config_sample/areas.ini b/bin/config_sample/areas.ini index 066fcc8..7dc04e7 100644 --- a/bin/config_sample/areas.ini +++ b/bin/config_sample/areas.ini @@ -4,12 +4,10 @@ protected_area=true iniswap_allowed=false evidence_mod=cm blankposting_allowed=true -force_immediate=true [1:Courtroom 1] background=gs4 protected_area=false iniswap_allowed=true evidence_mod=ffa -blankposting_allowed=true -force_immediate=false +blankposting_allowed=true \ No newline at end of file diff --git a/include/aoclient.h b/include/aoclient.h index 1bc4f0e..5035b6b 100644 --- a/include/aoclient.h +++ b/include/aoclient.h @@ -53,11 +53,7 @@ class AOClient : public QObject { AOClient(Server* p_server, QTcpSocket* p_socket, QObject* parent = nullptr, int user_id = 0) : QObject(parent), id(user_id), remote_ip(p_socket->peerAddress()), password(""), joined(false), current_area(0), current_char(""), socket(p_socket), server(p_server), - is_partial(false), last_wtce_time(0) { - afk_timer = new QTimer; - afk_timer->setSingleShot(true); - connect(afk_timer, SIGNAL(timeout()), this, SLOT(onAfkTimeout())); - }; + is_partial(false), last_wtce_time(0) {}; /** * @brief Destructor for the AOClient instance. @@ -222,12 +218,6 @@ class AOClient : public QObject { {"SUPER", ~0ULL }, }; - - /** - * @brief A list of 5 casing preferences (def, pro, judge, jury, steno) - */ - QList casing_preferences = {false, false, false, false, false}; - /** * @brief If true, the client's in-character messages will have their word order randomised. */ @@ -243,18 +233,6 @@ class AOClient : public QObject { */ bool is_gimped = false; - /** - * @brief If true, the client will be marked as AFK in /getarea. Automatically applied when a configurable - * amount of time has passed since the last interaction, or manually applied by /afk. - */ - bool is_afk = false; - - /** - * @brief Timer for tracking user interaction. Automatically restarted whenever a user interacts (i.e. sends any packet besides CH) - */ - QTimer* afk_timer; - - public slots: /** * @brief A slot for when the client disconnects from the server. @@ -283,11 +261,6 @@ class AOClient : public QObject { */ void sendPacket(QString header); - /** - * @brief A slot for when the client's AFK timer runs out. - */ - void onAfkTimeout(); - private: /** * @brief The TCP socket used to communicate with the client. @@ -499,12 +472,6 @@ class AOClient : public QObject { /// Implements [editing evidence](https://github.com/AttorneyOnline/docs/blob/master/docs/development/network.md#edit). void pktEditEvidence(AreaData* area, int argc, QStringList argv, AOPacket packet); - /// Implements [updating casing preferences](https://github.com/AttorneyOnline/docs/blob/master/docs/development/network.md#case-preferences-update). - void pktSetCase(AreaData* area, int argc, QStringList argv, AOPacket packet); - - /// Implements [announcing a case](https://github.com/AttorneyOnline/docs/blob/master/docs/development/network.md#case-alert). - void pktAnnounceCase(AreaData* area, int argc, QStringList argv, AOPacket packet); - ///@} /** @@ -655,8 +622,6 @@ class AOClient : public QObject { {"PE", {ACLFlags.value("NONE"), 3, &AOClient::pktAddEvidence }}, {"DE", {ACLFlags.value("NONE"), 1, &AOClient::pktRemoveEvidence }}, {"EE", {ACLFlags.value("NONE"), 4, &AOClient::pktEditEvidence }}, - {"SETCASE", {ACLFlags.value("NONE"), 7, &AOClient::pktSetCase }}, - {"CASEA", {ACLFlags.value("NONE"), 6, &AOClient::pktAnnounceCase }}, }; /** @@ -1102,7 +1067,7 @@ class AOClient : public QObject { * * @iscommand */ - void cmdAllowBlankposting(int argc, QStringList argv); + void cmdAllow_Blankposting(int argc, QStringList argv); /** * @brief Looks up info on a ban. @@ -1570,33 +1535,6 @@ class AOClient : public QObject { void cmdCurrentMusic(int argc, QStringList argv); - /** - * @brief Toggles immediate text processing in the current area. - * - * @details No arguments. - * - * @iscommand - */ - void cmdForceImmediate(int argc, QStringList argv); - - /** - * @brief Toggles whether iniswaps are allowed in the current area. - * - * @details No arguments. - * - * @iscommand - */ - void cmdAllowIniswap(int argc, QStringList argv); - - /** - * @brief Toggles whether this client is considered AFK. - * - * @details No arguments. - * - * @iscommand - */ - void cmdAfk(int argc, QStringList argv); - ///@} /** @@ -1829,8 +1767,7 @@ class AOClient : public QObject { {"8ball", {ACLFlags.value("NONE"), 1, &AOClient::cmd8Ball}}, {"lm", {ACLFlags.value("MODCHAT"), 1, &AOClient::cmdLM}}, {"judgelog", {ACLFlags.value("CM"), 0, &AOClient::cmdJudgeLog}}, - {"allowblankposting", {ACLFlags.value("MODCHAT"), 0, &AOClient::cmdAllowBlankposting}}, - {"allow_blankposting", {ACLFlags.value("MODCHAT"), 0, &AOClient::cmdAllowBlankposting}}, + {"allow_blankposting", {ACLFlags.value("MODCHAT"), 0, &AOClient::cmdAllow_Blankposting}}, {"gimp", {ACLFlags.value("MUTE"), 1, &AOClient::cmdGimp}}, {"ungimp", {ACLFlags.value("MUTE"), 1, &AOClient::cmdUnGimp}}, {"baninfo", {ACLFlags.value("BAN"), 1, &AOClient::cmdBanInfo}}, @@ -1839,17 +1776,11 @@ class AOClient : public QObject { {"pause", {ACLFlags.value("CM"), 0, &AOClient::cmdPauseTestimony}}, {"delete", {ACLFlags.value("CM"), 0, &AOClient::cmdDeleteStatement}}, {"update", {ACLFlags.value("CM"), 0, &AOClient::cmdUpdateStatement}}, - {"add", {ACLFlags.value("CM"), 0, &AOClient::cmdAddStatement}}, {"reload", {ACLFlags.value("SUPER"), 0, &AOClient::cmdReload}}, {"disemvowel", {ACLFlags.value("MUTE"), 1, &AOClient::cmdDisemvowel}}, {"undisemvowel", {ACLFlags.value("MUTE"), 1, &AOClient::cmdUnDisemvowel}}, {"shake", {ACLFlags.value("MUTE"), 1, &AOClient::cmdShake}}, {"unshake", {ACLFlags.value("MUTE"), 1, &AOClient::cmdUnShake}}, - {"forceimmediate", {ACLFlags.value("CM"), 0, &AOClient::cmdForceImmediate}}, - {"force_noint_pres", {ACLFlags.value("CM"), 0, &AOClient::cmdForceImmediate}}, - {"allowiniswap", {ACLFlags.value("CM"), 0, &AOClient::cmdAllowIniswap}}, - {"allow_iniswap", {ACLFlags.value("CM"), 0, &AOClient::cmdAllowIniswap}}, - {"afk", {ACLFlags.value("NONE"), 0, &AOClient::cmdAfk}}, }; /** diff --git a/include/area_data.h b/include/area_data.h index 23df38f..5cab8ef 100644 --- a/include/area_data.h +++ b/include/area_data.h @@ -344,11 +344,6 @@ class AreaData : public QObject { * @brief The value of logger in config.ini. */ QString log_type; - - /** - * @brief Whether or not to force immediate text processing in this area - */ - bool force_immediate; }; #endif // AREA_DATA_H diff --git a/include/server.h b/include/server.h index 0017621..91fb5ef 100644 --- a/include/server.h +++ b/include/server.h @@ -232,11 +232,6 @@ class Server : public QObject { */ int max_dice; - /** - * @brief The amount of time in seconds to wait before marking a user AFK. - */ - int afk_timeout; - /** * @brief The server-wide global timer. */ diff --git a/src/aoclient.cpp b/src/aoclient.cpp index 6e8dfbd..762d99f 100644 --- a/src/aoclient.cpp +++ b/src/aoclient.cpp @@ -77,13 +77,6 @@ void AOClient::handlePacket(AOPacket packet) return; } - if (packet.header != "CH") { - if (is_afk) - sendServerMessage("You are no longer AFK."); - is_afk = false; - afk_timer->start(server->afk_timeout * 1000); - } - if (packet.contents.length() < info.minArgs) { #ifdef NET_DEBUG qDebug() << "Invalid packet args length. Minimum is" << info.minArgs << "but only" << packet.contents.length() << "were given."; @@ -318,17 +311,9 @@ bool AOClient::checkAuth(unsigned long long acl_mask) return true; } - QString AOClient::getIpid() { return ipid; } -Server* AOClient::getServer() { return server; } - -void AOClient::onAfkTimeout() -{ - if (!is_afk) - sendServerMessage("You are now AFK."); - is_afk = true; -} +Server* AOClient::getServer() { return server; }; AOClient::~AOClient() { socket->deleteLater(); diff --git a/src/area_data.cpp b/src/area_data.cpp index 0653597..c40271c 100644 --- a/src/area_data.cpp +++ b/src/area_data.cpp @@ -39,7 +39,6 @@ AreaData::AreaData(QString p_name, int p_index) : bg_locked = areas_ini.value("bg_locked", "false").toBool(); QString configured_evi_mod = areas_ini.value("evidence_mod", "FFA").toString().toLower(); blankposting_allowed = areas_ini.value("blankposting_allowed","true").toBool(); - force_immediate = areas_ini.value("force_immediate", "false").toBool(); areas_ini.endGroup(); QSettings config_ini("config/config.ini", QSettings::IniFormat); config_ini.beginGroup("Options"); diff --git a/src/commands.cpp b/src/commands.cpp index 135c06a..9824cfa 100644 --- a/src/commands.cpp +++ b/src/commands.cpp @@ -18,1709 +18,3 @@ #include "include/aoclient.h" // Be sure to register the command in the header before adding it here! - -void AOClient::cmdDefault(int argc, QStringList argv) -{ - sendServerMessage("Invalid command."); - return; -} - -void AOClient::cmdLogin(int argc, QStringList argv) -{ - if (authenticated) { - sendServerMessage("You are already logged in!"); - return; - } - - if (server->auth_type == "simple") { - if (server->modpass == "") { - sendServerMessage("No modpass is set! Please set a modpass before authenticating."); - } - else if(argv[0] == server->modpass) { - sendPacket("AUTH", {"1"}); // Client: "You were granted the Disable Modcalls button." - sendServerMessage("Logged in as a moderator."); // pre-2.9.1 clients are hardcoded to display the mod UI when this string is sent in OOC - authenticated = true; - } - else { - sendPacket("AUTH", {"0"}); // Client: "Login unsuccessful." - sendServerMessage("Incorrect password."); - } - server->areas.value(current_area)->logger->logLogin(this, authenticated, "moderator"); - } - else if (server->auth_type == "advanced") { - if (argc < 2) { - sendServerMessage("You must specify a username and a password"); - return; - } - QString username = argv[0]; - QString password = argv[1]; - if (server->db_manager->authenticate(username, password)) { - moderator_name = username; - authenticated = true; - sendPacket("AUTH", {"1"}); // Client: "You were granted the Disable Modcalls button." - if (version.release <= 2 && version.major <= 9 && version.minor <= 0) - sendServerMessage("Logged in as a moderator."); // pre-2.9.1 clients are hardcoded to display the mod UI when this string is sent in OOC - sendServerMessage("Welcome, " + username); - } - else { - sendPacket("AUTH", {"0"}); // Client: "Login unsuccessful." - sendServerMessage("Incorrect password."); - } - server->areas.value(current_area)->logger->logLogin(this, authenticated, username); - } - else { - qWarning() << "config.ini has an unrecognized auth_type!"; - sendServerMessage("Config.ini contains an invalid auth_type, please check your config."); - } -} - -void AOClient::cmdGetAreas(int argc, QStringList argv) -{ - QStringList entries; - entries.append("== Area List =="); - for (int i = 0; i < server->area_names.length(); i++) { - QStringList cur_area_lines = buildAreaList(i); - entries.append(cur_area_lines); - } - sendServerMessage(entries.join("\n")); -} - -void AOClient::cmdGetArea(int argc, QStringList argv) -{ - QStringList entries = buildAreaList(current_area); - sendServerMessage(entries.join("\n")); -} - -void AOClient::cmdBan(int argc, QStringList argv) -{ - QString args_str = argv[1]; - if (argc > 2) { - for (int i = 2; i < argc; i++) - args_str += " " + argv[i]; - } - - DBManager::BanInfo ban; - - QRegularExpression quoteMatcher("['\"](.+?)[\"']"); - QRegularExpressionMatchIterator matches = quoteMatcher.globalMatch(args_str); - QList unquoted_args; - while (matches.hasNext()) { - QRegularExpressionMatch match = matches.next(); - unquoted_args.append(match.captured(1)); - } - - QString duration = "perma"; - - if (unquoted_args.length() < 1) { - sendServerMessage("Invalid syntax. Usage:\n/ban \"\" \"\""); - return; - } - - ban.reason = unquoted_args.at(0); - if (unquoted_args.length() > 1) - duration = unquoted_args.at(1); - - long long duration_seconds = 0; - if (duration == "perma") - duration_seconds = -2; - else - duration_seconds = parseTime(duration); - - if (duration_seconds == -1) { - sendServerMessage("Invalid time format. Format example: 1h30m"); - return; - } - - ban.duration = duration_seconds; - - ban.ipid = argv[0]; - ban.time = QDateTime::currentDateTime().toSecsSinceEpoch(); - bool ban_logged = false; - int kick_counter = 0; - - if (argc > 2) { - for (int i = 2; i < argv.length(); i++) { - ban.reason += " " + argv[i]; - } - } - - for (AOClient* client : server->getClientsByIpid(ban.ipid)) { - if (!ban_logged) { - ban.ip = client->remote_ip; - ban.hdid = client->hwid; - server->db_manager->addBan(ban); - sendServerMessage("Banned user with ipid " + ban.ipid + " for reason: " + ban.reason); - ban_logged = true; - } - client->sendPacket("KB", {ban.reason + "\nID: " + QString::number(server->db_manager->getBanID(ban.ip)) + "\nUntil: " + QDateTime::fromSecsSinceEpoch(ban.time).addSecs(ban.duration).toString("dd.MM.yyyy, hh:mm")}); - client->socket->close(); - kick_counter++; - } - - if (kick_counter > 1) - sendServerMessage("Kicked " + QString::number(kick_counter) + " clients with matching ipids."); - if (!ban_logged) - sendServerMessage("User with ipid not found!"); -} - -void AOClient::cmdKick(int argc, QStringList argv) -{ - QString target_ipid = argv[0]; - QString reason = argv[1]; - int kick_counter = 0; - - if (argc > 2) { - for (int i = 2; i < argv.length(); i++) { - reason += " " + argv[i]; - } - } - - for (AOClient* client : server->getClientsByIpid(target_ipid)) { - client->sendPacket("KK", {reason}); - client->socket->close(); - kick_counter++; - } - - if (kick_counter > 0) - sendServerMessage("Kicked " + QString::number(kick_counter) + " client(s) with ipid " + target_ipid + " for reason: " + reason); - else - sendServerMessage("User with ipid not found!"); -} - -void AOClient::cmdChangeAuth(int argc, QStringList argv) -{ - if (server->auth_type == "simple") { - change_auth_started = true; - sendServerMessage("WARNING!\nThis command will change how logging in as a moderator works.\nOnly proceed if you know what you are doing\nUse the command /rootpass to set the password for your root account."); - } -} - -void AOClient::cmdSetRootPass(int argc, QStringList argv) -{ - if (!change_auth_started) - return; - - sendServerMessage("Changing auth type and setting root password.\nLogin again with /login root [password]"); - authenticated = false; - QSettings settings("config/config.ini", QSettings::IniFormat); - settings.beginGroup("Options"); - settings.setValue("auth", "advanced"); - server->auth_type = "advanced"; - -#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) - qsrand(QDateTime::currentMSecsSinceEpoch()); - quint32 upper_salt = qrand(); - quint32 lower_salt = qrand(); - quint64 salt_number = (upper_salt << 32) | lower_salt; -#else - quint64 salt_number = QRandomGenerator::system()->generate64(); -#endif - QString salt = QStringLiteral("%1").arg(salt_number, 16, 16, QLatin1Char('0')); - - server->db_manager->createUser("root", salt, argv[0], ACLFlags.value("SUPER")); -} - -void AOClient::cmdSetBackground(int argc, QStringList argv) -{ - AreaData* area = server->areas[current_area]; - if (authenticated || !area->bg_locked) { - if (server->backgrounds.contains(argv[0])) { - area->background = argv[0]; - server->broadcast(AOPacket("BN", {argv[0]}), current_area); - sendServerMessageArea(current_char + " changed the background to " + argv[0]); - } - else { - sendServerMessage("Invalid background name."); - } - } - else { - sendServerMessage("This area's background is locked."); - } -} - -void AOClient::cmdBgLock(int argc, QStringList argv) -{ - AreaData* area = server->areas[current_area]; - area->bg_locked = true; - server->broadcast(AOPacket("CT", {"Server", current_char + " locked the background.", "1"}), current_area); -} - -void AOClient::cmdBgUnlock(int argc, QStringList argv) -{ - AreaData* area = server->areas[current_area]; - area->bg_locked = false; - server->broadcast(AOPacket("CT", {"Server", current_char + " unlocked the background.", "1"}), current_area); -} - -void AOClient::cmdAddUser(int argc, QStringList argv) -{ -#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) - qsrand(QDateTime::currentMSecsSinceEpoch()); - quint32 upper_salt = qrand(); - quint32 lower_salt = qrand(); - quint64 salt_number = (upper_salt << 32) | lower_salt; -#else - quint64 salt_number = QRandomGenerator::system()->generate64(); -#endif - QString salt = QStringLiteral("%1").arg(salt_number, 16, 16, QLatin1Char('0')); - - if (server->db_manager->createUser(argv[0], salt, argv[1], ACLFlags.value("NONE"))) - sendServerMessage("Created user " + argv[0] + ".\nUse /addperm to modify their permissions."); - else - sendServerMessage("Unable to create user " + argv[0] + ".\nDoes a user with that name already exist?"); -} - -void AOClient::cmdRemoveUser(int argc, QStringList argv) -{ - if (server->db_manager->deleteUser(argv[0])) - sendServerMessage("Successfully removed user " + argv[0] + "."); - else - sendServerMessage("Unable to remove user " + argv[0] + ".\nDoes it exist?"); -} - -void AOClient::cmdListPerms(int argc, QStringList argv) -{ - unsigned long long user_acl = server->db_manager->getACL(moderator_name); - QStringList message; - if (argc == 0) { - // Just print out all permissions available to the user. - message.append("You have been given the following permissions:"); - for (QString perm : ACLFlags.keys()) { - if (perm == "NONE"); // don't need to list this one - else if (perm == "SUPER") { - if (user_acl == ACLFlags.value("SUPER")) // This has to be checked separately, because SUPER & anything will always be truthy - message.append("SUPER (Be careful! This grants the user all permissions.)"); - } - else if ((ACLFlags.value(perm) & user_acl) == 0); // user doesn't have this permission, don't print it - else - message.append(perm); - } - } - else { - if ((user_acl & ACLFlags.value("MODIFY_USERS")) == 0) { - sendServerMessage("You do not have permission to view other users' permissions."); - return; - } - - message.append("User " + argv[0] + " has the following permissions:"); - unsigned long long acl = server->db_manager->getACL(argv[0]); - if (acl == 0) { - sendServerMessage("This user either doesn't exist, or has no permissions set."); - return; - } - - for (QString perm : ACLFlags.keys()) { - if ((ACLFlags.value(perm) & acl) != 0 && perm != "SUPER") { - message.append(perm); - } - } - } - sendServerMessage(message.join("\n")); -} - -void AOClient::cmdAddPerms(int argc, QStringList argv) -{ - unsigned long long user_acl = server->db_manager->getACL(moderator_name); - argv[1] = argv[1].toUpper(); - - if (!ACLFlags.keys().contains(argv[1])) { - sendServerMessage("That permission doesn't exist!"); - return; - } - - if (argv[1] == "SUPER") { - if (user_acl != ACLFlags.value("SUPER")) { - // This has to be checked separately, because SUPER & anything will always be truthy - sendServerMessage("You aren't allowed to add that permission!"); - return; - } - } - if (argv[1] == "NONE") { - sendServerMessage("Added no permissions!"); - return; - } - - unsigned long long newperm = ACLFlags.value(argv[1]); - if ((newperm & user_acl) != 0) { - if (server->db_manager->updateACL(argv[0], newperm, true)) - sendServerMessage("Successfully added permission " + argv[1] + " to user " + argv[0]); - else - sendServerMessage(argv[0] + " wasn't found!"); - return; - } - - sendServerMessage("You aren't allowed to add that permission!"); -} - -void AOClient::cmdRemovePerms(int argc, QStringList argv) -{ - unsigned long long user_acl = server->db_manager->getACL(moderator_name); - argv[1] = argv[1].toUpper(); - - if (!ACLFlags.keys().contains(argv[1])) { - sendServerMessage("That permission doesn't exist!"); - return; - } - - if (argv[0] == "root") { - sendServerMessage("You cannot change the permissions of the root account!"); - return; - } - - if (argv[1] == "SUPER") { - if (user_acl != ACLFlags.value("SUPER")) { - // This has to be checked separately, because SUPER & anything will always be truthy - sendServerMessage("You aren't allowed to remove that permission!"); - return; - } - } - if (argv[1] == "NONE") { - sendServerMessage("Removed no permissions!"); - return; - } - - unsigned long long newperm = ACLFlags.value(argv[1]); - if ((newperm & user_acl) != 0) { - if (server->db_manager->updateACL(argv[0], newperm, false)) - sendServerMessage("Successfully removed permission " + argv[1] + " from user " + argv[0]); - else - sendServerMessage(argv[0] + " wasn't found!"); - return; - } - - sendServerMessage("You aren't allowed to remove that permission!"); -} - -void AOClient::cmdListUsers(int argc, QStringList argv) -{ - QStringList users = server->db_manager->getUsers(); - sendServerMessage("All users:\n" + users.join("\n")); -} - -void AOClient::cmdLogout(int argc, QStringList argv) -{ - if (!authenticated) { - sendServerMessage("You are not logged in!"); - return; - } - authenticated = false; - moderator_name = ""; - sendPacket("AUTH", {"-1"}); // Client: "You were logged out." -} - -void AOClient::cmdPos(int argc, QStringList argv) -{ - changePosition(argv[0]); - updateEvidenceList(server->areas[current_area]); -} - -void AOClient::cmdForcePos(int argc, QStringList argv) -{ - bool ok; - QList targets; - AreaData* area = server->areas[current_area]; - int target_id = argv[1].toInt(&ok); - int forced_clients = 0; - if (!ok && argv[1] != "*") { - sendServerMessage("That does not look like a valid ID."); - return; - } - else if (ok) { - AOClient* target_client = server->getClientByID(target_id); - if (target_client != nullptr) - targets.append(target_client); - else { - sendServerMessage("Target ID not found!"); - return; - } - } - - else if (argv[1] == "*") { // force all clients in the area - for (AOClient* client : server->clients) { - if (client->current_area == current_area) - targets.append(client); - } - } - for (AOClient* target : targets) { - target->sendServerMessage("Position forcibly changed by CM."); - target->changePosition(argv[0]); - forced_clients++; - } - sendServerMessage("Forced " + QString::number(forced_clients) + " into pos " + argv[0] + "."); -} - -void AOClient::cmdG(int argc, QStringList argv) -{ - QString sender_name = ooc_name; - QString sender_area = server->area_names.value(current_area); - QString sender_message = argv.join(" "); - for (AOClient* client : server->clients) { - if (client->global_enabled) - client->sendPacket("CT", {"[G][" + sender_area + "]" + sender_name, sender_message}); - } - return; -} - -void AOClient::cmdNeed(int argc, QStringList argv) -{ - QString sender_area = server->area_names.value(current_area); - QString sender_message = argv.join(" "); - sendServerBroadcast({"=== Advert ===\n[" + sender_area + "] needs " + sender_message+ "."}); -} - -void AOClient::cmdFlip(int argc, QStringList argv) -{ - QString sender_name = ooc_name; - QStringList faces = {"heads","tails"}; - QString face = faces[AOClient::genRand(0,1)]; - sendServerMessage(sender_name + " flipped a coin and got " + face + "."); -} - -void AOClient::cmdRoll(int argc, QStringList argv) -{ - diceThrower(argc, argv, RollType::ROLL); -} - -void AOClient::cmdRollP(int argc, QStringList argv) -{ - diceThrower(argc, argv, RollType::ROLLP); -} - -void AOClient::cmdDoc(int argc, QStringList argv) -{ - QString sender_name = ooc_name; - AreaData* area = server->areas[current_area]; - if (argc == 0) { - sendServerMessage("Document: " + area->document); - } - else { - area->document = argv.join(" "); - sendServerMessageArea(sender_name + " changed the document."); - } -} - -void AOClient::cmdClearDoc(int argc, QStringList argv) -{ - QString sender_name = ooc_name; - AreaData* area = server->areas[current_area]; - area->document = "No document."; - sendServerMessageArea(sender_name + " cleared the document."); -} - -void AOClient::cmdCM(int argc, QStringList argv) -{ - QString sender_name = ooc_name; - AreaData* area = server->areas[current_area]; - if (area->is_protected) { - sendServerMessage("This area is protected, you may not become CM."); - return; - } - else if (area->owners.isEmpty()) { // no one owns this area, and it's not protected - area->owners.append(id); - area->invited.append(id); - sendServerMessageArea(sender_name + " is now CM in this area."); - arup(ARUPType::CM, true); - } - else if (!area->owners.contains(id)) { // there is already a CM, and it isn't us - sendServerMessage("You cannot become a CM in this area."); - } - else if (argc == 1) { // we are CM, and we want to make ID argv[0] also CM - bool ok; - AOClient* owner_candidate = server->getClientByID(argv[0].toInt(&ok)); - if (!ok) { - sendServerMessage("That doesn't look like a valid ID."); - return; - } - if (owner_candidate == nullptr) { - sendServerMessage("Unable to find client with ID " + argv[0] + "."); - return; - } - area->owners.append(owner_candidate->id); - sendServerMessageArea(owner_candidate->ooc_name + " is now CM in this area."); - arup(ARUPType::CM, true); - } - else { - sendServerMessage("You are already a CM in this area."); - } -} - -void AOClient::cmdUnCM(int argc, QStringList argv) -{ - AreaData* area = server->areas[current_area]; - int removed = area->owners.removeAll(id); - area->invited.removeAll(id); - sendServerMessage("You are no longer CM in this area."); - arup(ARUPType::CM, true); - if (area->owners.isEmpty()) { - area->invited.clear(); - if (area->locked != AreaData::FREE) { - area->locked = AreaData::FREE; - arup(ARUPType::LOCKED, true); - } - } -} - -void AOClient::cmdInvite(int argc, QStringList argv) -{ - AreaData* area = server->areas[current_area]; - bool ok; - int invited_id = argv[0].toInt(&ok); - if (!ok) { - sendServerMessage("That does not look like a valid ID."); - return; - } - else if (server->getClientByID(invited_id) == nullptr) { - sendServerMessage("No client with that ID found."); - return; - } - else if (area->invited.contains(invited_id)) { - sendServerMessage("That ID is already on the invite list."); - return; - } - area->invited.append(invited_id); - sendServerMessage("You invited ID " + argv[0]); -} - -void AOClient::cmdUnInvite(int argc, QStringList argv) -{ - AreaData* area = server->areas[current_area]; - bool ok; - int uninvited_id = argv[0].toInt(&ok); - if (!ok) { - sendServerMessage("That does not look like a valid ID."); - return; - } - else if (server->getClientByID(uninvited_id) == nullptr) { - sendServerMessage("No client with that ID found."); - return; - } - else if (area->owners.contains(uninvited_id)) { - sendServerMessage("You cannot uninvite a CM!"); - return; - } - else if (!area->invited.contains(uninvited_id)) { - sendServerMessage("That ID is not on the invite list."); - return; - } - area->invited.removeAll(uninvited_id); - sendServerMessage("You uninvited ID " + argv[0]); -} - -void AOClient::cmdLock(int argc, QStringList argv) -{ - AreaData* area = server->areas[current_area]; - if (area->locked == AreaData::LockStatus::LOCKED) { - sendServerMessage("This area is already locked."); - return; - } - sendServerMessageArea("This area is now locked."); - area->locked = AreaData::LockStatus::LOCKED; - for (AOClient* client : server->clients) { - if (client->current_area == current_area && client->joined) { - area->invited.append(client->id); - } - } - arup(ARUPType::LOCKED, true); -} - -void AOClient::cmdSpectatable(int argc, QStringList argv) -{ - AreaData* area = server->areas[current_area]; - if (area->locked == AreaData::LockStatus::SPECTATABLE) { - sendServerMessage("This area is already in spectate mode."); - return; - } - sendServerMessageArea("This area is now spectatable."); - area->locked = AreaData::LockStatus::SPECTATABLE; - for (AOClient* client : server->clients) { - if (client->current_area == current_area && client->joined) { - area->invited.append(client->id); - } - } - arup(ARUPType::LOCKED, true); -} - -void AOClient::cmdUnLock(int argc, QStringList argv) -{ - AreaData* area = server->areas[current_area]; - if (area->locked == AreaData::LockStatus::FREE) { - sendServerMessage("This area is not locked."); - return; - } - sendServerMessageArea("This area is now unlocked."); - area->locked = AreaData::LockStatus::FREE; - arup(ARUPType::LOCKED, true); -} - -void AOClient::cmdTimer(int argc, QStringList argv) -{ - AreaData* area = server->areas[current_area]; - - // Called without arguments - // Shows a brief of all timers - if (argc == 0) { - QStringList timers; - timers.append("Currently active timers:"); - for (int i = 0; i <= 4; i++) { - timers.append(getAreaTimer(area->index, i)); - } - sendServerMessage(timers.join("\n")); - return; - } - - // Called with more than one argument - bool ok; - int timer_id = argv[0].toInt(&ok); - if (!ok || timer_id < 0 || timer_id > 4) { - sendServerMessage("Invalid timer ID. Timer ID must be a whole number between 0 and 4."); - return; - } - - // Called with one argument - // Shows the status of one timer - if (argc == 1) { - sendServerMessage(getAreaTimer(area->index, timer_id)); - return; - } - - // Called with more than one argument - // Updates the state of a timer - - // Select the proper timer - // Check against permissions if global timer is selected - QTimer* requested_timer; - if (timer_id == 0) { - if (!checkAuth(ACLFlags.value("GLOBAL_TIMER"))) { - sendServerMessage("You are not authorized to alter the global timer."); - return; - } - requested_timer = server->timer; - } - else - requested_timer = area->timers[timer_id - 1]; - - AOPacket show_timer("TI", {QString::number(timer_id), "2"}); - AOPacket hide_timer("TI", {QString::number(timer_id), "3"}); - bool is_global = timer_id == 0; - - // Set the timer's time remaining if the second - // argument is a valid time - QTime requested_time = QTime::fromString(argv[1], "hh:mm:ss"); - if (requested_time.isValid()) { - requested_timer->setInterval(QTime(0,0).msecsTo(requested_time)); - requested_timer->start(); - sendServerMessage("Set timer " + QString::number(timer_id) + " to " + argv[1] + "."); - AOPacket update_timer("TI", {QString::number(timer_id), "0", QString::number(QTime(0,0).msecsTo(requested_time))}); - is_global ? server->broadcast(show_timer) : server->broadcast(show_timer, current_area); // Show the timer - is_global ? server->broadcast(update_timer) : server->broadcast(update_timer, current_area); - return; - } - // Otherwise, update the state of the timer - else { - if (argv[1] == "start") { - requested_timer->start(); - sendServerMessage("Started timer " + QString::number(timer_id) + "."); - AOPacket update_timer("TI", {QString::number(timer_id), "0", QString::number(QTime(0,0).msecsTo(QTime(0,0).addMSecs(requested_timer->remainingTime())))}); - is_global ? server->broadcast(show_timer) : server->broadcast(show_timer, current_area); - is_global ? server->broadcast(update_timer) : server->broadcast(update_timer, current_area); - } - else if (argv[1] == "pause" || argv[1] == "stop") { - requested_timer->setInterval(requested_timer->remainingTime()); - requested_timer->stop(); - sendServerMessage("Stopped timer " + QString::number(timer_id) + "."); - AOPacket update_timer("TI", {QString::number(timer_id), "1", QString::number(QTime(0,0).msecsTo(QTime(0,0).addMSecs(requested_timer->interval())))}); - is_global ? server->broadcast(update_timer) : server->broadcast(update_timer, current_area); - } - else if (argv[1] == "hide" || argv[1] == "unset") { - requested_timer->setInterval(0); - requested_timer->stop(); - sendServerMessage("Hid timer " + QString::number(timer_id) + "."); - // Hide the timer - is_global ? server->broadcast(hide_timer) : server->broadcast(hide_timer, current_area); - } - } -} - -void AOClient::cmdEvidenceMod(int argc, QStringList argv) -{ - AreaData* area = server->areas[current_area]; - argv[0] = argv[0].toLower(); - if (argv[0] == "cm") - area->evi_mod = AreaData::EvidenceMod::CM; - else if (argv[0] == "mod") - area->evi_mod = AreaData::EvidenceMod::MOD; - else if (argv[0] == "hiddencm") - area->evi_mod = AreaData::EvidenceMod::HIDDEN_CM; - else if (argv[0] == "ffa") - area->evi_mod = AreaData::EvidenceMod::FFA; - else { - sendServerMessage("Invalid evidence mod."); - return; - } - sendServerMessage("Changed evidence mod."); - - // Resend evidence lists to everyone in the area - sendEvidenceList(area); -} - -void AOClient::cmdArea(int argc, QStringList argv) -{ - bool ok; - int new_area = argv[0].toInt(&ok); - if (!ok || new_area >= server->areas.size() || new_area < 0) { - sendServerMessage("That does not look like a valid area ID."); - return; - } - changeArea(new_area); -} - -void AOClient::cmdPlay(int argc, QStringList argv) -{ - AreaData* area = server->areas[current_area]; - QString song = argv.join(" "); - area->current_music = song; - area->music_played_by = showname; - AOPacket music_change("MC", {song, QString::number(server->getCharID(current_char)), showname, "1", "0"}); - server->broadcast(music_change, current_area); -} - -void AOClient::cmdAreaKick(int argc, QStringList argv) -{ - bool ok; - int idx = argv[0].toInt(&ok); - if (!ok) { - sendServerMessage("That does not look like a valid ID."); - return; - } - AOClient* client_to_kick = server->getClientByID(idx); - if (client_to_kick == nullptr) { - sendServerMessage("No client with that ID found."); - return; - } - client_to_kick->changeArea(0); - sendServerMessage("Client " + argv[0] + " kicked back to area 0."); -} - -void AOClient::cmdSwitch(int argc, QStringList argv) -{ - int char_id = server->getCharID(argv.join(" ")); - if (char_id == -1) { - sendServerMessage("That does not look like a valid character."); - return; - } - changeCharacter(char_id); -} - -void AOClient::cmdRandomChar(int argc, QStringList argv) -{ - int char_id = genRand(0, server->characters.size() - 1); - changeCharacter(char_id); -} - -void AOClient::cmdToggleGlobal(int argc, QStringList argv) -{ - global_enabled = !global_enabled; - QString str_en = global_enabled ? "shown" : "hidden"; - sendServerMessage("Global chat set to " + str_en); -} - -void AOClient::cmdMods(int argc, QStringList argv) -{ - QStringList entries; - int online_count = 0; - for (AOClient* client : server->clients) { - if (client->authenticated) { - entries << "---"; - if (server->auth_type != "simple") - entries << "Moderator: " + client->moderator_name; - entries << "OOC name: " + client->ooc_name; - entries << "ID: " + QString::number(client->id); - entries << "Area: " + QString::number(client->current_area); - entries << "Character: " + client->current_char; - online_count++; - } - } - entries << "---"; - entries << "Total online: " << QString::number(online_count); - sendServerMessage(entries.join("\n")); -} - -void AOClient::cmdHelp(int argc, QStringList argv) -{ - QStringList entries; - entries << "Allowed commands:"; - QMap::const_iterator i; - for (i = commands.constBegin(); i!= commands.constEnd(); ++i) { - CommandInfo info = i.value(); - if (checkAuth(info.acl_mask)) { // if we are allowed to use this command - entries << "/" + i.key(); - } - } - sendServerMessage(entries.join("\n")); -} - -void AOClient::cmdStatus(int argc, QStringList argv) -{ - AreaData* area = server->areas[current_area]; - QString arg = argv[0].toLower(); - if (arg == "idle") - area->status = AreaData::IDLE; - else if (arg == "rp") - area->status = AreaData::RP; - else if (arg == "casing") - area->status = AreaData::CASING; - else if (arg == "looking-for-players" || arg == "lfp") - area->status = AreaData::LOOKING_FOR_PLAYERS; - else if (arg == "recess") - area->status = AreaData::RECESS; - else if (arg == "gaming") - area->status = AreaData::GAMING; - else { - sendServerMessage("That does not look like a valid status. Valid statuses are idle, rp, casing, lfp, recess, gaming"); - return; - } - arup(ARUPType::STATUS, true); -} - -void AOClient::cmdCurrentMusic(int argc, QStringList argv) -{ - AreaData* area = server->areas[current_area]; - if (area->current_music != "" && area->current_music != "~stop.mp3") // dummy track for stopping music - sendServerMessage("The current song is " + area->current_music + " played by " + area->music_played_by); - else - sendServerMessage("There is no music playing."); -} - -void AOClient::cmdPM(int arc, QStringList argv) -{ - bool ok; - int target_id = argv.takeFirst().toInt(&ok); // using takeFirst removes the ID from our list of arguments... - if (!ok) { - sendServerMessage("That does not look like a valid ID."); - return; - } - AOClient* target_client = server->getClientByID(target_id); - if (target_client == nullptr) { - sendServerMessage("No client with that ID found."); - return; - } - QString message = argv.join(" "); //...which means it will not end up as part of the message - target_client->sendServerMessage("Message from " + ooc_name + " (" + QString::number(id) + "): " + message); -} - -void AOClient::cmdMOTD(int argc, QStringList argv) -{ - if (argc == 0) { - sendServerMessage("=== MOTD ===\r\n" + server->MOTD + "\r\n============="); - } - else if (argc > 0) { - if (checkAuth(ACLFlags.value("MOTD"))) { - QString MOTD = argv.join(" "); - server->MOTD = MOTD; - sendServerMessage("MOTD has been changed."); - } - else { - sendServerMessage("You do not have permission to change the MOTD"); - } - } -} - -void AOClient::cmdAnnounce(int argc, QStringList argv) -{ - sendServerBroadcast("=== Announcement ===\r\n" + argv.join(" ") + "\r\n============="); -} - -void AOClient::cmdM(int argc, QStringList argv) -{ - QString sender_name = ooc_name; - QString sender_message = argv.join(" "); - for (AOClient* client : server->clients) { - if (client->checkAuth(ACLFlags.value("MODCHAT"))) - client->sendPacket("CT", {"[M]" + sender_name, sender_message}); - } - return; -} - -void AOClient::cmdGM(int argc, QStringList argv) -{ - QString sender_name = ooc_name; - QString sender_area = server->area_names.value(current_area); - QString sender_message = argv.join(" "); - for (AOClient* client : server->clients) { - if (client->global_enabled) { - client->sendPacket("CT", {"[G][" + sender_area + "]" + "["+sender_name+"][M]", sender_message}); - } - } -} - -void AOClient::cmdLM(int argc, QStringList argv) -{ - QString sender_name = ooc_name; - QString sender_message = argv.join(" "); - server->broadcast(AOPacket("CT", {"["+sender_name+"][M]", sender_message}), current_area); -} - -void AOClient::cmdBans(int argc, QStringList argv) -{ - QStringList recent_bans; - recent_bans << "Last 5 bans:"; - recent_bans << "-----"; - for (DBManager::BanInfo ban : server->db_manager->getRecentBans()) { - QString banned_until; - if (ban.duration == -2) - banned_until = "The heat death of the universe"; - else - banned_until = QDateTime::fromSecsSinceEpoch(ban.time).addSecs(ban.duration).toString("dd.MM.yyyy, hh:mm"); - recent_bans << "Affected IPID: " + ban.ipid; - recent_bans << "Affected HDID: " + ban.hdid; - recent_bans << "Reason for ban: " + ban.reason; - recent_bans << "Date of ban: " + QDateTime::fromSecsSinceEpoch(ban.time).toString("dd.MM.yyyy, hh:mm"); - recent_bans << "Ban lasts until: " + banned_until; - recent_bans << "-----"; - } - sendServerMessage(recent_bans.join("\n")); -} - -void AOClient::cmdUnBan(int argc, QStringList argv) -{ - bool ok; - int target_ban = argv[0].toInt(&ok); - if (!ok) { - sendServerMessage("Invalid ban ID."); - return; - } - else if (server->db_manager->invalidateBan(target_ban)) - sendServerMessage("Successfully invalidated ban " + argv[0] + "."); - else - sendServerMessage("Couldn't invalidate ban " + argv[0] + ", are you sure it exists?"); -} - -void AOClient::cmdSubTheme(int argc, QStringList argv) -{ - QString subtheme = argv.join(" "); - for (AOClient* client : server->clients) { - if (client->current_area == current_area) - client->sendPacket("ST", {subtheme, "1"}); - } - sendServerMessageArea("Subtheme was set to " + subtheme); -} - -void AOClient::cmdAbout(int argc, QStringList argv) -{ - sendPacket("CT", {"The akashi dev team", "Thank you for using akashi! Made with love by scatterflower, with help from in1tiate and Salanto. akashi " + QCoreApplication::applicationVersion()}); -} - -void AOClient::cmdEvidence_Swap(int argc, QStringList argv) -{ - AreaData* area = server->areas[current_area]; - int ev_size = area->evidence.size() -1; - - if (ev_size < 0) { - sendServerMessage("No evidence in area."); - return; - } - - bool ok, ok2; - int ev_id1 = argv[0].toInt(&ok), ev_id2 = argv[1].toInt(&ok2); - - if ((!ok || !ok2)) { - sendServerMessage("Invalid evidence ID."); - return; - } - if ((ev_id1 < 0) || (ev_id2 < 0)) { - sendServerMessage("Evidence ID can't be negative."); - return; - } - if ((ev_id2 <= ev_size) && (ev_id1 <= ev_size)) { -#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) - //swapItemsAt does not exist in Qt older than 5.13 - area->evidence.swap(ev_id1, ev_id2); -#else - area->evidence.swapItemsAt(ev_id1, ev_id2); -#endif - sendEvidenceList(area); - sendServerMessage("The evidence " + QString::number(ev_id1) + " and " + QString::number(ev_id2) + " have been swapped."); - } - else { - sendServerMessage("Unable to swap evidence. Evidence ID out of range."); - } -} - -void AOClient::cmdMute(int argc, QStringList argv) -{ - bool conv_ok = false; - int uid = argv[0].toInt(&conv_ok); - if (!conv_ok) { - sendServerMessage("Invalid user ID."); - return; - } - - AOClient* target = server->getClientByID(uid); - - if (target->is_muted) - sendServerMessage("That player is already muted!"); - else { - sendServerMessage("Muted player."); - target->sendServerMessage("You were muted by a moderator. " + getReprimand()); - } - target->is_muted = true; -} - -void AOClient::cmdUnMute(int argc, QStringList argv) -{ - bool conv_ok = false; - int uid = argv[0].toInt(&conv_ok); - if (!conv_ok) { - sendServerMessage("Invalid user ID."); - return; - } - - AOClient* target = server->getClientByID(uid); - - if (!target->is_muted) - sendServerMessage("That player is not muted!"); - else { - sendServerMessage("Unmuted player."); - target->sendServerMessage("You were unmuted by a moderator. " + getReprimand(true)); - } - target->is_muted = false; -} - -void AOClient::cmdOocMute(int argc, QStringList argv) -{ - bool conv_ok = false; - int uid = argv[0].toInt(&conv_ok); - if (!conv_ok) { - sendServerMessage("Invalid user ID."); - return; - } - - AOClient* target = server->getClientByID(uid); - - if (target->is_ooc_muted) - sendServerMessage("That player is already OOC muted!"); - else { - sendServerMessage("OOC muted player."); - target->sendServerMessage("You were OOC muted by a moderator. " + getReprimand()); - } - target->is_ooc_muted = true; -} - -void AOClient::cmdOocUnMute(int argc, QStringList argv) -{ - bool conv_ok = false; - int uid = argv[0].toInt(&conv_ok); - if (!conv_ok) { - sendServerMessage("Invalid user ID."); - return; - } - - AOClient* target = server->getClientByID(uid); - - if (!target->is_ooc_muted) - sendServerMessage("That player is not OOC muted!"); - else { - sendServerMessage("OOC unmuted player."); - target->sendServerMessage("You were OOC unmuted by a moderator. " + getReprimand(true)); - } - target->is_ooc_muted = false; -} - -void AOClient::cmdBlockDj(int argc, QStringList argv) -{ - bool conv_ok = false; - int uid = argv[0].toInt(&conv_ok); - if (!conv_ok) { - sendServerMessage("Invalid user ID."); - return; - } - - AOClient* target = server->getClientByID(uid); - - if (target->is_dj_blocked) - sendServerMessage("That player is already DJ blocked!"); - else { - sendServerMessage("DJ blocked player."); - target->sendServerMessage("You were blocked from changing the music by a moderator. " + getReprimand()); - } - target->is_dj_blocked = true; -} - -void AOClient::cmdUnBlockDj(int argc, QStringList argv) -{ - bool conv_ok = false; - int uid = argv[0].toInt(&conv_ok); - if (!conv_ok) { - sendServerMessage("Invalid user ID."); - return; - } - - AOClient* target = server->getClientByID(uid); - - if (!target->is_dj_blocked) - sendServerMessage("That player is not DJ blocked!"); - else { - sendServerMessage("DJ permissions restored to player."); - target->sendServerMessage("A moderator restored your music permissions. " + getReprimand(true)); - } - target->is_dj_blocked = false; -} - -void AOClient::cmdBlockWtce(int argc, QStringList argv) -{ - bool conv_ok = false; - int uid = argv[0].toInt(&conv_ok); - if (!conv_ok) { - sendServerMessage("Invalid user ID."); - return; - } - - AOClient* target = server->getClientByID(uid); - - if (target->is_wtce_blocked) - sendServerMessage("That player is already judge blocked!"); - else { - sendServerMessage("Revoked player's access to judge controls."); - target->sendServerMessage("A moderator revoked your judge controls access. " + getReprimand()); - } - target->is_wtce_blocked = true; -} - -void AOClient::cmdUnBlockWtce(int argc, QStringList argv) -{ - bool conv_ok = false; - int uid = argv[0].toInt(&conv_ok); - if (!conv_ok) { - sendServerMessage("Invalid user ID."); - return; - } - - AOClient* target = server->getClientByID(uid); - - if (!target->is_wtce_blocked) - sendServerMessage("That player is not judge blocked!"); - else { - sendServerMessage("Restored player's access to judge controls."); - target->sendServerMessage("A moderator restored your judge controls access. " + getReprimand(true)); - } - target->is_wtce_blocked = false; -} - -void AOClient::cmdNoteCard(int argc, QStringList argv) -{ - AreaData* area = server->areas[current_area]; - if (area->notecards.keys().contains(current_char)) - area->notecards.remove(current_char); - QString notecard = argv.join(" "); - area->notecards[current_char] = notecard; - sendServerMessageArea(current_char + " wrote a note card."); -} - -void AOClient::cmdNoteCardClear(int argc, QStringList argv) -{ - AreaData* area = server->areas[current_area]; - if (area->notecards.keys().contains(current_char)) { - area->notecards.remove(current_char); - sendServerMessageArea(current_char + " erased their note card."); - } - else - sendServerMessage("You do not have a note card."); -} - -void AOClient::cmdNoteCardReveal(int argc, QStringList argv) -{ - AreaData* area = server->areas[current_area]; - if (area->notecards.isEmpty()) { - sendServerMessage("There are no cards to reveal in this area."); - return; - } - QStringList message; - message << "Note cards have been revealed."; - QMap::iterator i; - for (i = area->notecards.begin(); i != area->notecards.end(); ++i) - message << i.key() + ": " + i.value(); - sendServerMessageArea(message.join("\n")); - area->notecards.clear(); -} - -void AOClient::cmd8Ball(int argc, QStringList argv) -{ - if (server->magic_8ball_answers.isEmpty()) { - qWarning() << "8ball.txt is empty!"; - sendServerMessage("8ball.txt is empty."); - } - else { - QString response = server->magic_8ball_answers[(genRand(1, server->magic_8ball_answers.size() - 1))]; - QString sender_name = ooc_name; - QString sender_message = argv.join(" "); - - sendServerMessageArea(sender_name + " asked the magic 8-ball, \"" + sender_message + "\" and the answer is: " + response); - } -} - -void AOClient::cmdJudgeLog(int argc, QStringList argv) -{ - AreaData* area = server->areas[current_area]; - if (area->judgelog.isEmpty()) { - sendServerMessage("There have been no judge actions in this area."); - return; - } - QString message = area->judgelog.join("\n"); - //Judgelog contains an IPID, so we shouldn't send that unless the caller has appropriate permissions - if (checkAuth(ACLFlags.value("KICK")) == 1 || checkAuth(ACLFlags.value("BAN")) == 1) { - sendServerMessage(message); - } - else { - QString filteredmessage = message.remove(QRegularExpression("[(].*[)]")); //Filter out anything between two parentheses. This should only ever be the IPID - sendServerMessage(filteredmessage); - } -} - -void AOClient::cmdAllowBlankposting(int argc, QStringList argv) -{ - QString sender_name = ooc_name; - AreaData* area = server->areas[current_area]; - area->blankposting_allowed = !area->blankposting_allowed; - if (area->blankposting_allowed == false) { - sendServerMessageArea(sender_name + " has set blankposting in the area to forbidden."); - } - else { - sendServerMessageArea(sender_name + " has set blankposting in the area to allowed."); - } -} - -void AOClient::cmdGimp(int argc, QStringList argv) -{ - bool conv_ok = false; - int uid = argv[0].toInt(&conv_ok); - if (!conv_ok) { - sendServerMessage("Invalid user ID."); - return; - } - - AOClient* target = server->getClientByID(uid); - - if (target->is_gimped) - sendServerMessage("That player is already gimped!"); - else { - sendServerMessage("Gimped player."); - target->sendServerMessage("You have been gimped! " + getReprimand()); - } - target->is_gimped = true; -} - -void AOClient::cmdUnGimp(int argc, QStringList argv) -{ - bool conv_ok = false; - int uid = argv[0].toInt(&conv_ok); - if (!conv_ok) { - sendServerMessage("Invalid user ID."); - return; - } - - AOClient* target = server->getClientByID(uid); - - if (!(target->is_gimped)) - sendServerMessage("That player is not gimped!"); - else { - sendServerMessage("Ungimped player."); - target->sendServerMessage("A moderator has ungimped you! " + getReprimand(true)); - } - target->is_gimped = false; -} -void AOClient::cmdBanInfo(int argc, QStringList argv) -{ - QStringList ban_info; - ban_info << ("Ban Info for " + argv[0]); - ban_info << "-----"; - QString lookup_type; - - if (argc == 1) { - lookup_type = "banid"; - } - else if (argc == 2) { - lookup_type = argv[1]; - if (!((lookup_type == "banid") || (lookup_type == "ipid") || (lookup_type == "hdid"))) { - sendServerMessage("Invalid ID type."); - return; - } - } - else { - sendServerMessage("Invalid command."); - return; - } - QString id = argv[0]; - for (DBManager::BanInfo ban : server->db_manager->getBanInfo(lookup_type, id)) { - QString banned_until; - if (ban.duration == -2) - banned_until = "The heat death of the universe"; - else - banned_until = QDateTime::fromSecsSinceEpoch(ban.time).addSecs(ban.duration).toString("dd.MM.yyyy, hh:mm"); - ban_info << "Affected IPID: " + ban.ipid; - ban_info << "Affected HDID: " + ban.hdid; - ban_info << "Reason for ban: " + ban.reason; - ban_info << "Date of ban: " + QDateTime::fromSecsSinceEpoch(ban.time).toString("dd.MM.yyyy, hh:mm"); - ban_info << "Ban lasts until: " + banned_until; - ban_info << "-----"; - } - sendServerMessage(ban_info.join("\n")); -} - -void AOClient::cmdTestify(int argc, QStringList argv) -{ - AreaData* area = server->areas[current_area]; - if (area->test_rec == AreaData::TestimonyRecording::RECORDING) { - sendServerMessage("Testimony recording is already in progress. Please stop it before starting a new one."); - } - else { - clearTestimony(); - area->statement = 0; - area->test_rec = AreaData::TestimonyRecording::RECORDING; - sendServerMessage("Started testimony recording."); - } -} - -void AOClient::cmdExamine(int argc, QStringList argv) -{ - AreaData* area = server->areas[current_area]; - if (area->testimony.size() -1 > 0) - { - area->test_rec = AreaData::TestimonyRecording::PLAYBACK; - server->broadcast(AOPacket("RT",{"testimony2"}), current_area); - server->broadcast(AOPacket("MS", {area->testimony[0]}), current_area); - area->statement = 0; - return; - } - if (area->test_rec == AreaData::TestimonyRecording::PLAYBACK) - sendServerMessage("Unable to examine while another examination is running"); - else - sendServerMessage("Unable to start replay without prior examination."); -} - -void AOClient::cmdDeleteStatement(int argc, QStringList argv) -{ - AreaData* area = server->areas[current_area]; - int c_statement = area->statement; - if (area->testimony.size() - 1 == 0) { - sendServerMessage("Unable to delete statement. No statements saved in this area."); - } - if (c_statement > 0 && area->testimony.size() > 2) { - area->testimony.remove(c_statement); - sendServerMessage("The statement with id " + QString::number(c_statement) + " has been deleted from the testimony."); - } -} - -void AOClient::cmdUpdateStatement(int argc, QStringList argv) -{ - server->areas[current_area]->test_rec = AreaData::TestimonyRecording::UPDATE; - sendServerMessage("The next IC-Message will replace the last displayed replay message."); -} - -void AOClient::cmdPauseTestimony(int argc, QStringList argv) -{ - AreaData* area = server->areas[current_area]; - area->test_rec = AreaData::TestimonyRecording::STOPPED; - sendServerMessage("Testimony has been stopped."); -} - -void AOClient::cmdAddStatement(int argc, QStringList argv) -{ - if (server->areas[current_area]->statement < server->maximum_statements) { - server->areas[current_area]->test_rec = AreaData::TestimonyRecording::ADD; - sendServerMessage("The next IC-Message will be inserted into the testimony."); - } - else - sendServerMessage("Unable to add anymore statements. Please remove any unused ones."); -} - -void AOClient::cmdReload(int argc, QStringList argv) -{ - server->loadServerConfig(); - server->loadCommandConfig(); - emit server->reloadRequest(server->server_name, server->server_desc); - sendServerMessage("Reloaded configurations"); -} - -void AOClient::cmdDisemvowel(int argc, QStringList argv) -{ - bool conv_ok = false; - int uid = argv[0].toInt(&conv_ok); - if (!conv_ok) { - sendServerMessage("Invalid user ID."); - return; - } - - AOClient* target = server->getClientByID(uid); - - if (target->is_disemvoweled) - sendServerMessage("That player is already disemvoweled!"); - else { - sendServerMessage("Disemvoweled player."); - target->sendServerMessage("You have been disemvoweled! " + getReprimand()); - } - target->is_disemvoweled = true; -} - -void AOClient::cmdUnDisemvowel(int argc, QStringList argv) -{ - bool conv_ok = false; - int uid = argv[0].toInt(&conv_ok); - if (!conv_ok) { - sendServerMessage("Invalid user ID."); - return; - } - - AOClient* target = server->getClientByID(uid); - - if (!(target->is_disemvoweled)) - sendServerMessage("That player is not disemvoweled!"); - else { - sendServerMessage("Undisemvoweled player."); - target->sendServerMessage("A moderator has undisemvoweled you! " + getReprimand(true)); - } - target->is_disemvoweled = false; -} - -void AOClient::cmdShake(int argc, QStringList argv) -{ - bool conv_ok = false; - int uid = argv[0].toInt(&conv_ok); - if (!conv_ok) { - sendServerMessage("Invalid user ID."); - return; - } - - AOClient* target = server->getClientByID(uid); - - if (target->is_shaken) - sendServerMessage("That player is already shaken!"); - else { - sendServerMessage("Shook player."); - target->sendServerMessage("A moderator has shaken your words! " + getReprimand()); - } - target->is_shaken = true; -} - -void AOClient::cmdUnShake(int argc, QStringList argv) -{ - bool conv_ok = false; - int uid = argv[0].toInt(&conv_ok); - if (!conv_ok) { - sendServerMessage("Invalid user ID."); - return; - } - - AOClient* target = server->getClientByID(uid); - - if (!(target->is_shaken)) - sendServerMessage("That player is not shaken!"); - else { - sendServerMessage("Unshook player."); - target->sendServerMessage("A moderator has unshook you! " + getReprimand(true)); - } - target->is_shaken = false; -} - -void AOClient::cmdForceImmediate(int argc, QStringList argv) -{ - AreaData* area = server->areas[current_area]; - area->force_immediate = !area->force_immediate; - QString state = area->force_immediate ? "on." : "off."; - sendServerMessage("Forced immediate text processing in this area is now " + state); -} - -void AOClient::cmdAllowIniswap(int argc, QStringList argv) -{ - AreaData* area = server->areas[current_area]; - area->iniswap_allowed = !area->iniswap_allowed; - QString state = area->iniswap_allowed ? "allowed." : "disallowed."; - sendServerMessage("Iniswapping in this area is now " + state); -} - -void AOClient::cmdAfk(int argc, QStringList argv) -{ - is_afk = true; - sendServerMessage("You are now AFK."); -} - -QStringList AOClient::buildAreaList(int area_idx) -{ - QStringList entries; - QString area_name = server->area_names[area_idx]; - AreaData* area = server->areas[area_idx]; - entries.append("=== " + area_name + " ==="); - switch (area->locked) { - case AreaData::LockStatus::LOCKED: - entries.append("[LOCKED]"); - break; - case AreaData::LockStatus::SPECTATABLE: - entries.append("[SPECTATABLE]"); - break; - case AreaData::LockStatus::FREE: - default: - break; - } - entries.append("[" + QString::number(area->player_count) + " users][" + QVariant::fromValue(area->status).toString().replace("_", "-") + "]"); - for (AOClient* client : server->clients) { - if (client->current_area == area_idx && client->joined) { - QString char_entry = "[" + QString::number(client->id) + "] " + client->current_char; - if (client->current_char == "") - char_entry += "Spectator"; - if (area->owners.contains(client->id)) - char_entry.insert(0, "[CM] "); - if (authenticated) - char_entry += " (" + client->getIpid() + "): " + client->ooc_name; - if (client->is_afk) - char_entry += " [AFK]"; - entries.append(char_entry); - } - } - return entries; -} - -int AOClient::genRand(int min, int max) -{ -#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) - qsrand(QDateTime::currentMSecsSinceEpoch()); - quint32 random_number = (qrand() % (max - min + 1)) + min; - return random_number; - -#else - quint32 random_number = QRandomGenerator::system()->bounded(min, max + 1); - return random_number; -#endif -} - -void AOClient::diceThrower(int argc, QStringList argv, RollType type) -{ - QString sender_name = ooc_name; - int max_value = server->dice_value; - int max_dice = server->max_dice; - int bounded_value; - int bounded_amount; - QString dice_results; - - if (argc == 0) { - dice_results = QString::number(genRand(1, 6)); // Self-explanatory - } - else if (argc == 1) { - bounded_value = qBound(1, argv[0].toInt(), max_value); // faces, max faces - dice_results = QString::number(genRand(1, bounded_value)); - } - else if (argc == 2) { - bounded_value = qBound(1, argv[0].toInt(), max_value); // 1, faces, max faces - bounded_amount = qBound(1, argv[1].toInt(), max_dice); // 1, amount, max amount - - for (int i = 1; i <= bounded_amount ; i++) // Loop as multiple dices are thrown - { - QString dice_result = QString::number(genRand(1, bounded_value)); - if (i == bounded_amount) { - dice_results = dice_results.append(dice_result); - } - else { - dice_results = dice_results.append(dice_result + ","); - } - } - } - // Switch to change message behaviour, isEmpty check or the entire server crashes due to an out of range issue in the QStringList - switch(type) - { - case ROLL: - if (argv.isEmpty()) { - sendServerMessageArea(sender_name + " rolled " + dice_results + " out of 6"); - } - else { - sendServerMessageArea(sender_name + " rolled " + dice_results + " out of " + QString::number(bounded_value)); - } - break; - case ROLLP: - if (argv.isEmpty()) { - sendServerMessage(sender_name + " rolled " + dice_results + " out of 6"); - sendServerMessageArea((sender_name + " rolled in secret.")); - } - else { - sendServerMessageArea(sender_name + " rolled " + dice_results + " out of " + QString::number(bounded_value)); - sendServerMessageArea((sender_name + " rolled in secret.")); - } - break; - case ROLLA: - //Not implemented yet - default : break; - } -} - -QString AOClient::getAreaTimer(int area_idx, int timer_idx) -{ - AreaData* area = server->areas[area_idx]; - QTimer* timer; - QString timer_name = (timer_idx == 0) ? "Global timer" : "Timer " + QString::number(timer_idx); - - if (timer_idx == 0) - timer = server->timer; - else if (timer_idx > 0 && timer_idx <= 4) - timer = area->timers[timer_idx - 1]; - else - return "Invalid timer ID."; - - if (timer->isActive()) { - QTime current_time = QTime(0,0).addMSecs(timer->remainingTime()); - - return timer_name + " is at " + current_time.toString("hh:mm:ss.zzz"); - } - else { - return timer_name + " is inactive."; - } -} - -long long AOClient::parseTime(QString input) -{ - QRegularExpression regex("(?:(?:(?.*?)y)*(?:(?.*?)w)*(?:(?.*?)d)*(?:(?
.*?)h)*(?:(?.*?)m)*(?:(?.*?)s)*)"); - QRegularExpressionMatch match = regex.match(input); - QString str_year, str_week, str_hour, str_day, str_minute, str_second; - int year, week, day, hour, minute, second; - - str_year = match.captured("year"); - str_week = match.captured("week"); - str_day = match.captured("day"); - str_hour = match.captured("hr"); - str_minute = match.captured("min"); - str_second = match.captured("sec"); - - bool is_well_formed = false; - QString concat_str(str_year + str_week + str_day + str_hour + str_minute + str_second); - concat_str.toInt(&is_well_formed); - - if (!is_well_formed) { - return -1; - } - - year = str_year.toInt(); - week = str_week.toInt(); - day = str_day.toInt(); - hour = str_hour.toInt(); - minute = str_minute.toInt(); - second = str_second.toInt(); - - long long total = 0; - total += 31622400 * year; - total += 604800 * week; - total += 86400 * day; - total += 3600 * hour; - total += 60 * minute; - total += second; - - if (total < 0) - return -1; - - return total; -} - -QString AOClient::getReprimand(bool positive) -{ - if (positive) { - return server->praise_list[genRand(0, server->praise_list.size() - 1)]; - } - else { - return server->reprimands_list[genRand(0, server->reprimands_list.size() - 1)]; - } -} diff --git a/src/packets.cpp b/src/packets.cpp index 6ddce8a..f271216 100644 --- a/src/packets.cpp +++ b/src/packets.cpp @@ -344,59 +344,6 @@ void AOClient::pktEditEvidence(AreaData* area, int argc, QStringList argv, AOPac sendEvidenceList(area); } -void AOClient::pktSetCase(AreaData* area, int argc, QStringList argv, AOPacket packet) -{ - QList prefs_list; - for (int i = 2; i <=6; i++) { - bool is_int = false; - bool pref = argv[i].toInt(&is_int); - if (!is_int) - return; - prefs_list.append(pref); - } - casing_preferences = prefs_list; -} - -void AOClient::pktAnnounceCase(AreaData* area, int argc, QStringList argv, AOPacket packet) -{ - QString case_title = argv[0]; - QStringList needed_roles; - QList needs_list; - for (int i = 1; i <=5; i++) { - bool is_int = false; - bool need = argv[i].toInt(&is_int); - if (!is_int) - return; - needs_list.append(need); - } - QStringList roles = {"defense attorney", "prosecutor", "judge", "jurors", "stenographer"}; - for (int i = 0; i < 5; i++) { - if (needs_list[i]) - needed_roles.append(roles[i]); - } - if (needed_roles.isEmpty()) - return; - - QString message = "=== Case Announcement ===\r\n" + (ooc_name == "" ? current_char : ooc_name) + " needs " + needed_roles.join(", ") + " for " + (case_title == "" ? "a case" : case_title) + "!"; - - QList clients_to_alert; - // here lies morton, RIP - QSet needs_set = needs_list.toSet(); - for (AOClient* client : server->clients) { - QSet matches = client->casing_preferences.toSet().intersect(needs_set); - if (!matches.isEmpty() && !clients_to_alert.contains(client)) - clients_to_alert.append(client); - } - - for (AOClient* client : clients_to_alert) { - client->sendPacket(AOPacket("CASEA", {message, argv[1], argv[2], argv[3], argv[4], argv[5], "1"})); - // you may be thinking, "hey wait a minute the network protocol documentation doesn't mention that last argument!" - // if you are in fact thinking that, you are correct! it is not in the documentation! - // however for some inscrutable reason Attorney Online 2 will outright reject a CASEA packet that does not have - // at least 7 arguments despite only using the first 6. Cera, i kneel. you have truly broken me. - } -} - void AOClient::sendEvidenceList(AreaData* area) { for (AOClient* client : server->clients) { @@ -647,13 +594,11 @@ AOPacket AOClient::validateIcPacket(AOPacket packet) } args.append(other_flip); - // immediate text processing - int immediate = incoming_args[18].toInt(); - if (area->force_immediate) - immediate = 1; - if (immediate != 1 && immediate != 0) + // noninterrupting preanim + int ni_pa = incoming_args[18].toInt(); + if (ni_pa != 1 && ni_pa != 0) return invalid; - args.append(QString::number(immediate)); + args.append(QString::number(ni_pa)); } // 2.8 packet extensions @@ -772,4 +717,6 @@ void AOClient::updateJudgeLog(AreaData* area, AOClient* client, QString action) area->judgelog.append(logmessage); } else area->judgelog.append(logmessage); + + } diff --git a/src/server.cpp b/src/server.cpp index 382e5a2..48d2787 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -53,7 +53,9 @@ void Server::start() loadServerConfig(); loadCommandConfig(); - + + maximum_statements = config.value("maximum_statements", 50).toInt(); + proxy = new WSProxy(port, ws_port, this); if(ws_port != -1) proxy->start(); @@ -230,17 +232,9 @@ void Server::loadServerConfig() auth_type = config.value("auth","simple").toString(); modpass = config.value("modpass","").toString(); bool zalgo_tolerance_conversion_success; - zalgo_tolerance = config.value("zalgo_tolerance", "3").toInt(&zalgo_tolerance_conversion_success); - if (!zalgo_tolerance_conversion_success) - zalgo_tolerance = 3; - bool maximum_statements_conversion_success; - maximum_statements = config.value("maximum_statements", "10").toInt(&maximum_statements_conversion_success); - if (!maximum_statements_conversion_success) - maximum_statements = 10; - bool afk_timeout_conversion_success; - afk_timeout = config.value("afk_timeout", "300").toInt(&afk_timeout_conversion_success); - if (!afk_timeout_conversion_success) - afk_timeout = 300; + zalgo_tolerance = config.value("zalgo_tolerance", "3").toInt(&zalgo_tolerance_conversion_success); + if (!zalgo_tolerance_conversion_success) + zalgo_tolerance = 3; config.endGroup(); //Load dice values diff --git a/src/testimony_recorder.cpp b/src/testimony_recorder.cpp index 01178b5..3c6897d 100644 --- a/src/testimony_recorder.cpp +++ b/src/testimony_recorder.cpp @@ -39,7 +39,6 @@ void AOClient::addStatement(QStringList packet) } } else if (area->test_rec == AreaData::TestimonyRecording::ADD) { - packet[14] = "1"; area->testimony.insert(c_statement,packet); area->test_rec = AreaData::TestimonyRecording::PLAYBACK; }