Fix refuse private chat error messaging

diff --git a/hotline/transaction_handlers.go b/hotline/transaction_handlers.go
index 2dc5e0683af1934f916aae91f8956aec48fbf093..46fe362bf687b1165e3854de3a3105af2e3f7d08 100644 (file)
--- a/hotline/transaction_handlers.go
+++ b/hotline/transaction_handlers.go
@@ -1704,8 +1704,6 @@ func HandleInviteNewChat(cc *ClientConn, t *Transaction) (res []Transaction, err
        targetID := t.GetField(fieldUserID).Data
        newChatID := cc.Server.NewPrivateChat(cc)
 
        targetID := t.GetField(fieldUserID).Data
        newChatID := cc.Server.NewPrivateChat(cc)
 

-       // Halcyon does not accept private chats.
-

        // Check if target user has "Refuse private chat" flag
        binary.BigEndian.Uint16(targetID)
        targetClient := cc.Server.Clients[binary.BigEndian.Uint16(targetID)]
        // Check if target user has "Refuse private chat" flag
        binary.BigEndian.Uint16(targetID)
        targetClient := cc.Server.Clients[binary.BigEndian.Uint16(targetID)]


@@ -1716,7 +1714,7 @@ func HandleInviteNewChat(cc *ClientConn, t *Transaction) (res []Transaction, err
                        *NewTransaction(
                                tranServerMsg,
                                cc.ID,
                        *NewTransaction(
                                tranServerMsg,
                                cc.ID,

-                               NewField(fieldData, []byte(string(targetClient.UserName)+" does not accept private messages.")),
+                               NewField(fieldData, []byte(string(targetClient.UserName)+" does not accept private chats.")),

                                NewField(fieldUserName, targetClient.UserName),
                                NewField(fieldUserID, *targetClient.ID),
                                NewField(fieldOptions, []byte{0, 2}),
                                NewField(fieldUserName, targetClient.UserName),
                                NewField(fieldUserID, *targetClient.ID),
                                NewField(fieldOptions, []byte{0, 2}),

diff --git a/hotline/transaction_handlers_test.go b/hotline/transaction_handlers_test.go
index cb9e21f301a117faf12188fd9e24b99b226c8baa..e141c78dd29d0f52b19c0c4587a66a58cdec07bb 100644 (file)
--- a/hotline/transaction_handlers_test.go
+++ b/hotline/transaction_handlers_test.go
@@ -3429,7 +3429,7 @@ func TestHandleInviteNewChat(t *testing.T) {
                                        ID:        []byte{0, 0, 0, 0},
                                        ErrorCode: []byte{0, 0, 0, 0},
                                        Fields: []Field{
                                        ID:        []byte{0, 0, 0, 0},
                                        ErrorCode: []byte{0, 0, 0, 0},
                                        Fields: []Field{

-                                               NewField(fieldData, []byte("UserB does not accept private messages.")),
+                                               NewField(fieldData, []byte("UserB does not accept private chats.")),

                                                NewField(fieldUserName, []byte("UserB")),
                                                NewField(fieldUserID, []byte{0, 2}),
                                                NewField(fieldOptions, []byte{0, 2}),
                                                NewField(fieldUserName, []byte("UserB")),
                                                NewField(fieldUserID, []byte{0, 2}),
                                                NewField(fieldOptions, []byte{0, 2}),