Merge branch 'dev' into main

VRCOSC.Game/Managers/ChatBoxManager.cs

@@ -98,6 +98,7 @@ public void Import(string filePath)
 
     public void ResetTimeline()
     {
+        SelectedClip.Value = null;
         setDefaults();
         Serialise();
     }

VRCOSC.Game/Modules/Module.cs

@@ -273,6 +273,7 @@ internal bool TryGetParameter(string lookup, [NotNullWhen(true)] out ModuleAttri
     private static Regex parameterToRegex(string parameterName)
     {
         var pattern = parameterName.Replace("/", @"\/").Replace("*", @"(\S*)");
+        pattern += "$";
         return new Regex(pattern);
     }
 

VRCOSC.Game/OSC/VRChat/VRChatOscClient.cs

@@ -66,55 +66,54 @@ public void Reset()
         QueryPort = null;
     }
 
-    public async Task<object?> FindParameterValue(string parameterName)
+    private async Task<OSCQueryNode?> findParameter(string parameterName)
     {
-        if (QueryPort is null) return null;
+        try
+        {
+            if (QueryPort is null) return null;
 
-        var url = $"http://127.0.0.1:{QueryPort}/avatar/parameters/{parameterName}";
+            var url = $"http://127.0.0.1:{QueryPort}/avatar/parameters/{parameterName}";
 
-        var response = await client.GetAsync(new Uri(url));
-        var content = await response.Content.ReadAsStringAsync();
-        var node = JsonConvert.DeserializeObject<OSCQueryNode>(content);
+            var response = await client.GetAsync(new Uri(url));
+            var content = await response.Content.ReadAsStringAsync();
+            var node = JsonConvert.DeserializeObject<OSCQueryNode>(content);
 
-        if (node is null)
+            return node is null || node.Access == Attributes.AccessValues.NoValue ? null : node;
+        }
+        catch (Exception e)
         {
-            Logger.Log("Could not decode node");
+            Logger.Error(e, $"Exception when trying to find parameter: {parameterName}");
             return null;
         }
+    }
+
+    public async Task<object?> FindParameterValue(string parameterName)
+    {
+        var node = await findParameter(parameterName);
+        if (node is null) return null;
 
         return node.OscType switch
         {
             "f" => Convert.ToSingle(node.Value[0]),
             "i" => Convert.ToInt32(node.Value[0]),
             "T" => Convert.ToBoolean(node.Value[0]),
             "F" => Convert.ToBoolean(node.Value[0]),
-            _ => throw new InvalidOperationException("Unknown type")
+            _ => throw new InvalidOperationException($"Unknown type {node.OscType}")
         };
     }
 
     public async Task<TypeCode?> FindParameterType(string parameterName)
     {
-        if (QueryPort is null) return null;
-
-        var url = $"http://127.0.0.1:{QueryPort}/avatar/parameters/{parameterName}";
-
-        var response = await client.GetAsync(new Uri(url));
-        var content = await response.Content.ReadAsStringAsync();
-        var node = JsonConvert.DeserializeObject<OSCQueryNode>(content);
-
-        if (node is null)
-        {
-            Logger.Log("Could not decode node");
-            return null;
-        }
+        var node = await findParameter(parameterName);
+        if (node is null) return null;
 
         return node.OscType switch
         {
             "f" => TypeCode.Single,
             "i" => TypeCode.Int32,
             "T" => TypeCode.Boolean,
             "F" => TypeCode.Boolean,
-            _ => throw new InvalidOperationException("Unknown type")
+            _ => throw new InvalidOperationException($"Unknown type {node.OscType}")
         };
     }
 }

VRCOSC.Game/Providers/PiShock/PiShockProvider.cs

