From efdf69f782bdb812b714912a7af217d84ef9a48d Mon Sep 17 00:00:00 2001
From: Infi <infiziert@protonmail.ch>
Date: Thu, 11 Sep 2025 01:30:07 +0200
Subject: [PATCH] - Fix incorrect function call for novice network - Fix
 keybind handler being obsolete

---
 ChatTwo/ChatTwo.csproj                  |  2 +-
 ChatTwo/GameFunctions/Context.cs        |  4 +---
 ChatTwo/GameFunctions/KeybindManager.cs | 17 +++++++++--------
 ChatTwo/Http/Processing.cs              |  4 ++--
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/ChatTwo/ChatTwo.csproj b/ChatTwo/ChatTwo.csproj
index 0f1e01f..ac17fcd 100755
--- a/ChatTwo/ChatTwo.csproj
+++ b/ChatTwo/ChatTwo.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Dalamud.NET.Sdk/13.0.0">
     <PropertyGroup>
-        <Version>1.31.1</Version>
+        <Version>1.31.2</Version>
         <TargetFramework>net9.0-windows</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
diff --git a/ChatTwo/GameFunctions/Context.cs b/ChatTwo/GameFunctions/Context.cs
index aabac62..fd3afde 100755
--- a/ChatTwo/GameFunctions/Context.cs
+++ b/ChatTwo/GameFunctions/Context.cs
@@ -10,9 +10,7 @@ internal sealed unsafe class Context
     internal static void InviteToNoviceNetwork(string name, ushort world)
     {
         // can specify content id if we have it, but there's no need
-        fixed (byte* namePtr = name.ToTerminatedBytes()) {
-            InfoProxyNoviceNetwork.Instance()->InviteToNoviceNetwork(0, world, namePtr);
-        }
+        InfoProxyNoviceNetwork.Instance()->InviteToNoviceNetwork(0, 0, world, name.ToTerminatedBytes());
     }
 
     internal static void TryOn(uint itemId, byte stainId)
diff --git a/ChatTwo/GameFunctions/KeybindManager.cs b/ChatTwo/GameFunctions/KeybindManager.cs
index b3cf37c..4de9161 100644
--- a/ChatTwo/GameFunctions/KeybindManager.cs
+++ b/ChatTwo/GameFunctions/KeybindManager.cs
@@ -467,19 +467,20 @@ internal unsafe class KeybindManager : IDisposable {
 
     private static Keybind GetKeybind(string id)
     {
-        var outData = new UIInputData.Keybind();
+        var outData = new FFXIVClientStructs.FFXIV.Client.System.Input.Keybind();
         var idString = Utf8String.FromString(id);
-        UIInputData.Instance()->GetKeybind(idString, &outData);
+        UIInputData.Instance()->GetKeybindByName(idString, &outData);
         idString->Dtor(true);
 
-        var key1 = RemapInvalidVirtualKey((VirtualKey) outData.Key);
-        var key2 = RemapInvalidVirtualKey((VirtualKey) outData.AltKey);
+        var key1 = outData.KeySettings[0];
+        var key2 = outData.KeySettings[1];
         return new Keybind
         {
-            Key1 = key1,
-            Modifier1 = (ModifierFlag) outData.Modifier,
-            Key2 = key2,
-            Modifier2 = (ModifierFlag) outData.AltModifier,
+            Key1 = RemapInvalidVirtualKey((VirtualKey) key1.Key),
+            Modifier1 = (ModifierFlag) key1.KeyModifier,
+
+            Key2 = RemapInvalidVirtualKey((VirtualKey) key2.Key),
+            Modifier2 = (ModifierFlag) key2.KeyModifier,
         };
     }
 
diff --git a/ChatTwo/Http/Processing.cs b/ChatTwo/Http/Processing.cs
index 872bf5d..4f348fb 100644
--- a/ChatTwo/Http/Processing.cs
+++ b/ChatTwo/Http/Processing.cs
@@ -23,7 +23,7 @@ public class Processing
 
     internal async Task<MessageResponse[]> ReadMessageList()
     {
-        var tabMessages = await Plugin.CurrentTab!.Messages.GetCopy();
+        var tabMessages = await Plugin.CurrentTab.Messages.GetCopy();
         return tabMessages.TakeLast(Plugin.Config.WebinterfaceMaxLinesToSend).Select(ReadMessageContent).ToArray();
     }
 
@@ -80,7 +80,7 @@ public class Processing
 
             color ??= 0;
 
-            var userContent = text.Content ?? "";
+            var userContent = text.Content ?? string.Empty;
             if (Plugin.ChatLogWindow.ScreenshotMode)
             {
                 if (chunk.Link is PlayerPayload playerPayload)