X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/4d64a5b96d95c2fede033907aa3463068990b8ff..f6d10820df99ba533077581ae1201400260e7fb9:/hotline/transaction_handlers.go

diff --git a/hotline/transaction_handlers.go b/hotline/transaction_handlers.go
index 56f7afa..12b1d41 100644
--- a/hotline/transaction_handlers.go
+++ b/hotline/transaction_handlers.go
@@ -248,14 +248,16 @@ func HandleChatSend(cc *ClientConn, t *Transaction) (res []Transaction, err erro
 
 	// By holding the option key, Hotline chat allows users to send /me formatted messages like:
 	// *** Halcyon does stuff
-	// This is indicated by the presence of the optional field fieldChatOptions in the transaction payload
-	if t.GetField(fieldChatOptions).Data != nil {
+	// This is indicated by the presence of the optional field fieldChatOptions set to a value of 1.
+	// Most clients do not send this option for normal chat messages.
+	if t.GetField(fieldChatOptions).Data != nil && bytes.Equal(t.GetField(fieldChatOptions).Data, []byte{0, 1}) {
 		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]
 
@@ -285,6 +287,7 @@ func HandleChatSend(cc *ClientConn, t *Transaction) (res []Transaction, err erro
 
 // HandleSendInstantMsg sends instant message to the user on the current server.
 // Fields used in the request:
+//
 //	103	User ID
 //	113	Options
 //		One of the following values:
@@ -895,17 +898,6 @@ func HandleUserBroadcast(cc *ClientConn, t *Transaction) (res []Transaction, err
 	return res, err
 }
 
-func byteToInt(bytes []byte) (int, error) {
-	switch len(bytes) {
-	case 2:
-		return int(binary.BigEndian.Uint16(bytes)), nil
-	case 4:
-		return int(binary.BigEndian.Uint32(bytes)), nil
-	}
-
-	return 0, errors.New("unknown byte length")
-}
-
 // HandleGetClientInfoText returns user information for the specific user.
 //
 // Fields used in the request:
@@ -1196,10 +1188,12 @@ func HandleNewNewsFldr(cc *ClientConn, t *Transaction) (res []Transaction, err e
 	return res, err
 }
 
+// HandleGetNewsArtData gets the list of article names at the specified news path.
+
 // Fields used in the request:
 // 325	News path	Optional
-//
-// Reply fields:
+
+// Fields used in the reply:
 // 321	News article list data	Optional
 func HandleGetNewsArtNameList(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
 	if !cc.Authorize(accessNewsReadArt) {
@@ -1222,47 +1216,51 @@ func HandleGetNewsArtNameList(cc *ClientConn, t *Transaction) (res []Transaction
 	return res, err
 }
 
+// HandleGetNewsArtData requests information about the specific news article.
+// Fields used in the request:
+//
+// Request fields
+// 325	News path
+// 326	News article ID
+// 327	News article data flavor
+//
+// Fields used in the reply:
+// 328	News article title
+// 329	News article poster
+// 330	News article date
+// 331	Previous article ID
+// 332	Next article ID
+// 335	Parent article ID
+// 336	First child article ID
+// 327	News article data flavor	"Should be “text/plain”
+// 333	News article data	Optional (if data flavor is “text/plain”)
 func HandleGetNewsArtData(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
 	if !cc.Authorize(accessNewsReadArt) {
 		res = append(res, cc.NewErrReply(t, "You are not allowed to read news."))
 		return res, err
 	}
 
-	// Request fields
-	// 325	News fp
-	// 326	News article ID
-	// 327	News article data flavor
-
-	pathStrs := ReadNewsPath(t.GetField(fieldNewsPath).Data)
-
 	var cat NewsCategoryListData15
 	cats := cc.Server.ThreadedNews.Categories
 
-	for _, fp := range pathStrs {
+	for _, fp := range ReadNewsPath(t.GetField(fieldNewsPath).Data) {
 		cat = cats[fp]
 		cats = cats[fp].SubCats
 	}
-	newsArtID := t.GetField(fieldNewsArtID).Data
 
-	convertedArtID := binary.BigEndian.Uint16(newsArtID)
+	// The official Hotline clients will send the article ID as 2 bytes if possible, but
+	// some third party clients such as Frogblast and Heildrun will always send 4 bytes
+	convertedID, err := byteToInt(t.GetField(fieldNewsArtID).Data)
+	if err != nil {
+		return res, err
+	}
 
-	art := cat.Articles[uint32(convertedArtID)]
+	art := cat.Articles[uint32(convertedID)]
 	if art == nil {
 		res = append(res, cc.NewReply(t))
 		return res, err
 	}
 
-	// Reply fields
-	// 328	News article title
-	// 329	News article poster
-	// 330	News article date
-	// 331	Previous article ID
-	// 332	Next article ID
-	// 335	Parent article ID
-	// 336	First child article ID
-	// 327	News article data flavor	"Should be “text/plain”
-	// 333	News article data	Optional (if data flavor is “text/plain”)
-
 	res = append(res, cc.NewReply(t,
 		NewField(fieldNewsArtTitle, []byte(art.Title)),
 		NewField(fieldNewsArtPoster, []byte(art.Poster)),
@@ -1293,7 +1291,7 @@ func HandleDelNewsItem(cc *ClientConn, t *Transaction) (res []Transaction, err e
 		}
 	}
 
-	if bytes.Compare(cats[delName].Type, []byte{0, 3}) == 0 {
+	if bytes.Equal(cats[delName].Type, []byte{0, 3}) {
 		if !cc.Authorize(accessNewsDeleteCat) {
 			return append(res, cc.NewErrReply(t, "You are not allowed to delete news categories.")), nil
 		}
@@ -1880,7 +1878,8 @@ func HandleJoinChat(cc *ClientConn, t *Transaction) (res []Transaction, err erro
 
 // HandleLeaveChat is sent from a v1.8+ Hotline client when the user exits a private chat
 // Fields used in the request:
-//	* 114	fieldChatID
+//   - 114	fieldChatID
+//
 // Reply is not expected.
 func HandleLeaveChat(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
 	chatID := t.GetField(fieldChatID).Data