Merge pull request #87 from spdermn02/patch-3

Patch 3 - Audio Device Change Event & Mute/Deafen State Fix
spdermn02 · Aug 14, 2024 · f013d97 · f013d97
2 parents 8a0cfb2 + 98c0446
commit f013d97
Show file tree

Hide file tree

Showing 7 changed files with 95 additions and 52 deletions.
diff --git a/base/buildentry.js b/base/buildentry.js
@@ -115,7 +115,7 @@ const combineInfo = (TP_PLUGIN_INFO, TP_PLUGIN_SETTINGS, categoriesArray) => {
 
 // Write the JSON object to a file
 const writeToFile = (jsonString) => {
-    fs.writeFile('tppentry.tp', jsonString, (err) => {
+    fs.writeFile('./base/entry.tp', jsonString, (err) => {
         if (err) {
             console.error(err);
             return;

diff --git a/base/entry.js b/base/entry.js
@@ -477,6 +477,17 @@ Object.assign(states, {
             "Connected",
             "Disconnected"
         ]
+    },
+    "24":{
+        id: "discord_default_audio_device_change_eventState",
+        category: "Discord",
+        type: "choice",
+        desc: "Discord Default Audio Device Change Event",
+        default: "",
+        valueChoices:[
+            "Input",
+            "Output"
+        ]  
     }
 })
 
@@ -1009,7 +1020,7 @@ Object.assign(connectors, {
 Object.assign(events, {
     "1":{
     id: "discord_newDM",
-    category: "Direct Message",
+    category: "Discord",
     name: "Discord: New Direct Message (DM)",
     format: "When receiving a new Direct Message $val",
     type: "communicate",
@@ -1022,7 +1033,7 @@ Object.assign(events, {
   },
   "2": {
     id: "discord_newMention",
-    category: "Direct Message",
+    category: "Discord",
     name: "Discord | New Mention",
     format: "When receiving a new Mention $val",
     type: "communicate",
@@ -1032,7 +1043,21 @@ Object.assign(events, {
     ],
     valueType: "choice",
     valueStateId: "discord_newMention_eventState"
+},
+    "3":{
+        id: "discord_default_audio_device_change",
+        category: "Discord",
+        name: "Discord: Default Audio Device Changed",
+        format: "When Default $val Device Changed",
+        type: "communicate",
+        valueChoices: [
+            "Input",
+            "Output"
+        ],
+        valueType: "choice",
+        valueStateId: "discord_default_audio_device_change_eventState"
     }
+
 })
 
 

diff --git a/base/entry.tp b/base/entry.tp
@@ -553,7 +553,44 @@
                     ]
                 }
             ],
-            "events": [],
+            "events": [
+                {
+                    "id": "discord_newDM",
+                    "name": "Discord: New Direct Message (DM)",
+                    "format": "When receiving a new Direct Message $val",
+                    "type": "communicate",
+                    "valueChoices": [
+                        "True",
+                        "False"
+                    ],
+                    "valueType": "choice",
+                    "valueStateId": "discord_newDM_eventState"
+                },
+                {
+                    "id": "discord_newMention",
+                    "name": "Discord | New Mention",
+                    "format": "When receiving a new Mention $val",
+                    "type": "communicate",
+                    "valueChoices": [
+                        "True",
+                        "False"
+                    ],
+                    "valueType": "choice",
+                    "valueStateId": "discord_newMention_eventState"
+                },
+                {
+                    "id": "discord_default_audio_device_change",
+                    "name": "Discord: Default Audio Device Changed",
+                    "format": "When Default $val Device Changed",
+                    "type": "communicate",
+                    "valueChoices": [
+                        "Input",
+                        "Output"
+                    ],
+                    "valueType": "choice",
+                    "valueStateId": "discord_default_audio_device_change_eventState"
+                }
+            ],
             "states": [
                 {
                     "id": "discord_inputDevice",
@@ -639,6 +676,16 @@
                         "Connected",
                         "Disconnected"
                     ]
+                },
+                {
+                    "id": "discord_default_audio_device_change_eventState",
+                    "type": "choice",
+                    "desc": "Discord Default Audio Device Change Event",
+                    "default": "",
+                    "valueChoices": [
+                        "Input",
+                        "Output"
+                    ]
                 }
             ]
         },
@@ -650,16 +697,6 @@
             "actions": [],
             "events": [],
             "states": [
-                {
-                    "id": "discord_voice_channel_connected",
-                    "type": "choice",
-                    "desc": "Discord Voice Channel Connected",
-                    "default": "No",
-                    "valueChoices": [
-                        "No",
-                        "Yes"
-                    ]
-                },
                 {
                     "id": "discord_voice_channel_server_id",
                     "type": "text",
@@ -786,32 +823,7 @@
             "imagepath": "%TP_PLUGIN_FOLDER%tpdiscord/tpdiscord.png",
             "connectors": [],
             "actions": [],
-            "events": [
-                {
-                    "id": "discord_newDM",
-                    "name": "Discord: New Direct Message (DM)",
-                    "format": "When receiving a new Direct Message $val",
-                    "type": "communicate",
-                    "valueChoices": [
-                        "True",
-                        "False"
-                    ],
-                    "valueType": "choice",
-                    "valueStateId": "discord_newDM_eventState"
-                },
-                {
-                    "id": "discord_newMention",
-                    "name": "Discord | New Mention",
-                    "format": "When receiving a new Mention $val",
-                    "type": "communicate",
-                    "valueChoices": [
-                        "True",
-                        "False"
-                    ],
-                    "valueType": "choice",
-                    "valueStateId": "discord_newMention_eventState"
-                }
-            ],
+            "events": [],
             "states": [
                 {
                     "id": "discord_DM_user",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tpdiscord",
-  "version": "5.0.0-alpha-2",
+  "version": "5.0.0-alpha-3",
   "description": "Touch Portal Plugin for Discord using RPC",
   "main": "src/index.js",
   "bin": {

diff --git a/src/handlers/discord/voiceStateHandler.js b/src/handlers/discord/voiceStateHandler.js
@@ -10,13 +10,18 @@ class VoiceStateHandler {
     this.DG = DG
     this.userStateHandler = userStateHandler;
     this.voiceChannelHandler = voiceChannelHandler;
+    this.doLogin = null;
 
     // not using?
     // this.repopulateUserStates = this.userStateHandler.repopulateUserStates;
 
     this.notification = notificationHandler;
   }
 
+  initiate_doLogin = (doLogin) => {
+    this.doLogin = doLogin;
+  }
+
   registerEvents = () => {
     this.DG.Client.on("ready", async () => {
       if (
@@ -149,9 +154,8 @@ class VoiceStateHandler {
       this.TPClient.settingUpdate("Plugin Connected", "Disconnected");
       this.TPClient.stateUpdate("discord_connected", "Disconnected");
       this.DG.connected = false;
-      if (platform != "win32") {
-        // return this.Discord.doLogin();
-        print("wooopsie.. this is not windows.., gitago forgot to fix the reglogin he didnt think was needed");
+      if (platform != "win32" || this.DG.pluginSettings["Skip Process Watcher"].toLowerCase() == "yes") {
+        return this.doLogin();
       }
     });
   };
@@ -231,6 +235,8 @@ class VoiceStateHandler {
 
         if (matchedDevice) {
           this.TPClient.stateUpdate(`discord_${type}Device`, matchedDevice.name);
+          this.TPClient.stateUpdate(`discord_default_audio_device_change_eventState`, `${type.charAt(0).toUpperCase() + type.slice(1)}`);
+
           logIt("DEBUG", `${type.charAt(0).toUpperCase() + type.slice(1)} Device:`, matchedDevice.name);
         } else {
           logIt("ERROR", `No ${type} device matched the ID.`);
@@ -243,9 +249,13 @@ class VoiceStateHandler {
         const matchedDevice = this.DG.voiceSettings[`${type}Devices`].find(device => device.id === this.DG.voiceSettings[`${type}DeviceId`]);
         if (matchedDevice) {
           this.TPClient.stateUpdate(`discord_${type}Device`, matchedDevice.name);
+          this.TPClient.stateUpdate(`discord_default_audio_device_change_eventState`, `${type.charAt(0).toUpperCase() + type.slice(1)}`);
         }
         logIt("DEBUG", `Using ${type} device ID:`, this.DG.voiceSettings[`${type}DeviceId`]);
       }
+
+      this.TPClient.stateUpdate(`discord_default_audio_device_change_eventState`, ``);
+
     } else {
       logIt("INFO", `No ${type} device data found.`);
     }
@@ -284,6 +294,7 @@ class VoiceStateHandler {
         this.DG.voiceSettings.muteState = 1;
       } else {
         this.DG.voiceSettings.deafState = 0;
+        this.DG.voiceSettings.muteState = 0;
       }
       states.push({id: "discord_deafen", value: this.DG.voiceSettings.deafState ? "On" : "Off"});
       states.push({id: "discord_mute", value: this.DG.voiceSettings.muteState ? "On" : "Off"});

diff --git a/src/index.js b/src/index.js
@@ -267,12 +267,7 @@ const voiceChannelHandler = new VoiceChannelHandler(DG, TPClient, userStateHandl
 const voiceStateHandler = new VoiceStateHandler(DG,  TPClient, userStateHandler, notificationHandler, voiceChannelHandler);
 const Discord = new DiscordConnector(TPClient, DG, RPC, userStateHandler, notificationHandler, voiceStateHandler);
 
-
-
-
-
-
-
+voiceStateHandler.initiate_doLogin(Discord.doLogin);
 
 
 // Process Watcher