From eda0a2f69005793c3bf6c6cdb93a944dfb38f4e3 Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Wed, 25 Aug 2021 01:49:44 +0200
Subject: [PATCH] Implement client signals, add deconstructor + initial
 construction test

---
 core/include/aoclient.h      | 43 ++++++++++++++++++++++++++++++++++++
 core/include/server.h        |  6 +++++
 core/src/logger/u_logger.cpp | 15 +++++++++++++
 core/src/server.cpp          |  2 ++
 4 files changed, 66 insertions(+)

diff --git a/core/include/aoclient.h b/core/include/aoclient.h
index 2fb9e98..b7cbfcf 100644
--- a/core/include/aoclient.h
+++ b/core/include/aoclient.h
@@ -2189,6 +2189,49 @@ class AOClient : public QObject {
      * @param message The OOC message the client has sent.
      */
     void loginAttempt(QString message);
+
+  signals:
+
+    /**
+     * @brief Signal connected to universal logger. Sends IC chat usage to the logger.
+     */
+    void logIC(const QString& f_charName, const QString& f_oocName, const QString& f_ipid,
+               const QString& f_areaName, const QString &f_message);
+
+    /**
+     * @brief Signal connected to universal logger. Sends OOC chat usage to the logger.
+     */
+    void logOOC(const QString& f_charName, const QString& f_oocName, const QString& f_ipid,
+                const QString& f_areaName, const QString& f_message);
+
+    /**
+     * @brief Signal connected to universal logger. Sends login attempt to the logger.
+     */
+    void logLogin(const QString& f_charName, const QString& f_oocName, const QString& f_moderatorName,
+                  const QString& f_ipid, const QString &f_areaName, const bool& f_success);
+
+    /**
+     * @brief Signal connected to universal logger. Sends command usage to the logger.
+     */
+    void logCMD(const QString& f_charName, const QString &f_ipid, const QString& f_oocName, const QString f_command,
+                const QStringList f_args, const QString f_areaName);
+
+    /**
+     * @brief Signal connected to universal logger. Sends player kick information to the logger.
+     */
+    void logKick(const QString& f_moderator, const QString& f_targetIPID, const QString& f_targetName, const QString f_targetOOCName);
+
+    /**
+     * @brief Signal connected to universal logger. Sends ban information to the logger.
+     */
+    void logBan(const QString& f_moderator, const QString& f_targetIPID, const QString& f_targetName, const QString f_targetOOCName,
+                const QString &f_duration);
+
+    /**
+     * @brief Signal connected to universal logger. Sends modcall information to the logger, triggering a write of the buffer
+     *        when modcall logging is used.
+     */
+    void logModcall(const QString& f_charName, const QString &f_ipid, const QString& f_oocName, const QString& f_areaName);
 };
 
 #endif // AOCLIENT_H
diff --git a/core/include/server.h b/core/include/server.h
index aefe125..1eab686 100644
--- a/core/include/server.h
+++ b/core/include/server.h
@@ -26,6 +26,7 @@
 #include "include/discord.h"
 #include "include/config_manager.h"
 #include "include/http_advertiser.h"
+#include "include/logger/u_logger.h"
 
 #include <QCoreApplication>
 #include <QDebug>
@@ -305,6 +306,11 @@ class Server : public QObject {
      */
     QTimer* httpAdvertiserTimer;
 
+    /**
+     * @brief Handles the universal log framework.
+     */
+    ULogger* logger;
+
     /**
      * @brief The port through which the server will accept TCP connections.
      */
diff --git a/core/src/logger/u_logger.cpp b/core/src/logger/u_logger.cpp
index 8585853..94648a3 100644
--- a/core/src/logger/u_logger.cpp
+++ b/core/src/logger/u_logger.cpp
@@ -34,6 +34,21 @@ ULogger::ULogger(QObject* parent) :
     }
 }
 
+ULogger::~ULogger()
+{
+    switch (ConfigManager::loggingType()) {
+        case DataTypes::LogType::MODCALL :
+            writerModcall->deleteLater();
+            break;
+        case DataTypes::LogType::FULL :
+            writerFull->deleteLater();
+            break;
+        case DataTypes::LogType::SQL :
+            writerSQL->deleteLater();
+            break;
+    }
+}
+
 void ULogger::logIC(const QString& f_charName, const QString& f_oocName, const QString& f_ipid,
                     const QString& f_areaName, const QString& f_message)
 {
diff --git a/core/src/server.cpp b/core/src/server.cpp
index b933a2b..74adad0 100644
--- a/core/src/server.cpp
+++ b/core/src/server.cpp
@@ -69,6 +69,8 @@ void Server::start()
         httpAdvertiserTimer->start(300000);
     }
 
+    logger = new ULogger(this);
+
     proxy = new WSProxy(port, ws_port, this);
     if(ws_port != -1)
         proxy->start();