@@ -42,7 +42,7 @@ public async Task<PiShockResponse> Execute(string username, string apiKey, strin
         {
             var response = await client.PostAsync(action_api_url, new StringContent(JsonConvert.SerializeObject(request), Encoding.UTF8, "application/json"));
             var responseString = await response.Content.ReadAsStringAsync();
-            return new PiShockResponse(responseString == "Operation Succeeded.", responseString, duration, intensity);
+            return new PiShockResponse(responseString is "Operation Succeeded." or "Operation Attempted.", responseString, duration, intensity);
         }
         catch (Exception e)
         {

VRCOSC.Modules/PiShock/PiShockModule.cs

@@ -19,6 +19,17 @@ public class PiShockModule : AvatarModule
     private SpeechToTextProvider? speechToTextProvider;
 
     private int group;
+
+    private int selectedGroup
+    {
+        get => group;
+        set
+        {
+            group = value;
+            SendParameter(PiShockParameter.Group, group);
+        }
+    }
+
     private float duration;
     private float intensity;
 
@@ -71,15 +82,18 @@ protected override void CreateAttributes()
         CreateParameter<int>(PiShockParameter.Group, ParameterMode.ReadWrite, "VRCOSC/PiShock/Group", "Group", "The group to select for the actions");
         CreateParameter<float>(PiShockParameter.Duration, ParameterMode.ReadWrite, "VRCOSC/PiShock/Duration", "Duration", "The duration of the action as a percentage mapped between 1-15");
         CreateParameter<float>(PiShockParameter.Intensity, ParameterMode.ReadWrite, "VRCOSC/PiShock/Intensity", "Intensity", "The intensity of the action as a percentage mapped between 1-100");
-        CreateParameter<bool>(PiShockParameter.Shock, ParameterMode.Read, "VRCOSC/PiShock/Shock", "Shock", "Executes a shock using the defined parameters");
-        CreateParameter<bool>(PiShockParameter.Vibrate, ParameterMode.Read, "VRCOSC/PiShock/Vibrate", "Vibrate", "Executes a vibration using the defined parameters");
-        CreateParameter<bool>(PiShockParameter.Beep, ParameterMode.Read, "VRCOSC/PiShock/Beep", "Beep", "Executes a beep using the defined parameters");
+        CreateParameter<bool>(PiShockParameter.Shock, ParameterMode.Read, "VRCOSC/PiShock/Shock", "Shock", "Executes a shock using the defined parameters on the selected group");
+        CreateParameter<bool>(PiShockParameter.ShockGroup, ParameterMode.Read, "VRCOSC/PiShock/Shock/*", "Shock Group", "For use when you want to execute a shock on a specific group instead of selecting a group");
+        CreateParameter<bool>(PiShockParameter.Vibrate, ParameterMode.Read, "VRCOSC/PiShock/Vibrate", "Vibrate", "Executes a vibration using the defined parameters on the selected group");
+        CreateParameter<bool>(PiShockParameter.VibrateGroup, ParameterMode.Read, "VRCOSC/PiShock/Vibrate/*", "Vibrate Group", "For use when you want to execute a vibration on a specific group instead of selecting a group");
+        CreateParameter<bool>(PiShockParameter.Beep, ParameterMode.Read, "VRCOSC/PiShock/Beep", "Beep", "Executes a beep using the defined parameters on the selected group");
+        CreateParameter<bool>(PiShockParameter.BeepGroup, ParameterMode.Read, "VRCOSC/PiShock/Beep/*", "Beep Group", "For use when you want to execute a beep on a specific group instead of selecting a group");
         CreateParameter<bool>(PiShockParameter.Success, ParameterMode.Write, "VRCOSC/PiShock/Success", "Success", "If the execution was successful, this will become true for 1 second to act as a notification");
     }
 
     protected override void OnModuleStart()
     {
-        group = 0;
+        selectedGroup = 0;
         duration = 0f;
         intensity = 0f;
         shock = null;
@@ -175,11 +189,11 @@ private async void onNewSentenceSpoken(bool success, string sentence)
 
     private async void executePiShockMode(PiShockMode mode)
     {
-        var groupData = GetSettingList<PiShockGroupInstance>(PiShockSetting.Groups).ElementAtOrDefault(group);
+        var groupData = GetSettingList<PiShockGroupInstance>(PiShockSetting.Groups).ElementAtOrDefault(selectedGroup);
 
         if (groupData is null)
         {
-            Log($"No group with ID {group}");
+            Log($"No group with ID {selectedGroup}");
             return;
         }
 
@@ -223,7 +237,7 @@ private async Task sendPiShockData(PiShockMode mode, PiShockShockerInstance inst
 
     private void sendParameters()
     {
-        SendParameter(PiShockParameter.Group, group);
+        SendParameter(PiShockParameter.Group, selectedGroup);
         SendParameter(PiShockParameter.Duration, duration);
         SendParameter(PiShockParameter.Intensity, intensity);
     }
@@ -236,16 +250,31 @@ protected override void OnRegisteredParameterReceived(AvatarParameter parameter)
                 shock = parameter.ValueAs<bool>() ? DateTimeOffset.Now : null;
                 break;
 
+            case PiShockParameter.ShockGroup:
+                selectedGroup = parameter.WildcardAs<int>(0);
+                shock = parameter.ValueAs<bool>() ? DateTimeOffset.Now : null;
+                break;
+
             case PiShockParameter.Vibrate:
                 vibrate = parameter.ValueAs<bool>() ? DateTimeOffset.Now : null;
                 break;
 
+            case PiShockParameter.VibrateGroup:
+                selectedGroup = parameter.WildcardAs<int>(0);
+                vibrate = parameter.ValueAs<bool>() ? DateTimeOffset.Now : null;
+                break;
+
             case PiShockParameter.Beep:
                 beep = parameter.ValueAs<bool>() ? DateTimeOffset.Now : null;
                 break;
 
+            case PiShockParameter.BeepGroup:
+                selectedGroup = parameter.WildcardAs<int>(0);
+                beep = parameter.ValueAs<bool>() ? DateTimeOffset.Now : null;
+                break;
+
             case PiShockParameter.Group:
-                group = parameter.ValueAs<int>();
+                selectedGroup = parameter.ValueAs<int>();
                 break;
 
             case PiShockParameter.Duration:
@@ -281,6 +310,9 @@ private enum PiShockParameter
         Shock,
         Vibrate,
         Beep,
-        Success
+        Success,
+        ShockGroup,
+        VibrateGroup,
+        BeepGroup
     }
 }

VRCOSC.Modules/Timer/TimerModule.cs

@@ -0,0 +1,53 @@
+// Copyright (c) VolcanicArts. Licensed under the GPL-3.0 License.
+// See the LICENSE file in the repository root for full license text.
+
+using System.Globalization;
+using VRCOSC.Game.Modules;
+using VRCOSC.Game.Modules.Avatar;
+
+namespace VRCOSC.Modules.Timer;
+
+[ModuleTitle("Timer")]
+[ModuleDescription("Counts down to a specified time to be put in the ChatBox")]
+[ModuleGroup(ModuleType.General)]
+public class TimerModule : ChatBoxModule
+{
+    protected override void CreateAttributes()
+    {
+        CreateSetting(TimerSetting.Time, "Time", "The date/time to countdown to", string.Empty);
+
+        CreateVariable(TimerVariable.Time, "Time", "time");
+        CreateState(TimerState.Default, "Default", GetVariableFormat(TimerVariable.Time));
+    }
+
+    [ModuleUpdate(ModuleUpdateMode.ChatBox)]
+    private void onChatBoxUpdate()
+    {
+        if (DateTime.TryParse(GetSetting<string>(TimerSetting.Time), null, DateTimeStyles.AssumeLocal, out var time))
+        {
+            var timeNow = DateTime.Now;
+            var difference = time - timeNow;
+            var differenceNoMilli = new TimeSpan(difference.Days, difference.Hours, difference.Minutes, difference.Seconds);
+            SetVariableValue(TimerVariable.Time, differenceNoMilli.ToString("g"));
+        }
+        else
+        {
+            Log("Could not parse entered time");
+        }
+    }
+
+    private enum TimerSetting
+    {
+        Time
+    }
+
+    private enum TimerState
+    {
+        Default
+    }
+
+    private enum TimerVariable
+    {
+        Time
+    }
+}

VRCOSC.Modules/VoiceRecognition/VoiceRecognitionModule.cs

@@ -70,7 +70,14 @@ private async void onNewSentenceSpoken(bool success, string sentence)
     {
         if (!success) return;
 
-        var phraseInstances = GetSettingList<VoiceRecognitionPhraseInstance>(VoiceRecognitionSetting.PhraseList).Where(wordInstance => sentence.Contains(wordInstance.Phrase.Value, StringComparison.InvariantCultureIgnoreCase)).ToList();
+        var phraseInstances = GetSettingList<VoiceRecognitionPhraseInstance>(VoiceRecognitionSetting.PhraseList)
+                              .Where(wordInstance =>
+                                  sentence.Contains(wordInstance.Phrase.Value, StringComparison.InvariantCultureIgnoreCase) &&
+                                  !string.IsNullOrEmpty(wordInstance.Phrase.Value) &&
+                                  !string.IsNullOrEmpty(wordInstance.ParameterName.Value) &&
+                                  !string.IsNullOrEmpty(wordInstance.Value.Value))
+                              .ToList();
+
         if (!phraseInstances.Any()) return;
 
         Log($"Found phrase '{phraseInstances[0].Phrase.Value}'");