From 6eb6cdbd49d8d3ede359ab52b8cea50a2be42f9d Mon Sep 17 00:00:00 2001
From: bel <bel@bel.bel>
Date: Sun, 2 Apr 2023 12:54:24 -0600
Subject: [PATCH] autostart discord with custom HOME and dont unset
 secret_sinks unless $PACTL_RESET=true

---
 config.d/mayhem-party.d/v01-live.yaml | 34 +++++++++++++--------------
 server.sh                             | 21 ++++++++++++-----
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/config.d/mayhem-party.d/v01-live.yaml b/config.d/mayhem-party.d/v01-live.yaml
index 7778f6d..f846167 100644
--- a/config.d/mayhem-party.d/v01-live.yaml
+++ b/config.d/mayhem-party.d/v01-live.yaml
@@ -4,10 +4,10 @@ feedback:
 users:
   bel:
     meta:
-      lasttsms: 1680460463732
-      lastlag: 104
+      lasttsms: 1680371007738
+      lastlag: 0
     state:
-      player: 0
+      player: 1
       message: ""
       gm:
         alias: ""
@@ -18,25 +18,25 @@ users:
       lasttsms: 1679978514018
       lastlag: 0
     state:
-      player: 1
+      player: 0
       message: ""
       gm:
         alias: ""
-        lastalias: mario
+        lastalias: ""
         vote: ""
 players:
 - transformation:
-    "1": "6"
-    "2": "7"
-    "3": "8"
-    "4": "9"
-    "5": "0"
-    a: f
-    d: h
-    e: "y"
-    q: r
-    s: g
-    w: t
+    "1": "6" # a
+    "2": "7" # b
+    "3": "8" # x
+    "4": "9" # y
+    "5": "0" # start
+    a: f # stickLeft
+    d: h # stickRight
+    e: "y" # r
+    q: r # l
+    s: g # stickDown
+    w: t # stickUp
 quiet: false
 broadcast:
-  message: zach is now player 1
+  message: ""
diff --git a/server.sh b/server.sh
index 6c889d3..5c2aa4a 100644
--- a/server.sh
+++ b/server.sh
@@ -36,9 +36,16 @@ log() {
 }
 
 _discord() {
-   echo
-   read -p "pls start discord"
-   echo
+   (
+      export HOME="$PWD/mnt.d/discord.d"
+      if ! snap list discord; then
+         sudo snap install discord
+      fi
+      (
+         snap run discord
+      ) &> /tmp/mayhem-party.discord.log &
+      disown
+   )
 }
 
 _dolphin() {
@@ -98,9 +105,11 @@ _stt() {
          ) | sudo tee /etc/asound.conf
       fi
 
-      for i in $(pactl list short modules | grep secret | cut -f1); do
-         pactl unload-module $i
-      done
+      if [ -n "$PACTL_RESET" ]; then
+         for i in $(pactl list short modules | grep secret | cut -f1); do
+            pactl unload-module $i
+         done
+      fi
       name='my_secret_sink'
       for i in 1 2; do
          if ! pactl list | grep -q $name$i; then