From 361928c9ad8945d525534e3d7178755f49ff6c1f Mon Sep 17 00:00:00 2001
From: Jeff Halter <868228+jhalter@users.noreply.github.com>
Date: Mon, 7 Nov 2022 13:19:12 -0800
Subject: Improve Frogblast client compatibility

---
 hotline/transaction_handlers.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'hotline/transaction_handlers.go')

diff --git a/hotline/transaction_handlers.go b/hotline/transaction_handlers.go
index 5a9ea5e..6816456 100644
--- a/hotline/transaction_handlers.go
+++ b/hotline/transaction_handlers.go
@@ -253,9 +253,10 @@ func HandleChatSend(cc *ClientConn, t *Transaction) (res []Transaction, err erro
 		formattedMsg = fmt.Sprintf("\r*** %s %s", cc.UserName, t.GetField(fieldData).Data)
 	}
 
+	// The ChatID field is used to identify messages as belonging to a private chat.
+	// All clients *except* Frogblast omit this field for public chat, but Frogblast sends a value of 00 00 00 00.
 	chatID := t.GetField(fieldChatID).Data
-	// a non-nil chatID indicates the message belongs to a private chat
-	if chatID != nil {
+	if chatID != nil && !bytes.Equal([]byte{0, 0, 0, 0}, chatID) {
 		chatInt := binary.BigEndian.Uint32(chatID)
 		privChat := cc.Server.PrivateChats[chatInt]
 
-- 
cgit