t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix /reply command while syncshell chat channel is active

Browse Source
This commit is contained in:
Loporrit
2025-02-02 09:41:23 +00:00
parent 80894fe446
commit 7e0627793d
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
MareSynchronos/Interop/GameChatHooks.cs
View File

@@ -68,6 +68,8 @@ public unsafe sealed class GameChatHooks : IDisposable
private ChatChannelOverride? _chatChannelOverride; private ChatChannelOverride? _chatChannelOverride;
private bool _shouldForceNameLookup = false; private bool _shouldForceNameLookup = false;
private DateTime _nextMessageIsReply = DateTime.UnixEpoch;
public ChatChannelOverride? ChatChannelOverride public ChatChannelOverride? ChatChannelOverride
{ {
get => _chatChannelOverride; get => _chatChannelOverride;
@@ -106,21 +108,41 @@ public unsafe sealed class GameChatHooks : IDisposable
var messageSpan = message->AsSpan(); var messageSpan = message->AsSpan();
bool isCommand = false; bool isCommand = false;
bool isReply = false;
var utcNow = DateTime.UtcNow;
// Check if chat input begins with a command (or auto-translated command) // Check if chat input begins with a command (or auto-translated command)
if (messageLength == 0 || messageSpan[0] == (byte)'/' || !messageSpan.ContainsAnyExcept((byte)' ')) // Or if we think we're being called to send text via the /r command
if (_nextMessageIsReply >= utcNow)
{ {
isCommand = true; isCommand = true;
} }
else if (messageLength == 0 || messageSpan[0] == (byte)'/' || !messageSpan.ContainsAnyExcept((byte)' '))
{
isCommand = true;
if (messageSpan.StartsWith(System.Text.Encoding.ASCII.GetBytes("/r ")) || messageSpan.StartsWith(System.Text.Encoding.ASCII.GetBytes("/reply ")))
isReply = true;
}
else if (messageSpan[0] == (byte)0x02) /* Payload.START_BYTE */ else if (messageSpan[0] == (byte)0x02) /* Payload.START_BYTE */
{ {
var payload = Payload.Decode(new BinaryReader(new UnmanagedMemoryStream(message->StringPtr, message->BufSize))) as AutoTranslatePayload; var payload = Payload.Decode(new BinaryReader(new UnmanagedMemoryStream(message->StringPtr, message->BufSize))) as AutoTranslatePayload;
// Auto-translate text begins with / // Auto-translate text begins with /
if (payload != null && payload.Text.Length > 2 && payload.Text[2] == '/') if (payload != null && payload.Text.Length > 2 && payload.Text[2] == '/')
{
isCommand = true; isCommand = true;
if (payload.Text[2..].StartsWith("/r ") || payload.Text[2..].StartsWith("/reply "))
isReply = true;
}
} }
// When using /r the game will set a flag and then call this function a second time
// The next call to this function will be raw text intended for the IM recipient
// This flag's validity is time-limited as a fail-safe
if (isReply)
_nextMessageIsReply = utcNow + TimeSpan.FromMilliseconds(100);
// If not a command, or no override is set, then call the original chat handler // If not a command, or no override is set, then call the original chat handler
if (isCommand || this._chatChannelOverride == null) if (isCommand || this._chatChannelOverride == null)
{ {