From 6704af25e3ab6e0576847263b9c47f206e89d4ab Mon Sep 17 00:00:00 2001
From: M'Dic <joshua.lee.betts@gmail.com>
Date: Fri, 20 Oct 2023 13:29:49 -0400
Subject: [PATCH] chore (lfg-solo): clean up

Reduce script diff from master. LFG Solo was literally 90% core edit with a on off bool in a custom script folder. It made no sense. Time to revisit the idea of a cleanup
Remove Lgf_Solo.cpp from custom script folder
Remove announcement on login and in conf
Move  SoloLFG.Enable bool to the exsisting LFGPlayerScript::OnLogin.
---
 src/server/game/DungeonFinding/LFGScripts.cpp |  9 ++++
 src/server/scripts/Custom/Lfg_Solo.cpp        | 53 -------------------
 .../scripts/Custom/custom_script_loader.cpp   |  2 -
 src/server/worldserver/worldserver.conf.dist  |  7 ---
 4 files changed, 9 insertions(+), 62 deletions(-)
 delete mode 100644 src/server/scripts/Custom/Lfg_Solo.cpp

diff --git a/src/server/game/DungeonFinding/LFGScripts.cpp b/src/server/game/DungeonFinding/LFGScripts.cpp
index c01dbc967c3..96b1375994e 100644
--- a/src/server/game/DungeonFinding/LFGScripts.cpp
+++ b/src/server/game/DungeonFinding/LFGScripts.cpp
@@ -21,6 +21,7 @@
 
 #include "LFGScripts.h"
 #include "Common.h"
+#include "Config.h"
 #include "Group.h"
 #include "LFGMgr.h"
 #include "Log.h"
@@ -52,6 +53,14 @@ void LFGPlayerScript::OnLogout(Player* player)
 
 void LFGPlayerScript::OnLogin(Player* player, bool /*loginFirst*/)
 {
+    if (sConfigMgr->GetIntDefault("SoloLFG.Enable", true))
+    {
+        if (!sLFGMgr->IsSoloLFG())
+        {
+            sLFGMgr->ToggleSoloLFG();
+        }
+    }
+
     if (!sLFGMgr->isOptionEnabled(LFG_OPTION_ENABLE_DUNGEON_FINDER | LFG_OPTION_ENABLE_RAID_BROWSER))
         return;
 
diff --git a/src/server/scripts/Custom/Lfg_Solo.cpp b/src/server/scripts/Custom/Lfg_Solo.cpp
deleted file mode 100644
index f5eaad04443..00000000000
--- a/src/server/scripts/Custom/Lfg_Solo.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-** Made by Traesh https://github.com/Traesh
-** Conan513 https://github.com/conan513
-** Made into a module by Micrah https://github.com/milestorme/
-** Converted to TrinityCore by LEO33 http://leo33.info
-** Updated by qyh214 https://github.com/qyh214
-*/
-
-#include "ScriptMgr.h"
-#include "Player.h"
-#include "Configuration/Config.h"
-#include "World.h"
-#include "LFGMgr.h"
-#include "Chat.h"
-#include "Opcodes.h"
-
-class lfg_solo_announce : public PlayerScript
-{
-public:
-    lfg_solo_announce() : PlayerScript("lfg_solo_announce") {}
-
-    void OnLogin(Player* player, bool /*firstLogin*/) override
-    {
-        // Announce Module
-        if (sConfigMgr->GetBoolDefault("SoloLFG.Announce", true))
-        {
-            ChatHandler(player->GetSession()).SendSysMessage("This server is running |cff4CFF00Solo Dungeon Finder|r.");
-         }
-    }
-};
-
-class lfg_solo : public PlayerScript
-{
-public:
-    lfg_solo() : PlayerScript("lfg_solo") { }
-
-   void OnLogin(Player* /*player*/, bool /*firstLogin*/) override
-   {
-      if (sConfigMgr->GetIntDefault("SoloLFG.Enable", true))
-        {
-            if (!sLFGMgr->IsSoloLFG())
-            {
-            sLFGMgr->ToggleSoloLFG();
-            }
-        }
-   }
-};
-
-void AddLfgSoloScripts()
-{
-    new lfg_solo_announce();
-    new lfg_solo();
-}
diff --git a/src/server/scripts/Custom/custom_script_loader.cpp b/src/server/scripts/Custom/custom_script_loader.cpp
index fb466c3cfb3..9e5e9ba2bfd 100644
--- a/src/server/scripts/Custom/custom_script_loader.cpp
+++ b/src/server/scripts/Custom/custom_script_loader.cpp
@@ -16,11 +16,9 @@
  */
 
 // This is where scripts' loading functions should be declared:
-void AddLfgSoloScripts();
 
 // The name of this function should match:
 // void Add${NameOfDirectory}Scripts()
 void AddCustomScripts()
 {
-    AddLfgSoloScripts();
 }
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index 710d0d13235..26e201eb9f8 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -4159,12 +4159,5 @@ Metric.OverallStatusInterval = 1
 
 SoloLFG.Enable = 1
 
-#    SoloLFG.Announce
-#        Description: Announce the module.
-#        Default:     1  - (Enabled)
-#                     0  - (Disabled)
-
-SoloLFG.Announce = 1
-
 #
 ###################################################################################################