Merge branch 'dev' into main

Author: VolcanicArts

VRCOSC.Desktop/VRCOSC.Desktop.csproj

@@ -6,12 +6,12 @@
     <ApplicationIcon>game.ico</ApplicationIcon>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Version>0.0.0</Version>
-    <FileVersion>2023.727.0</FileVersion>
+    <FileVersion>2023.727.1</FileVersion>
     <Title>VRCOSC</Title>
     <Authors>VolcanicArts</Authors>
     <Company>VolcanicArts</Company>
     <Nullable>enable</Nullable>
-    <AssemblyVersion>2023.727.0</AssemblyVersion>
+    <AssemblyVersion>2023.727.1</AssemblyVersion>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\VRCOSC.Game\VRCOSC.Game.csproj" />

VRCOSC.Game/Processes/ProcessExtensions.cs

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 using NAudio.CoreAudioApi;
 using osu.Framework.Extensions.IEnumerableExtensions;
@@ -24,9 +25,9 @@ public static async Task PressKeys(IEnumerable<User32.VirtualKey> keys, int pres
 
     public static string? GetActiveWindowTitle()
     {
-        var buff = new char[256];
+        var buffer = new char[256];
         var handle = User32.GetForegroundWindow();
-        return User32.GetWindowText(handle, buff, 256) > 0 ? buff.ToString() : null;
+        return User32.GetWindowText(handle, buffer, 256) > 0 ? Encoding.UTF8.GetString(Encoding.UTF8.GetBytes(buffer)).TrimEnd('\u0000') : null;
     }
 
     public static void ShowMainWindow(this Process process, User32.WindowShowStyle style) => User32.ShowWindow(process.MainWindowHandle, style);

VRCOSC.Modules/AFK/AFKModule.cs

@@ -2,7 +2,6 @@
 // See the LICENSE file in the repository root for full license text.
 
 using VRCOSC.Game.Modules.ChatBox;
-using VRCOSC.Game.OSC.VRChat;
 using VRCOSC.Game.Processes;
 
 namespace VRCOSC.Modules.AFK;
@@ -13,7 +12,7 @@ public class AFKModule : ChatBoxModule
     public override string Description => "Display text and time since going AFK";
     public override string Author => "VolcanicArts";
     public override ModuleType Type => ModuleType.General;
-    protected override TimeSpan DeltaUpdate => VRChatOscConstants.UPDATE_TIME_SPAN;
+    protected override TimeSpan DeltaUpdate => TimeSpan.FromSeconds(1);
 
     private DateTime? afkBegan;
 
@@ -38,6 +37,14 @@ protected override void OnModuleStart()
     }
 
     protected override void OnModuleUpdate()
+    {
+        SetVariableValue(AFKVariable.FocusedWindow, ProcessExtensions.GetActiveWindowTitle() ?? "None");
+        SetVariableValue(AFKVariable.Duration, afkBegan is null ? null : (DateTime.Now - afkBegan.Value).ToString(@"hh\:mm\:ss"));
+        SetVariableValue(AFKVariable.Since, afkBegan?.ToString(@"hh\:mm"));
+        ChangeStateTo(afkBegan is null ? AFKState.NotAFK : AFKState.AFK);
+    }
+
+    protected override void OnPlayerUpdate()
     {
         if (Player.AFK is null)
         {
@@ -48,7 +55,6 @@ protected override void OnModuleUpdate()
         if (Player.AFK.Value && afkBegan is null)
         {
             afkBegan = DateTime.Now;
-            SetVariableValue(AFKVariable.FocusedWindow, ProcessExtensions.GetActiveWindowTitle() ?? "None");
             TriggerEvent(AFKEvent.AFKStarted);
         }
 
@@ -57,10 +63,6 @@ protected override void OnModuleUpdate()
             afkBegan = null;
             TriggerEvent(AFKEvent.AFKStopped);
         }
-
-        SetVariableValue(AFKVariable.Duration, afkBegan is null ? null : (DateTime.Now - afkBegan.Value).ToString(@"hh\:mm\:ss"));
-        SetVariableValue(AFKVariable.Since, afkBegan?.ToString(@"hh\:mm"));
-        ChangeStateTo(afkBegan is null ? AFKState.NotAFK : AFKState.AFK);
     }
 
     private enum AFKVariable