Ensure the ChatBoxManager respects the blacklist setting

VolcanicArts · Feb 20, 2024 · bfb8a96 · bfb8a96
1 parent f68528a
commit bfb8a96
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/VRCOSC.Game/App/AppManager.cs b/VRCOSC.Game/App/AppManager.cs
@@ -121,7 +121,7 @@ private void initialiseModuleManager()
 
     private void initialiseChatBoxManager()
     {
-        ChatBoxManager.Initialise(storage, this, OSCClient, configManager.GetBindable<int>(VRCOSCSetting.ChatBoxTimeSpan));
+        ChatBoxManager.Initialise(storage, this, configManager, OSCClient, configManager.GetBindable<int>(VRCOSCSetting.ChatBoxTimeSpan));
         ChatBoxManager.Load();
     }
 

diff --git a/VRCOSC.Game/Managers/ChatBoxManager.cs b/VRCOSC.Game/Managers/ChatBoxManager.cs
@@ -12,6 +12,7 @@
 using VRCOSC.Game.ChatBox;
 using VRCOSC.Game.ChatBox.Clips;
 using VRCOSC.Game.ChatBox.Serialisation.V1;
+using VRCOSC.Game.Config;
 using VRCOSC.Game.OSC.VRChat;
 using VRCOSC.Game.Serialisation;
 using VRCOSC.Game.Util;
@@ -41,6 +42,7 @@ public bool SendEnabled
     public readonly Dictionary<string, Dictionary<string, ClipEventMetadata>> EventMetadata = new();
     public Bindable<int> SendDelay { get; private set; } = null!;
     private VRChatOscClient oscClient = null!;
+    private VRCOSCConfigManager configManager = null!;
     private SerialisationManager serialisationManager = null!;
 
     public readonly Dictionary<(string, string), string?> VariableValues = new();
@@ -61,10 +63,11 @@ public bool SendEnabled
     private DateTimeOffset nextValidTime;
     private bool isClear;
 
-    public void Initialise(Storage storage, AppManager appManager, VRChatOscClient oscClient, Bindable<int> sendDelay)
+    public void Initialise(Storage storage, AppManager appManager, VRCOSCConfigManager configManager, VRChatOscClient oscClient, Bindable<int> sendDelay)
     {
         this.appManager = appManager;
         this.oscClient = oscClient;
+        this.configManager = configManager;
         SendDelay = sendDelay;
         serialisationManager = new SerialisationManager();
         serialisationManager.RegisterSerialiser(1, new TimelineSerialiser(storage, appManager));
@@ -147,15 +150,20 @@ public Clip CreateClip()
 
     public void Update()
     {
-        if (sendAllowed && !CurrentWorldExtractor.IsCurrentWorldBlacklisted)
+        if (!sendAllowed) return;
+
+        if (CurrentWorldExtractor.IsCurrentWorldBlacklisted && configManager.Get<bool>(VRCOSCSetting.ChatboxWorldBlock))
         {
-            appManager.ModuleManager.ChatBoxUpdate();
+            if (!isClear) Clear();
+            return;
+        }
 
-            Clips.ForEach(clip => clip.Update());
-            TriggeredEvents.Clear();
+        appManager.ModuleManager.ChatBoxUpdate();
 
-            evaluateClips();
-        }
+        Clips.ForEach(clip => clip.Update());
+        TriggeredEvents.Clear();
+
+        evaluateClips();
     }
 
     public void Teardown()