debloated

bin/config_sample/config.ini

@@ -52,9 +52,6 @@ message_floodguard=250
 ; The minimum time between game messages in the server, in miliseconds. Unlike message_floodguard, this timer is shared globally in the server.
 global_message_floodguard=0
 
-; The amount of seconds without interaction till a client is marked as AFK.
-afk_timeout = 300
-
 ; The URL of the server's remote repository, sent to the client during their initial handshake. Used by WebAO users for custom content.
 asset_url=http://attorneyoffline.de/base/
 

bin/config_sample/text/commandhelp.json

@@ -606,13 +606,6 @@
       "usage":"/allowiniswap",
       "text":"Toggles whether iniswaps are allowed in the current area. For no apparent reason, this also can be used to disable it. This command takes no arguments."
    },
-   {
-      "names": [
-         "afk"
-      ],
-      "usage":"/afk",
-      "text":"Toggles whether this client is considered AFK. This command takes no arguments."
-   },
    {
       "names": [
          "savetestimony"

bin_tests/config/config.ini

@@ -49,9 +49,6 @@ message_floodguard=250
 ; The minimum time between game messages in the server, in miliseconds. Unlike message_floodguard, this timer is shared globally in the server.
 global_message_floodguard=0
 
-; The amount of seconds without interaction till a client is marked as AFK.
-afk_timeout = 300
-
 ; The URL of the server's remote repository, sent to the client during their initial handshake. Used by WebAO users for custom content.
 asset_url=http://attorneyoffline.de/base/
 

src/aoclient.cpp

@@ -108,7 +108,6 @@ const QMap<QString, AOClient::CommandInfo> AOClient::COMMANDS{
     {"unshake", {{ACLRole::MUTE}, 1, &AOClient::cmdUnShake}},
     {"force_noint_pres", {{ACLRole::CM}, 0, &AOClient::cmdForceImmediate}},
     {"allow_iniswap", {{ACLRole::CM}, 0, &AOClient::cmdAllowIniswap}},
-    {"afk", {{ACLRole::NONE}, 0, &AOClient::cmdAfk}},
     {"savetestimony", {{ACLRole::NONE}, 1, &AOClient::cmdSaveTestimony}},
     {"loadtestimony", {{ACLRole::CM}, 1, &AOClient::cmdLoadTestimony}},
     {"permitsaving", {{ACLRole::MODCHAT}, 1, &AOClient::cmdPermitSaving}},
@@ -197,16 +196,6 @@ void AOClient::handlePacket(AOPacket *packet)
         return;
     }
 
-    if (packet->getPacketInfo().header != "CH" && m_joined) {
-        if (m_is_afk)
-            sendServerMessage("You are no longer AFK.");
-        m_is_afk = false;
-        if (characterName().endsWith(" [AFK]")) {
-            setCharacterName(characterName().remove(" [AFK]"));
-        }
-        m_afk_timer->start(ConfigManager::afkTimeout() * 1000);
-    }
-
     if (packet->getContent().length() < packet->getPacketInfo().min_args) {
 #ifdef NET_DEBUG
         qDebug() << "Invalid packet args length. Minimum is" << packet->getPacketInfo().min_args << "but only" << packet->getContent().length() << "were given.";
@@ -562,15 +551,6 @@ bool AOClient::isSpectator() const
     return m_is_spectator;
 }
 
-void AOClient::onAfkTimeout()
-{
-    if (!m_is_afk) {
-        sendServerMessage("You are now AFK.");
-        setCharacterName(characterName() + " [AFK]");
-    }
-    m_is_afk = true;
-}
-
 AOClient::AOClient(
     Server *p_server, NetworkSocket *socket, QObject *parent, int user_id, MusicManager *p_manager) :
     QObject(parent),
@@ -585,11 +565,7 @@ AOClient::AOClient(
     m_current_char(""),
     server(p_server),
     is_partial(false)
-{
+{}
-    m_afk_timer = new QTimer;
-    m_afk_timer->setSingleShot(true);
-    connect(m_afk_timer, &QTimer::timeout, this, &AOClient::onAfkTimeout);
-}
 
 AOClient::~AOClient()
 {

src/aoclient.h

@@ -272,12 +272,6 @@ class AOClient : public QObject
      */
     bool m_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 m_is_afk = false;
-
     /**
      * @brief If true, the client will not recieve PM messages.
      */
@@ -293,11 +287,6 @@ class AOClient : public QObject
      */
     bool m_is_charcursed = false;
 
-    /**
-     * @brief Timer for tracking user interaction. Automatically restarted whenever a user interacts (i.e. sends any packet besides CH)
-     */
-    QTimer *m_afk_timer;
-
     /**
      * @brief The list of char IDs a charcursed player is allowed to switch to.
      */
@@ -638,11 +627,6 @@ class AOClient : public QObject
      */
     void sendPacket(QString header);
 
-    /**
-     * @brief A slot for when the client's AFK timer runs out.
-     */
-    void onAfkTimeout();
-
   signals:
     /**
      * @brief This signal is emitted when the client has completed the participation handshake.
@@ -1672,15 +1656,6 @@ class AOClient : public QObject
      */
     void cmdToggleAdverts(int argc, QStringList argv);
 
-    /**
-     * @brief Toggles whether this client is considered AFK.
-     *
-     * @details No arguments.
-     *
-     * @iscommand
-     */
-    void cmdAfk(int argc, QStringList argv);
-
     /**
      * @brief Restricts a target client to a set of characters that they can switch from, blocking them from other characters.
      *

src/commands/messaging.cpp

@@ -380,16 +380,6 @@ void AOClient::cmdToggleAdverts(int argc, QStringList argv)
     sendServerMessage("Advertisements turned " + l_str_en);
 }
 
-void AOClient::cmdAfk(int argc, QStringList argv)
-{
-    Q_UNUSED(argc);
-    Q_UNUSED(argv);
-
-    m_is_afk = true;
-    sendServerMessage("You are now AFK.");
-    setCharacterName(characterName() + " [AFK]");
-}
-
 void AOClient::cmdCharCurse(int argc, QStringList argv)
 {
     bool conv_ok = false;

src/config_manager.cpp

@@ -515,17 +515,6 @@ QString ConfigManager::LogText(QString f_logtype)
     return m_logtext->value("LogConfiguration/" + f_logtype, "").toString();
 }
 
-int ConfigManager::afkTimeout()
-{
-    bool ok;
-    int l_afk = m_settings->value("Options/afk_timeout", 300).toInt(&ok);
-    if (!ok) {
-        qWarning("afk_timeout is not an int!");
-        l_afk = 300;
-    }
-    return l_afk;
-}
-
 void ConfigManager::setAuthType(const DataTypes::AuthType f_auth)
 {
     m_settings->setValue("Options/auth", fromDataType<DataTypes::AuthType>(f_auth).toLower());

src/config_manager.h

@@ -326,13 +326,6 @@ class ConfigManager
      */
     static QString LogText(QString f_logtype);
 
-    /**
-     * @brief Returns the duration before a client is considered AFK.
-     *
-     * @return See short description.
-     */
-    static int afkTimeout();
-
     /**
      * @brief Returns a list of magic 8 ball answers.
      *

tests/unittest_config_manager/tst_unittest_config_manager.cpp

@@ -96,8 +96,6 @@ class tst_ConfigManager : public QObject
 
     void passwordCanContainUsername();
 
-    void afkTimeout();
-
     void magic8BallAnswers();
 
     void praiseList();
@@ -325,10 +323,6 @@ void tst_ConfigManager::passwordCanContainUsername()
 {
 }
 
-void tst_ConfigManager::afkTimeout()
-{
-}
-
 void tst_ConfigManager::magic8BallAnswers()
 {
 }