IRCLib V1

.gitmodules

@@ -25,3 +25,6 @@
 [submodule "external/IRCClient"]
 	path = external/IRCClient
 	url = https://github.com/nullworks/IRCClient
+[submodule "external/chirc"]
+	path = external/chirc
+	url = https://gitlab.com/TotallyNotElite/chirc.git

external/CMakeLists.txt

@@ -5,4 +5,4 @@ target_include_directories(cathook PRIVATE "${CMAKE_CURRENT_LIST_DIR}/MicroPathe
 target_include_directories(cathook PRIVATE "${CMAKE_CURRENT_LIST_DIR}/ucccccp")
 target_include_directories(cathook PRIVATE "${CMAKE_CURRENT_LIST_DIR}/TF2_NavFile_Reader")
 
-add_subdirectory(IRCClient)
+add_subdirectory(chirc)

external/chirc

@@ -0,0 +1 @@
+Subproject commit 7799d931b9c555a54b61025df6cb25f602bd3f39

include/irc.hpp

@@ -3,5 +3,5 @@
 namespace IRC
 {
 bool sendmsg(std::string &msg, bool loopback = false);
-void auth(bool reply = false);
+//void auth(bool reply = false);
 } // namespace IRC

src/hooks/CreateMove.cpp

@@ -259,7 +259,7 @@ DEFINE_HOOKED_METHOD(CreateMove, bool, void *this_, float input_sample_time,
         DelayTimer.update();
         hacks::tf2::NavBot::Init();
         hacks::tf2::NavBot::initonce();
-        IRC::auth();
+        //IRC::auth();
         firstcm = false;
     }
     g_Settings.bInvalid = false;

src/irc.cpp

@@ -2,328 +2,59 @@
 #include <thread>
 #include "IRCClient.h"
 #include <atomic>
-#include "boost/random.hpp"
-#include "boost/generator_iterator.hpp"
 #include "irc.hpp"
 #include "ucccccp.hpp"
 #include "Settings.hpp"
+#include "ChIRC.hpp"
+#include <random>
 
 namespace IRC
 {
-static std::atomic<bool> thread_shouldrun;
-static std::atomic<bool> thread_running;
 static settings::Bool enabled("irc.enabled", "true");
 static settings::Bool anon("irc.anon", "true");
 static settings::Bool authenticate("irc.auth", "true");
-// To prevent possible crashes when IRC shuts down while sending msg
+static settings::String channel("irc.channel", "#cat_comms");
-static std::mutex IRCConnection_mutex;
+static settings::String address("irc.address", "cathook.irc.inkcat.net");
-bool shouldauth;
+static settings::Int port("irc.port", "8080");
 
-struct IRCData
+static ChIRC::ChIRC irc;
+void updateData(std::string commandandcontrol)
 {
-    std::string address                      = "cathook.irc.inkcat.net";
+    std::string nick = g_ISteamFriends->GetPersonaName();   
-    int port                                 = 8080;
+    irc.UpdateData(nick, nick, *channel, commandandcontrol, *address, *port);
-    std::string channel                      = "#cat_comms";
-    std::string username                     = "You";
-    std::string nickname                     = "You";
-    std::unique_ptr<IRCClient> IRCConnection = nullptr;
-};
-
-static IRCData IRCData;
-
-void printmsg(std::string &usr, std::string &msg)
-{
-    if (msg.size() > 256 || usr.size() > 256)
-    {
-        logging::Info("IRC: Message too large.");
-        return;
-    }
-    if (g_Settings.bInvalid)
-        logging::Info("[IRC] %s: %s", usr.c_str(), msg.c_str());
-    else
-        PrintChat("\x07%06X[IRC] %s\x01: %s", 0xe05938, usr.c_str(),
-                  msg.c_str());
 }
-void printmsgcopy(std::string usr, std::string msg)
+static HookedFunction paint(HookedFunctions_types::HF_Paint, "IRC", 16,
+                            []() { irc.Update(); });
+
+template<typename T>
+void rvarCallback(settings::VariableBase<T> &var, T after)
 {
-    if (msg.size() > 256 || usr.size() > 256)
+    irc.Disconnect();
-    {
+    updateData("");
-        logging::Info("IRC: Message too large.");
+    if (enabled)
-        return;
+        irc.Connect();
-    }
-    if (g_Settings.bInvalid)
-        logging::Info("[IRC] %s: %s", usr.c_str(), msg.c_str());
-    else
-        PrintChat("\x07%06X[IRC] %s\x01: %s", 0xe05938, usr.c_str(),
-                  msg.c_str());
 }
 
-void handleMessage(IRCMessage message, IRCClient *client)
+void rvarCallback_enabled(settings::VariableBase<bool> &var, bool after)
 {
-    std::string &cmd     = message.command;
+    irc.Disconnect();
-    std::string &channel = message.parameters.at(0);
+    if (after)
-    std::string &rawmsg  = message.parameters.at(1);
+        irc.Connect();
-    std::string &usr     = message.prefix.nick;
-
-    if (!ucccccp::validate(rawmsg))
-        return;
-    std::string msg(ucccccp::decrypt(rawmsg));
-    if (msg == "Attempt at ucccccping and failing" ||
-        msg == "Unsupported version")
-        return;
-
-    // Handle privmsg (Message to #channel)
-    if (cmd == "PRIVMSG")
-    {
-        if (msg.empty() || usr.empty())
-            return;
-        // Handle messages
-        if (msg.find("msg") == 0)
-        {
-            std::string toprint = msg.substr(3);
-            if (toprint.empty())
-                return;
-            printmsg(usr, toprint);
-            return;
-        }
-
-        // Handle auth requests
-        if (msg.find("auth") == 0)
-        {
-            // Check if we are in a game
-            if (g_Settings.bInvalid)
-                return;
-            bool isreply = false;
-            std::string steamidhash;
-            if (msg.find("authrep") == 0)
-                isreply = true;
-            // Get steamid hash from string
-            if (isreply)
-                steamidhash = msg.substr(7);
-            else
-                steamidhash = msg.substr(4);
-
-            for (int i = 0; i < g_IEngine->GetMaxClients(); i++)
-            {
-                if (i == g_pLocalPlayer->entity_idx)
-                    continue;
-                player_info_s pinfo;
-                // Get playerinfo and check if player on server
-                if (!g_IEngine->GetPlayerInfo(i, &pinfo))
-                    continue;
-                auto tarsteamid = pinfo.friendsID;
-                MD5Value_t result;
-                // Hash steamid
-                MD5_ProcessSingleBuffer(&tarsteamid, sizeof(tarsteamid),
-                                        result);
-                // Get bits of hash and store in string
-                std::string tarhash;
-                for (auto i : result.bits)
-                {
-                    for (int j = 0; j < 8; j++)
-                        tarhash.append(std::to_string((i >> j) & 1));
-                }
-                // Check if steamid of sender == steamid we currently check
-                // (using hashes)
-                if (tarhash == steamidhash)
-                {
-                    // Use actual steamid to set cat status
-                    auto &playerlistdata = playerlist::AccessData(tarsteamid);
-                    if (playerlistdata.state == playerlist::k_EState::DEFAULT)
-                    {
-                        playerlistdata.state = playerlist::k_EState::CAT;
-                    }
-                    // Avoid replying to a reply
-                    if (isreply)
-                        // We are done here. Steamid duplicates don't exist.
-                        return;
-                    // If message is not a reply, reply.
-                    auth(true);
-                    // We are done here. Steamid duplicates don't exist.
-                    return;
-                }
-            }
-        }
-    }
-}
-
-int randomint()
-{
-    boost::mt19937 rng{ static_cast<std::uint32_t>(std::time(nullptr)) };
-    boost::uniform_int<> oneto10000(1, 10000);
-    boost::variate_generator<boost::mt19937, boost::uniform_int<> > dice(
-        rng, oneto10000);
-    return dice();
-}
-
-void IRCThread()
-{
-    if (!*anon)
-    {
-        IRCData.username = g_ISteamFriends->GetPersonaName();
-        IRCData.nickname = g_ISteamFriends->GetPersonaName();
-        IRCData.nickname.append(format("-", randomint()));
-    }
-    else
-    {
-        IRCData.username = "Anon";
-        IRCData.nickname = "Anon";
-        IRCData.nickname.append(format("-", randomint()));
-    }
-    std::replace(IRCData.nickname.begin(), IRCData.nickname.end(), ' ', '_');
-    std::replace(IRCData.username.begin(), IRCData.username.end(), ' ', '_');
-
-    IRCConnection_mutex.lock();
-    IRCData.IRCConnection = std::make_unique<IRCClient>();
-    IRCClient &client     = *IRCData.IRCConnection;
-    client.HookIRCCommand("PRIVMSG", handleMessage);
-
-    logging::Info("IRC: Initializing IRC");
-    if (client.InitSocket())
-    {
-        logging::Info("IRC: Socket Initialized. Connecting to cathook IRC...");
-        if (client.Connect(IRCData.address.c_str(), IRCData.port))
-        {
-            logging::Info("IRC: Connected. Logging in...");
-            if (client.Login(IRCData.nickname, IRCData.username))
-            {
-                logging::Info("IRC: Logged in. Joining channel.");
-                std::thread joinChannel([=]() {
-                    std::this_thread::sleep_for(
-                        std::chrono_literals::operator""s(3));
-                    if (IRCData.IRCConnection &&
-                        IRCData.IRCConnection->Connected())
-                        IRCData.IRCConnection->SendIRC(
-                            format("JOIN ", IRCData.channel));
-                    logging::Info("IRC: Init complete.");
-                });
-                joinChannel.detach();
-                IRCConnection_mutex.unlock();
-                while (client.Connected() && thread_shouldrun.load())
-                    client.ReceiveData();
-            }
-            else
-                IRCConnection_mutex.unlock();
-        }
-        else
-            IRCConnection_mutex.unlock();
-    }
-    else
-        IRCConnection_mutex.unlock();
-    logging::Info("Exiting IRC thread...");
-    // Lock mutex twice twice tf
-    IRCConnection_mutex.lock();
-    IRCData.IRCConnection->SendIRC("QUIT");
-    IRCData.IRCConnection->Disconnect();
-    IRCData.IRCConnection.reset();
-    thread_running.store(false);
-    IRCConnection_mutex.unlock();
-}
-
-static Timer IRCRetry{};
-
-static HookedFunction pt(HF_Paint, "IRC", 16, []() {
-    if (!*enabled)
-    {
-        thread_shouldrun.store(false);
-        return;
-    }
-    if (!thread_running.load() && IRCRetry.test_and_set(10000))
-    {
-        thread_shouldrun.store(true);
-        thread_running.store(true);
-        std::thread ircthread(IRCThread);
-        ircthread.detach();
-        logging::Info("IRC: Running.");
-    }
-});
-
-bool sendraw(std::string &msg)
-{
-    std::lock_guard<std::mutex> lock(IRCConnection_mutex);
-    if (IRCData.IRCConnection && IRCData.IRCConnection->Connected())
-    {
-        if (IRCData.IRCConnection->SendIRC(format(
-                "PRIVMSG ", IRCData.channel, " :", ucccccp::encrypt(msg, 'B'))))
-            return true;
-    }
-    return false;
-}
-
-bool sendmsg(std::string &msg, bool loopback)
-{
-    std::string raw = "msg" + msg;
-    if (sendraw(raw))
-    {
-        if (loopback)
-        {
-            printmsg(IRCData.nickname, msg);
-        }
-        return true;
-    }
-    if (loopback)
-        printmsgcopy("Cathook", "Error! Couldn't send message.");
-    return false;
-}
-
-void auth(bool reply)
-{
-    if (g_Settings.bInvalid && !g_Settings.is_create_move)
-        return;
-    if (!*authenticate)
-        return;
-    MD5Value_t result;
-    MD5_ProcessSingleBuffer(&LOCAL_E->player_info.friendsID, sizeof(uint32),
-                            result);
-    std::string msg = "auth";
-    if (reply)
-        msg.append("rep");
-    for (auto i : result.bits)
-    {
-        for (int j = 0; j < 8; j++)
-            msg.append(std::to_string((i >> j) & 1));
-    }
-    sendraw(msg);
-}
-
-static CatCommand irc_send_cmd("irc_send_cmd", "Send cmd to IRC",
-                               [](const CCommand &args) {
-                                   IRCData.IRCConnection->SendIRC(args.ArgS());
-                               });
-
-static CatCommand irc_send("irc_send", "Send message to IRC",
-                           [](const CCommand &args) {
-                               std::string msg(args.ArgS());
-                               sendmsg(msg, true);
-                           });
-
-static CatCommand irc_auth("irc_auth",
-                           "Auth via IRC (Find users on same server)",
-                           [](const CCommand &args) { auth(); });
-static CatCommand irc_disconnect(
-    "irc_disconnect",
-    "Disconnect from IRC (Warning you might automatically reconnect)",
-    [](const CCommand &args) {
-        std::lock_guard<std::mutex> lock(IRCConnection_mutex);
-        if (IRCData.IRCConnection)
-        {
-            // IRCData.IRCConnection->SendIRC("QUIT");
-            IRCData.IRCConnection->Disconnect();
-        }
-    });
-
-void rvarCallback(settings::VariableBase<bool> &var, bool after)
-{
-    std::lock_guard<std::mutex> lock(IRCConnection_mutex);
-    if (IRCData.IRCConnection)
-    {
-        IRCData.IRCConnection->SendIRC("QUIT");
-        IRCData.IRCConnection->Disconnect();
-    }
 }
 
 static InitRoutine init([]() {
-    enabled.installChangeCallback(rvarCallback);
+    updateData("");
-    anon.installChangeCallback(rvarCallback);
+    enabled.installChangeCallback(rvarCallback_enabled);
+    anon.installChangeCallback(rvarCallback<bool>);
+    authenticate.installChangeCallback(rvarCallback<bool>);
+    channel.installChangeCallback(rvarCallback<std::string>);
+    address.installChangeCallback(rvarCallback<std::string>);
+    port.installChangeCallback(rvarCallback<int>);
+
+    irc.Connect();
 });
+
+static CatCommand send("irc_send", "Send message to IRC",
+                       [](const CCommand &args) { irc.privmsg(args.ArgS()); });
+
 } // namespace IRC