1 files changed, 23 insertions, 27 deletions
diff --git a/src/wasp-obs.el b/src/wasp-obs.el
index 4737bc5c..921f497e 100644
--- a/src/wasp-obs.el
+++ b/src/wasp-obs.el
@@ -9,50 +9,54 @@
 (require 'wasp-bus)
 (require 'wasp-model)
 
+(defun w/obs-toggle (scene source)
+  "Toggle SOURCE in SCENE."
+  (w/pub '(monitor obs toggle) (list (w/encode-string scene) (w/encode-string source))))
+
 (defun w/obs-toggle-modclonk ()
   "Toggle the MODCLONK panel."
-  (w/pub '(monitor obs toggle) (list "MODCLONK" "MODCLONK Chibi")))
+  (w/obs-toggle "MODCLONK" "MODCLONK Chibi"))
 
 (defun w/obs-toggle-live-reaction ()
   "Toggle the Live LCOLONQ Reaction panel."
-  (w/pub '(monitor obs toggle) (list "Live LCOLONQ Reaction" "Live Reaction")))
+  (w/obs-toggle "Live LCOLONQ Reaction" "Live Reaction"))
 
 (defun w/obs-toggle-live-friend-reaction ()
   "Toggle the Live Friend Reaction panel."
-  (w/pub '(monitor obs toggle) (list "Live Friend Reaction" "Live Friend Reaction Group")))
+  (w/obs-toggle "Live Friend Reaction" "Live Friend Reaction Group"))
 
 (defun w/obs-toggle-thug-life ()
   "Toggle the Thug Life overlay."
-  (w/pub '(monitor obs toggle) (list "Thug Life" "Thug Life Video")))
+  (w/obs-toggle "Thug Life" "Thug Life Video"))
 
 (defun w/obs-toggle-intj-stare ()
   "Toggle the INTJ Stare overlay."
-  (w/pub '(monitor obs toggle) (list "INTJ" "INTJ Image")))
+  (w/obs-toggle "INTJ" "INTJ Image"))
 
 (defun w/obs-toggle-critical-hit ()
   "Toggle the Critical Hit overlay."
-  (w/pub '(monitor obs toggle) (list "Critical Hit Wrapper" "Critical Hit")))
+  (w/obs-toggle "Critical Hit Wrapper" "Critical Hit"))
 
 (defun w/obs-toggle-vhs ()
   "Toggle the VHS overlay."
-  (w/pub '(monitor obs toggle) (list "VHS" "VHS Group")))
+  (w/obs-toggle "VHS" "VHS Group"))
 
 (defun w/obs-toggle-saiyan ()
   "Toggle the Super Saiyan overlay."
-  (w/pub '(monitor obs toggle) (list "Saiyan" "Saiyan Video")))
+  (w/obs-toggle "Saiyan" "Saiyan Video"))
 
 (defun w/obs-toggle-persona4 ()
   "Toggle the Persona 4 dialogue box."
-  (w/pub '(monitor obs toggle) (list "Persona 4" "Persona 4 Background")))
+  (w/obs-toggle "Persona 4" "Persona 4 Background"))
 
 (defun w/obs-toggle-explosion ()
   "Toggle the explosion effect."
-  (w/pub '(monitor obs toggle) (list "Explosion" "Explosion Video")))
+  (w/obs-toggle "Explosion" "Explosion Video"))
 
 (defun w/obs-toggle-total-clarity ()
   "Toggle the total clarity effect."
-  (w/pub '(monitor obs toggle) (list "Total Clarity" "Total Clarity Video"))
-  (w/pub '(monitor obs toggle) (list "Main" "Mic")))
+  (w/obs-toggle "Total Clarity" "Total Clarity Video")
+  (w/obs-toggle "Main" "Mic"))
 
 (defun w/obs-toggle-activate-nixos ()
   "Toggle the explosion effect."
@@ -60,39 +64,31 @@
 
 (defun w/obs-set-clickbait-text (msg)
   "Change the clickbait text to MSG."
-  (w/pub '(monitor obs set-text) (list "Red Arrow Text" (w/encode-string (s-trim msg)))))
+  (w/pub '(monitor obs set-text)
+    (list (w/encode-string "Red Arrow Text") (w/encode-string (s-trim msg)))))
 
 (defun w/obs-toggle-clickbait (&optional msg)
   "Toggle the clickbait arrow.
 Optionally, change text to MSG."
   (when msg
     (w/obs-set-clickbait-text msg))
-  (w/pub '(monitor obs toggle) (list "Red Arrow" "Red Arrow Group")))
+  (w/obs-toggle "Red Arrow" "Red Arrow Group"))
 
 (defun w/obs-toggle-chase-dreams ()
   "Toggle the Chasing Dreams effect."
-  (w/pub '(monitor obs toggle) (list "Chasing Dreams" "Dreams")))
+  (w/obs-toggle "Chasing Dreams" "Dreams"))
 
 (defun w/obs-toggle-brazil ()
   "Toggle the Brazilian flag."
-  (w/pub '(monitor obs toggle) (list "Main" "Brazil")))
+  (w/obs-toggle "Main" "Brazil"))
 
 (defun w/obs-toggle-japan ()
   "Toggle the Japanese flag."
-  (w/pub '(monitor obs toggle) (list "Main" "Japan")))
-
-(defun w/obs-set-debate-topic-text (msg)
-  "Change the debate topic text to MSG."
-  (w/pub '(monitor obs set-text) (list "Debate Topic" (w/encode-string (s-trim msg)))))
-
-(defun w/obs-toggle-debate-topic ()
-  "Toggle the debate topic."
-  (w/pub '(monitor obs toggle) (list "Main" "Debate Topic")))
+  (w/obs-toggle "Main" "Japan"))
 
 (defun w/obs-toggle-spatiotemporal-clarity ()
   "Toggle the shader clarity effect."
-  (w/model-toggle "shaderclarity")
-  (w/pub '(monitor obs toggle) (list "Main" "Mic")))
+  (w/binary-pub "overlay toggle" "shaderclarity"))
 
 (w/defstruct
  w/obs-toggle