this update sucks but I did it omg!! (a programmers worst nightmare)

Cosmental · Oct 9, 2023 · e8da039 · e8da039
1 parent 66e47e6
commit e8da039
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 28 deletions.
diff --git a/src/MainModule/SocialChat/Environments/Server/Components/DataService.lua b/src/MainModule/SocialChat/Environments/Server/Components/DataService.lua
@@ -92,6 +92,8 @@ function DataService:Initialize(Setup : table)
                     else
                         local IsMatch : boolean = (tbl[Key] == tbl2[Key]);
                         if (IsMatch) then continue; end
+                        if (Key == "ControlPanelEnabled") then continue; end
+                        if (Key == "ModernTopbarPlusEnabled") then continue; end
 
                         table.insert(Changes, {
                             ["Path"] = path,

diff --git a/...lusVersions/TopbarPlus/IconController.lua → ...PlusVersions/ModernTBP/IconController.lua b/...lusVersions/TopbarPlus/IconController.lua → ...PlusVersions/ModernTBP/IconController.lua
diff --git a/...le/TopbarPlusVersions/TopbarPlus/Maid.lua → ...ule/TopbarPlusVersions/ModernTBP/Maid.lua b/...le/TopbarPlusVersions/TopbarPlus/Maid.lua → ...ule/TopbarPlusVersions/ModernTBP/Maid.lua
diff --git a/.../TopbarPlusVersions/TopbarPlus/Signal.lua → ...e/TopbarPlusVersions/ModernTBP/Signal.lua b/.../TopbarPlusVersions/TopbarPlus/Signal.lua → ...e/TopbarPlusVersions/ModernTBP/Signal.lua
diff --git a/...lusVersions/TopbarPlus/Themes/Default.lua → ...PlusVersions/ModernTBP/Themes/Default.lua b/...lusVersions/TopbarPlus/Themes/Default.lua → ...PlusVersions/ModernTBP/Themes/Default.lua
diff --git a/...arPlusVersions/TopbarPlus/Themes/init.lua → ...barPlusVersions/ModernTBP/Themes/init.lua b/...arPlusVersions/TopbarPlus/Themes/init.lua → ...barPlusVersions/ModernTBP/Themes/init.lua
diff --git a/...PlusVersions/TopbarPlus/TopbarPlusGui.lua → ...rPlusVersions/ModernTBP/TopbarPlusGui.lua b/...PlusVersions/TopbarPlus/TopbarPlusGui.lua → ...rPlusVersions/ModernTBP/TopbarPlusGui.lua
diff --git a/...rsions/TopbarPlus/TopbarPlusReference.lua → ...ersions/ModernTBP/TopbarPlusReference.lua b/...rsions/TopbarPlus/TopbarPlusReference.lua → ...ersions/ModernTBP/TopbarPlusReference.lua
diff --git a/...TopbarPlusVersions/TopbarPlus/VERSION.lua → .../TopbarPlusVersions/ModernTBP/VERSION.lua b/...TopbarPlusVersions/TopbarPlus/VERSION.lua → .../TopbarPlusVersions/ModernTBP/VERSION.lua
diff --git a/...le/TopbarPlusVersions/TopbarPlus/init.lua → ...ule/TopbarPlusVersions/ModernTBP/init.lua b/...le/TopbarPlusVersions/TopbarPlus/init.lua → ...ule/TopbarPlusVersions/ModernTBP/init.lua
diff --git a/src/MainModule/SocialChat/init.lua b/src/MainModule/SocialChat/init.lua
@@ -14,6 +14,7 @@
 
 --// Services
 local CollectionService = game:GetService("CollectionService");
+local ContentProvider = game:GetService("ContentProvider")
 local IsServer = game:GetService("RunService"):IsServer();
 
 --// Imports
@@ -40,27 +41,6 @@ function GetSocialChat()
         local Server = ((IsServer) and (require(Environments.Server)));
         local Client = ((not IsServer) and (require(Environments.Client)));
 
-        --// Module Collection
-        local Library = {};
-
-        local function AddToLibrary(Container : Folder) : table
-            for _, Module in pairs(Container:GetDescendants()) do
-                if (not Module:IsA("ModuleScript")) then continue; end
-                if (Module.Parent:IsA("ModuleScript")) then continue; end
-
-                local Success, Response = pcall(function()
-                    return require(Module);
-                end);
-
-                if (Success) then
-                    Library[Module.Name] = Response
-                end
-            end
-        end
-
-        AddToLibrary((IsServer and Resources.Server) or Resources.Client);
-        AddToLibrary(Resources.Shared);
-
         --// Configurations
         local Configurations = {};
 
@@ -92,15 +72,61 @@ function GetSocialChat()
             AddToConfiguration(game.ReplicatedStorage:WaitForChild("ChatSettings"):WaitForChild("Client"), "Client");
         else
             AddToConfiguration(game.ReplicatedStorage:WaitForChild("ChatSettings"):WaitForChild("Client"));
+        end
+
+        AddToConfiguration(game.ReplicatedStorage.ChatSettings:WaitForChild("Shared"));
+
+        --// Module Collection
+        local Library = {};
+
+        local function AddToLibrary(Container : Folder) : table
+            for _, Module in pairs(Container:GetDescendants()) do
+                if (not Module:IsA("ModuleScript")) then continue; end
+                if (Module.Parent:IsA("ModuleScript")) then continue; end
+
+                --[[
+                    TopbarPlus UI Config Controller
+                        >> Yes this is very inefficient but its the only method I could think of for this scenario
+                ]]--
+
+                local DoesUseModernTBP : boolean? = Configurations.Channels.ModernTopbarPlusEnabled
+
+                if (not DoesUseModernTBP and Module.Name == "ModernTBP") then
+                    Module.Parent.LegacyTBP.Name = "TopbarPlus"
+
+                    if (Library.LegacyTBP) then
+                        Library.TopbarPlus = Library.LegacyTBP
+                        Library.LegacyTBP = nil
+                    end
+
+                    continue;
+                elseif (DoesUseModernTBP and Module.Name == "LegacyTBP") then
+                    Module.Parent.ModernTBP.Name = "TopbarPlus"
+
+                    if (Library.ModernTBP) then
+                        Library.TopbarPlus = Library.ModernTBP
+                        Library.ModernTBP = nil
+                    end
+
+                    continue;
+                end
 
-            --// TopbarPlus Configuration
-            local DoesUseModernTBP : boolean? = Configurations.Channels.ModernTopbarPlusEnabled
+                --// Requiring Protocol
+                local Success, Response = pcall(function()
+                    return require(Module);
+                end);
 
-            if (not DoesUseModernTBP) then
-                Library.TopbarPlus = Library.LegacyTBP
-                Library.LegacyTBP = nil
+                if (Success) then
+                    Library[Module.Name] = Response
+                end
             end
+        end
+
+        AddToLibrary((IsServer and Resources.Server) or Resources.Client);
+        AddToLibrary(Resources.Shared);
 
+        --// TopbarPlus Configuration
+        if (not IsServer) then
             if (Library.TopbarPlus) then
                 local VoiceChatConfiguration : BoolValue? = game.ReplicatedStorage.ChatSettings.Client:WaitForChild("IsVoiceChatEnabled", 3);
                 local VoiceChatEnabled = ((VoiceChatConfiguration and VoiceChatConfiguration.Value) or true); -- true by default
@@ -111,8 +137,6 @@ function GetSocialChat()
             end
         end
 
-        AddToConfiguration(game.ReplicatedStorage.ChatSettings:WaitForChild("Shared"));
-
         --// Initialization
         if (IsServer) then
             local Remotes = script.Remotes