X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/361928c9ad8945d525534e3d7178755f49ff6c1f..76d0c1f61d5981603389e6267bf62636f34bef1f:/hotline/transaction_handlers_test.go

diff --git a/hotline/transaction_handlers_test.go b/hotline/transaction_handlers_test.go
index 8898594..89ee9fc 100644
--- a/hotline/transaction_handlers_test.go
+++ b/hotline/transaction_handlers_test.go
@@ -73,8 +73,8 @@ func TestHandleSetChatSubject(t *testing.T) {
 					ID:        []byte{0, 0, 0, 1},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldChatID, []byte{0, 0, 0, 1}),
-						NewField(fieldChatSubject, []byte("Test Subject")),
+						NewField(FieldChatID, []byte{0, 0, 0, 1}),
+						NewField(FieldChatSubject, []byte("Test Subject")),
 					},
 				},
 			},
@@ -87,8 +87,8 @@ func TestHandleSetChatSubject(t *testing.T) {
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldChatID, []byte{0, 0, 0, 1}),
-						NewField(fieldChatSubject, []byte("Test Subject")),
+						NewField(FieldChatID, []byte{0, 0, 0, 1}),
+						NewField(FieldChatSubject, []byte("Test Subject")),
 					},
 				},
 				{
@@ -99,8 +99,8 @@ func TestHandleSetChatSubject(t *testing.T) {
 					ID:        []byte{0xf0, 0xc5, 0x34, 0x1e}, // Random ID from rand.Seed(1)
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldChatID, []byte{0, 0, 0, 1}),
-						NewField(fieldChatSubject, []byte("Test Subject")),
+						NewField(FieldChatID, []byte{0, 0, 0, 1}),
+						NewField(FieldChatSubject, []byte("Test Subject")),
 					},
 				},
 			},
@@ -174,7 +174,7 @@ func TestHandleLeaveChat(t *testing.T) {
 						},
 					},
 				},
-				t: NewTransaction(tranDeleteUser, nil, NewField(fieldChatID, []byte{0, 0, 0, 1})),
+				t: NewTransaction(TranDeleteUser, nil, NewField(FieldChatID, []byte{0, 0, 0, 1})),
 			},
 			want: []Transaction{
 				{
@@ -185,8 +185,8 @@ func TestHandleLeaveChat(t *testing.T) {
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldChatID, []byte{0, 0, 0, 1}),
-						NewField(fieldUserID, []byte{0, 2}),
+						NewField(FieldChatID, []byte{0, 0, 0, 1}),
+						NewField(FieldUserID, []byte{0, 2}),
 					},
 				},
 			},
@@ -232,21 +232,12 @@ func TestHandleGetUserNameList(t *testing.T) {
 								Icon:     []byte{0, 2},
 								Flags:    []byte{0, 3},
 								UserName: []byte{0, 4},
-								Agreed:   true,
 							},
 							uint16(2): {
 								ID:       &[]byte{0, 2},
 								Icon:     []byte{0, 2},
 								Flags:    []byte{0, 3},
 								UserName: []byte{0, 4},
-								Agreed:   true,
-							},
-							uint16(3): {
-								ID:       &[]byte{0, 3},
-								Icon:     []byte{0, 2},
-								Flags:    []byte{0, 3},
-								UserName: []byte{0, 4},
-								Agreed:   false,
 							},
 						},
 					},
@@ -261,16 +252,16 @@ func TestHandleGetUserNameList(t *testing.T) {
 					clientID:  &[]byte{1, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 1},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 1},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
 						NewField(
-							fieldUsernameWithInfo,
+							FieldUsernameWithInfo,
 							[]byte{00, 01, 00, 02, 00, 03, 00, 02, 00, 04},
 						),
 						NewField(
-							fieldUsernameWithInfo,
+							FieldUsernameWithInfo,
 							[]byte{00, 02, 00, 02, 00, 03, 00, 02, 00, 04},
 						),
 					},
@@ -333,7 +324,7 @@ func TestHandleChatSend(t *testing.T) {
 				},
 				t: &Transaction{
 					Fields: []Field{
-						NewField(fieldData, []byte("hai")),
+						NewField(FieldData, []byte("hai")),
 					},
 				},
 			},
@@ -346,7 +337,7 @@ func TestHandleChatSend(t *testing.T) {
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}),
+						NewField(FieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}),
 					},
 				},
 				{
@@ -357,7 +348,7 @@ func TestHandleChatSend(t *testing.T) {
 					ID:        []byte{0xf0, 0xc5, 0x34, 0x1e}, // Random ID from rand.Seed(1)
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}),
+						NewField(FieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}),
 					},
 				},
 			},
@@ -394,8 +385,8 @@ func TestHandleChatSend(t *testing.T) {
 				},
 				t: &Transaction{
 					Fields: []Field{
-						NewField(fieldData, []byte("hai")),
-						NewField(fieldChatID, []byte{0, 0, 0, 0}),
+						NewField(FieldData, []byte("hai")),
+						NewField(FieldChatID, []byte{0, 0, 0, 0}),
 					},
 				},
 			},
@@ -408,7 +399,7 @@ func TestHandleChatSend(t *testing.T) {
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}),
+						NewField(FieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}),
 					},
 				},
 				{
@@ -419,7 +410,7 @@ func TestHandleChatSend(t *testing.T) {
 					ID:        []byte{0xf0, 0xc5, 0x34, 0x1e}, // Random ID from rand.Seed(1)
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}),
+						NewField(FieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}),
 					},
 				},
 			},
@@ -440,26 +431,26 @@ func TestHandleChatSend(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranChatSend, &[]byte{0, 1},
-					NewField(fieldData, []byte("hai")),
+					TranChatSend, &[]byte{0, 1},
+					NewField(FieldData, []byte("hai")),
 				),
 			},
 			want: []Transaction{
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("You are not allowed to participate in chat.")),
+						NewField(FieldError, []byte("You are not allowed to participate in chat.")),
 					},
 				},
 			},
 			wantErr: false,
 		},
 		{
-			name: "sends chat msg as emote if fieldChatOptions is set",
+			name: "sends chat msg as emote if FieldChatOptions is set to 1",
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
@@ -489,8 +480,8 @@ func TestHandleChatSend(t *testing.T) {
 				},
 				t: &Transaction{
 					Fields: []Field{
-						NewField(fieldData, []byte("performed action")),
-						NewField(fieldChatOptions, []byte{0x00, 0x01}),
+						NewField(FieldData, []byte("performed action")),
+						NewField(FieldChatOptions, []byte{0x00, 0x01}),
 					},
 				},
 			},
@@ -503,7 +494,7 @@ func TestHandleChatSend(t *testing.T) {
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldData, []byte("\r*** Testy McTest performed action")),
+						NewField(FieldData, []byte("\r*** Testy McTest performed action")),
 					},
 				},
 				{
@@ -514,7 +505,69 @@ func TestHandleChatSend(t *testing.T) {
 					ID:        []byte{0xf0, 0xc5, 0x34, 0x1e},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldData, []byte("\r*** Testy McTest performed action")),
+						NewField(FieldData, []byte("\r*** Testy McTest performed action")),
+					},
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "does not send chat msg as emote if FieldChatOptions is set to 0",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							bits.Set(accessSendChat)
+							return bits
+						}(),
+					},
+					UserName: []byte("Testy McTest"),
+					Server: &Server{
+						Clients: map[uint16]*ClientConn{
+							uint16(1): {
+								Account: &Account{
+									Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
+								},
+								ID: &[]byte{0, 1},
+							},
+							uint16(2): {
+								Account: &Account{
+									Access: accessBitmap{255, 255, 255, 255, 255, 255, 255, 255},
+								},
+								ID: &[]byte{0, 2},
+							},
+						},
+					},
+				},
+				t: &Transaction{
+					Fields: []Field{
+						NewField(FieldData, []byte("hello")),
+						NewField(FieldChatOptions, []byte{0x00, 0x00}),
+					},
+				},
+			},
+			want: []Transaction{
+				{
+					clientID:  &[]byte{0, 1},
+					Flags:     0x00,
+					IsReply:   0x00,
+					Type:      []byte{0, 0x6a},
+					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
+					ErrorCode: []byte{0, 0, 0, 0},
+					Fields: []Field{
+						NewField(FieldData, []byte("\r Testy McTest:  hello")),
+					},
+				},
+				{
+					clientID:  &[]byte{0, 2},
+					Flags:     0x00,
+					IsReply:   0x00,
+					Type:      []byte{0, 0x6a},
+					ID:        []byte{0xf0, 0xc5, 0x34, 0x1e},
+					ErrorCode: []byte{0, 0, 0, 0},
+					Fields: []Field{
+						NewField(FieldData, []byte("\r Testy McTest:  hello")),
 					},
 				},
 			},
@@ -554,7 +607,7 @@ func TestHandleChatSend(t *testing.T) {
 				},
 				t: &Transaction{
 					Fields: []Field{
-						NewField(fieldData, []byte("hai")),
+						NewField(FieldData, []byte("hai")),
 					},
 				},
 			},
@@ -567,7 +620,7 @@ func TestHandleChatSend(t *testing.T) {
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}),
+						NewField(FieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}),
 					},
 				},
 			},
@@ -622,8 +675,8 @@ func TestHandleChatSend(t *testing.T) {
 				},
 				t: &Transaction{
 					Fields: []Field{
-						NewField(fieldData, []byte("hai")),
-						NewField(fieldChatID, []byte{0, 0, 0, 1}),
+						NewField(FieldData, []byte("hai")),
+						NewField(FieldChatID, []byte{0, 0, 0, 1}),
 					},
 				},
 			},
@@ -636,8 +689,8 @@ func TestHandleChatSend(t *testing.T) {
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldChatID, []byte{0, 0, 0, 1}),
-						NewField(fieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}),
+						NewField(FieldChatID, []byte{0, 0, 0, 1}),
+						NewField(FieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}),
 					},
 				},
 				{
@@ -648,8 +701,8 @@ func TestHandleChatSend(t *testing.T) {
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldChatID, []byte{0, 0, 0, 1}),
-						NewField(fieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}),
+						NewField(FieldChatID, []byte{0, 0, 0, 1}),
+						NewField(FieldData, []byte{0x0d, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x01, 0x3a, 0x20, 0x20, 0x68, 0x61, 0x69}),
 					},
 				},
 			},
@@ -698,9 +751,9 @@ func TestHandleGetFileInfo(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranGetFileInfo, nil,
-					NewField(fieldFileName, []byte("testfile.txt")),
-					NewField(fieldFilePath, []byte{0x00, 0x00}),
+					TranGetFileInfo, nil,
+					NewField(FieldFileName, []byte("testfile.txt")),
+					NewField(FieldFilePath, []byte{0x00, 0x00}),
 				),
 			},
 			wantRes: []Transaction{
@@ -708,18 +761,18 @@ func TestHandleGetFileInfo(t *testing.T) {
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0xce},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldFileName, []byte("testfile.txt")),
-						NewField(fieldFileTypeString, []byte("Text File")),
-						NewField(fieldFileCreatorString, []byte("ttxt")),
-						NewField(fieldFileComment, []byte{}),
-						NewField(fieldFileType, []byte("TEXT")),
-						NewField(fieldFileCreateDate, make([]byte, 8)),
-						NewField(fieldFileModifyDate, make([]byte, 8)),
-						NewField(fieldFileSize, []byte{0x0, 0x0, 0x0, 0x17}),
+						NewField(FieldFileName, []byte("testfile.txt")),
+						NewField(FieldFileTypeString, []byte("Text File")),
+						NewField(FieldFileCreatorString, []byte("ttxt")),
+						NewField(FieldFileComment, []byte{}),
+						NewField(FieldFileType, []byte("TEXT")),
+						NewField(FieldFileCreateDate, make([]byte, 8)),
+						NewField(FieldFileModifyDate, make([]byte, 8)),
+						NewField(FieldFileSize, []byte{0x0, 0x0, 0x0, 0x17}),
 					},
 				},
 			},
@@ -778,11 +831,11 @@ func TestHandleNewFolder(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("You are not allowed to create folders.")),
+						NewField(FieldError, []byte("You are not allowed to create folders.")),
 					},
 				},
 			},
@@ -813,9 +866,9 @@ func TestHandleNewFolder(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranNewFolder, &[]byte{0, 1},
-					NewField(fieldFileName, []byte("testFolder")),
-					NewField(fieldFilePath, []byte{
+					TranNewFolder, &[]byte{0, 1},
+					NewField(FieldFileName, []byte("testFolder")),
+					NewField(FieldFilePath, []byte{
 						0x00, 0x01,
 						0x00, 0x00,
 						0x03,
@@ -828,7 +881,7 @@ func TestHandleNewFolder(t *testing.T) {
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0xcd},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
 					ErrorCode: []byte{0, 0, 0, 0},
 				},
@@ -860,8 +913,8 @@ func TestHandleNewFolder(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranNewFolder, &[]byte{0, 1},
-					NewField(fieldFileName, []byte("testFolder")),
+					TranNewFolder, &[]byte{0, 1},
+					NewField(FieldFileName, []byte("testFolder")),
 				),
 			},
 			wantRes: []Transaction{
@@ -869,7 +922,7 @@ func TestHandleNewFolder(t *testing.T) {
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0xcd},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
 					ErrorCode: []byte{0, 0, 0, 0},
 				},
@@ -901,9 +954,9 @@ func TestHandleNewFolder(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranNewFolder, &[]byte{0, 1},
-					NewField(fieldFileName, []byte("testFolder")),
-					NewField(fieldFilePath, []byte{
+					TranNewFolder, &[]byte{0, 1},
+					NewField(FieldFileName, []byte("testFolder")),
+					NewField(FieldFilePath, []byte{
 						0x00,
 					}),
 				),
@@ -912,7 +965,7 @@ func TestHandleNewFolder(t *testing.T) {
 			wantErr: true,
 		},
 		{
-			name: "fieldFileName does not allow directory traversal",
+			name: "FieldFileName does not allow directory traversal",
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
@@ -936,8 +989,8 @@ func TestHandleNewFolder(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranNewFolder, &[]byte{0, 1},
-					NewField(fieldFileName, []byte("../../testFolder")),
+					TranNewFolder, &[]byte{0, 1},
+					NewField(FieldFileName, []byte("../../testFolder")),
 				),
 			},
 			wantRes: []Transaction{
@@ -945,14 +998,14 @@ func TestHandleNewFolder(t *testing.T) {
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0xcd},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
 					ErrorCode: []byte{0, 0, 0, 0},
 				},
 			}, wantErr: false,
 		},
 		{
-			name: "fieldFilePath does not allow directory traversal",
+			name: "FieldFilePath does not allow directory traversal",
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
@@ -976,9 +1029,9 @@ func TestHandleNewFolder(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranNewFolder, &[]byte{0, 1},
-					NewField(fieldFileName, []byte("testFolder")),
-					NewField(fieldFilePath, []byte{
+					TranNewFolder, &[]byte{0, 1},
+					NewField(FieldFileName, []byte("testFolder")),
+					NewField(FieldFilePath, []byte{
 						0x00, 0x02,
 						0x00, 0x00,
 						0x03,
@@ -994,7 +1047,7 @@ func TestHandleNewFolder(t *testing.T) {
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0xcd},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42}, // Random ID from rand.Seed(1)
 					ErrorCode: []byte{0, 0, 0, 0},
 				},
@@ -1003,7 +1056,6 @@ func TestHandleNewFolder(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-
 			gotRes, err := HandleNewFolder(tt.args.cc, tt.args.t)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("HandleNewFolder() error = %v, wantErr %v", err, tt.wantErr)
@@ -1051,9 +1103,9 @@ func TestHandleUploadFile(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranUploadFile, &[]byte{0, 1},
-					NewField(fieldFileName, []byte("testFile")),
-					NewField(fieldFilePath, []byte{
+					TranUploadFile, &[]byte{0, 1},
+					NewField(FieldFileName, []byte("testFile")),
+					NewField(FieldFilePath, []byte{
 						0x00, 0x01,
 						0x00, 0x00,
 						0x03,
@@ -1065,11 +1117,11 @@ func TestHandleUploadFile(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0xcb},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldRefNum, []byte{0x52, 0xfd, 0xfc, 0x07}), // rand.Seed(1)
+						NewField(FieldRefNum, []byte{0x52, 0xfd, 0xfc, 0x07}), // rand.Seed(1)
 					},
 				},
 			},
@@ -1087,9 +1139,9 @@ func TestHandleUploadFile(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranUploadFile, &[]byte{0, 1},
-					NewField(fieldFileName, []byte("testFile")),
-					NewField(fieldFilePath, []byte{
+					TranUploadFile, &[]byte{0, 1},
+					NewField(FieldFileName, []byte("testFile")),
+					NewField(FieldFilePath, []byte{
 						0x00, 0x01,
 						0x00, 0x00,
 						0x03,
@@ -1101,11 +1153,11 @@ func TestHandleUploadFile(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("You are not allowed to upload files.")), // rand.Seed(1)
+						NewField(FieldError, []byte("You are not allowed to upload files.")), // rand.Seed(1)
 					},
 				},
 			},
@@ -1122,7 +1174,6 @@ func TestHandleUploadFile(t *testing.T) {
 			}
 
 			tranAssertEqual(t, tt.wantRes, gotRes)
-
 		})
 	}
 }
@@ -1171,17 +1222,17 @@ func TestHandleMakeAlias(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranMakeFileAlias, &[]byte{0, 1},
-					NewField(fieldFileName, []byte("testFile")),
-					NewField(fieldFilePath, EncodeFilePath(strings.Join([]string{"foo"}, "/"))),
-					NewField(fieldFileNewPath, EncodeFilePath(strings.Join([]string{"bar"}, "/"))),
+					TranMakeFileAlias, &[]byte{0, 1},
+					NewField(FieldFileName, []byte("testFile")),
+					NewField(FieldFilePath, EncodeFilePath(strings.Join([]string{"foo"}, "/"))),
+					NewField(FieldFileNewPath, EncodeFilePath(strings.Join([]string{"bar"}, "/"))),
 				),
 			},
 			wantRes: []Transaction{
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0xd1},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields:    []Field(nil),
@@ -1222,21 +1273,21 @@ func TestHandleMakeAlias(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranMakeFileAlias, &[]byte{0, 1},
-					NewField(fieldFileName, []byte("testFile")),
-					NewField(fieldFilePath, EncodeFilePath(strings.Join([]string{"foo"}, "/"))),
-					NewField(fieldFileNewPath, EncodeFilePath(strings.Join([]string{"bar"}, "/"))),
+					TranMakeFileAlias, &[]byte{0, 1},
+					NewField(FieldFileName, []byte("testFile")),
+					NewField(FieldFilePath, EncodeFilePath(strings.Join([]string{"foo"}, "/"))),
+					NewField(FieldFileNewPath, EncodeFilePath(strings.Join([]string{"bar"}, "/"))),
 				),
 			},
 			wantRes: []Transaction{
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("Error creating alias")),
+						NewField(FieldError, []byte("Error creating alias")),
 					},
 				},
 			},
@@ -1263,15 +1314,15 @@ func TestHandleMakeAlias(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranMakeFileAlias, &[]byte{0, 1},
-					NewField(fieldFileName, []byte("testFile")),
-					NewField(fieldFilePath, []byte{
+					TranMakeFileAlias, &[]byte{0, 1},
+					NewField(FieldFileName, []byte("testFile")),
+					NewField(FieldFilePath, []byte{
 						0x00, 0x01,
 						0x00, 0x00,
 						0x03,
 						0x2e, 0x2e, 0x2e,
 					}),
-					NewField(fieldFileNewPath, []byte{
+					NewField(FieldFileNewPath, []byte{
 						0x00, 0x01,
 						0x00, 0x00,
 						0x03,
@@ -1283,11 +1334,11 @@ func TestHandleMakeAlias(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("You are not allowed to make aliases.")),
+						NewField(FieldError, []byte("You are not allowed to make aliases.")),
 					},
 				},
 			},
@@ -1341,22 +1392,22 @@ func TestHandleGetUser(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranGetUser, &[]byte{0, 1},
-					NewField(fieldUserLogin, []byte("guest")),
+					TranGetUser, &[]byte{0, 1},
+					NewField(FieldUserLogin, []byte("guest")),
 				),
 			},
 			wantRes: []Transaction{
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0x01, 0x60},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldUserName, []byte("Guest")),
-						NewField(fieldUserLogin, negateString([]byte("guest"))),
-						NewField(fieldUserPassword, []byte("password")),
-						NewField(fieldUserAccess, []byte{0, 0, 0, 0, 0, 0, 0, 0}),
+						NewField(FieldUserName, []byte("Guest")),
+						NewField(FieldUserLogin, encodeString([]byte("guest"))),
+						NewField(FieldUserPassword, []byte("password")),
+						NewField(FieldUserAccess, []byte{0, 0, 0, 0, 0, 0, 0, 0}),
 					},
 				},
 			},
@@ -1377,19 +1428,19 @@ func TestHandleGetUser(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranGetUser, &[]byte{0, 1},
-					NewField(fieldUserLogin, []byte("nonExistentUser")),
+					TranGetUser, &[]byte{0, 1},
+					NewField(FieldUserLogin, []byte("nonExistentUser")),
 				),
 			},
 			wantRes: []Transaction{
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("You are not allowed to view accounts.")),
+						NewField(FieldError, []byte("You are not allowed to view accounts.")),
 					},
 				},
 			},
@@ -1411,19 +1462,19 @@ func TestHandleGetUser(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranGetUser, &[]byte{0, 1},
-					NewField(fieldUserLogin, []byte("nonExistentUser")),
+					TranGetUser, &[]byte{0, 1},
+					NewField(FieldUserLogin, []byte("nonExistentUser")),
 				),
 			},
 			wantRes: []Transaction{
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("Account does not exist.")),
+						NewField(FieldError, []byte("Account does not exist.")),
 					},
 				},
 			},
@@ -1481,15 +1532,15 @@ func TestHandleDeleteUser(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranDeleteUser, &[]byte{0, 1},
-					NewField(fieldUserLogin, negateString([]byte("testuser"))),
+					TranDeleteUser, &[]byte{0, 1},
+					NewField(FieldUserLogin, encodeString([]byte("testuser"))),
 				),
 			},
 			wantRes: []Transaction{
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0x1, 0x5f},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields:    []Field(nil),
@@ -1512,19 +1563,19 @@ func TestHandleDeleteUser(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranDeleteUser, &[]byte{0, 1},
-					NewField(fieldUserLogin, negateString([]byte("testuser"))),
+					TranDeleteUser, &[]byte{0, 1},
+					NewField(FieldUserLogin, encodeString([]byte("testuser"))),
 				),
 			},
 			wantRes: []Transaction{
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("You are not allowed to delete accounts.")),
+						NewField(FieldError, []byte("You are not allowed to delete accounts.")),
 					},
 				},
 			},
@@ -1570,18 +1621,18 @@ func TestHandleGetMsgs(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranGetMsgs, &[]byte{0, 1},
+					TranGetMsgs, &[]byte{0, 1},
 				),
 			},
 			wantRes: []Transaction{
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x65},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldData, []byte("TEST")),
+						NewField(FieldData, []byte("TEST")),
 					},
 				},
 			},
@@ -1602,18 +1653,18 @@ func TestHandleGetMsgs(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranGetMsgs, &[]byte{0, 1},
+					TranGetMsgs, &[]byte{0, 1},
 				),
 			},
 			wantRes: []Transaction{
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("You are not allowed to read news.")),
+						NewField(FieldError, []byte("You are not allowed to read news.")),
 					},
 				},
 			},
@@ -1658,18 +1709,18 @@ func TestHandleNewUser(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranNewUser, &[]byte{0, 1},
+					TranNewUser, &[]byte{0, 1},
 				),
 			},
 			wantRes: []Transaction{
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("You are not allowed to create new accounts.")),
+						NewField(FieldError, []byte("You are not allowed to create new accounts.")),
 					},
 				},
 			},
@@ -1691,10 +1742,10 @@ func TestHandleNewUser(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranNewUser, &[]byte{0, 1},
-					NewField(fieldUserLogin, []byte("userB")),
+					TranNewUser, &[]byte{0, 1},
+					NewField(FieldUserLogin, []byte("userB")),
 					NewField(
-						fieldUserAccess,
+						FieldUserAccess,
 						func() []byte {
 							var bits accessBitmap
 							bits.Set(accessDisconUser)
@@ -1707,11 +1758,11 @@ func TestHandleNewUser(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("Cannot create account with more access than yourself.")),
+						NewField(FieldError, []byte("Cannot create account with more access than yourself.")),
 					},
 				},
 			},
@@ -1756,18 +1807,18 @@ func TestHandleListUsers(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranNewUser, &[]byte{0, 1},
+					TranNewUser, &[]byte{0, 1},
 				),
 			},
 			wantRes: []Transaction{
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("You are not allowed to view accounts.")),
+						NewField(FieldError, []byte("You are not allowed to view accounts.")),
 					},
 				},
 			},
@@ -1796,19 +1847,19 @@ func TestHandleListUsers(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranGetClientInfoText, &[]byte{0, 1},
-					NewField(fieldUserID, []byte{0, 1}),
+					TranGetClientInfoText, &[]byte{0, 1},
+					NewField(FieldUserID, []byte{0, 1}),
 				),
 			},
 			wantRes: []Transaction{
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0x01, 0x2f},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldData, []byte{
+						NewField(FieldData, []byte{
 							0x00, 0x04, 0x00, 0x66, 0x00, 0x05, 0x67, 0x75, 0x65, 0x73, 0x74, 0x00, 0x69, 0x00, 0x05, 0x98,
 							0x8a, 0x9a, 0x8c, 0x8b, 0x00, 0x6e, 0x00, 0x08, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 							0x00, 0x6a, 0x00, 0x01, 0x78,
@@ -1854,17 +1905,17 @@ func TestHandleDownloadFile(t *testing.T) {
 					},
 					Server: &Server{},
 				},
-				t: NewTransaction(tranDownloadFile, &[]byte{0, 1}),
+				t: NewTransaction(TranDownloadFile, &[]byte{0, 1}),
 			},
 			wantRes: []Transaction{
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("You are not allowed to download files.")),
+						NewField(FieldError, []byte("You are not allowed to download files.")),
 					},
 				},
 			},
@@ -1896,22 +1947,22 @@ func TestHandleDownloadFile(t *testing.T) {
 				t: NewTransaction(
 					accessDownloadFile,
 					&[]byte{0, 1},
-					NewField(fieldFileName, []byte("testfile.txt")),
-					NewField(fieldFilePath, []byte{0x0, 0x00}),
+					NewField(FieldFileName, []byte("testfile.txt")),
+					NewField(FieldFilePath, []byte{0x0, 0x00}),
 				),
 			},
 			wantRes: []Transaction{
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x2},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldRefNum, []byte{0x52, 0xfd, 0xfc, 0x07}),
-						NewField(fieldWaitingCount, []byte{0x00, 0x00}),
-						NewField(fieldTransferSize, []byte{0x00, 0x00, 0x00, 0xa5}),
-						NewField(fieldFileSize, []byte{0x00, 0x00, 0x00, 0x17}),
+						NewField(FieldRefNum, []byte{0x52, 0xfd, 0xfc, 0x07}),
+						NewField(FieldWaitingCount, []byte{0x00, 0x00}),
+						NewField(FieldTransferSize, []byte{0x00, 0x00, 0x00, 0xa5}),
+						NewField(FieldFileSize, []byte{0x00, 0x00, 0x00, 0x17}),
 					},
 				},
 			},
@@ -1960,10 +2011,10 @@ func TestHandleDownloadFile(t *testing.T) {
 				t: NewTransaction(
 					accessDownloadFile,
 					&[]byte{0, 1},
-					NewField(fieldFileName, []byte("testfile-1k")),
-					NewField(fieldFilePath, []byte{0x00, 0x00}),
+					NewField(FieldFileName, []byte("testfile-1k")),
+					NewField(FieldFilePath, []byte{0x00, 0x00}),
 					NewField(
-						fieldFileResumeData,
+						FieldFileResumeData,
 						func() []byte {
 							frd := FileResumeData{
 								Format:    [4]byte{},
@@ -1995,14 +2046,14 @@ func TestHandleDownloadFile(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x2},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldRefNum, []byte{0x52, 0xfd, 0xfc, 0x07}),
-						NewField(fieldWaitingCount, []byte{0x00, 0x00}),
-						NewField(fieldTransferSize, []byte{0x00, 0x00, 0x03, 0x8d}),
-						NewField(fieldFileSize, []byte{0x00, 0x00, 0x03, 0x00}),
+						NewField(FieldRefNum, []byte{0x52, 0xfd, 0xfc, 0x07}),
+						NewField(FieldWaitingCount, []byte{0x00, 0x00}),
+						NewField(FieldTransferSize, []byte{0x00, 0x00, 0x03, 0x8d}),
+						NewField(FieldFileSize, []byte{0x00, 0x00, 0x03, 0x00}),
 					},
 				},
 			},
@@ -2048,24 +2099,24 @@ func TestHandleUpdateUser(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranUpdateUser,
+					TranUpdateUser,
 					&[]byte{0, 0},
-					NewField(fieldData, []byte{
+					NewField(FieldData, []byte{
 						0x00, 0x04, // field count
 
-						0x00, 0x69, // fieldUserLogin = 105
+						0x00, 0x69, // FieldUserLogin = 105
 						0x00, 0x03,
 						0x9d, 0x9d, 0x9d,
 
-						0x00, 0x6a, // fieldUserPassword = 106
+						0x00, 0x6a, // FieldUserPassword = 106
 						0x00, 0x03,
 						0x9c, 0x9c, 0x9c,
 
-						0x00, 0x66, // fieldUserName = 102
+						0x00, 0x66, // FieldUserName = 102
 						0x00, 0x03,
 						0x61, 0x61, 0x61,
 
-						0x00, 0x6e, // fieldUserAccess = 110
+						0x00, 0x6e, // FieldUserAccess = 110
 						0x00, 0x08,
 						0x60, 0x70, 0x0c, 0x20, 0x03, 0x80, 0x00, 0x00,
 					}),
@@ -2075,11 +2126,11 @@ func TestHandleUpdateUser(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("You are not allowed to create new accounts.")),
+						NewField(FieldError, []byte("You are not allowed to create new accounts.")),
 					},
 				},
 			},
@@ -2104,24 +2155,24 @@ func TestHandleUpdateUser(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranUpdateUser,
+					TranUpdateUser,
 					&[]byte{0, 0},
-					NewField(fieldData, []byte{
+					NewField(FieldData, []byte{
 						0x00, 0x04, // field count
 
-						0x00, 0x69, // fieldUserLogin = 105
+						0x00, 0x69, // FieldUserLogin = 105
 						0x00, 0x03,
 						0x9d, 0x9d, 0x9d,
 
-						0x00, 0x6a, // fieldUserPassword = 106
+						0x00, 0x6a, // FieldUserPassword = 106
 						0x00, 0x03,
 						0x9c, 0x9c, 0x9c,
 
-						0x00, 0x66, // fieldUserName = 102
+						0x00, 0x66, // FieldUserName = 102
 						0x00, 0x03,
 						0x61, 0x61, 0x61,
 
-						0x00, 0x6e, // fieldUserAccess = 110
+						0x00, 0x6e, // FieldUserAccess = 110
 						0x00, 0x08,
 						0x60, 0x70, 0x0c, 0x20, 0x03, 0x80, 0x00, 0x00,
 					}),
@@ -2131,11 +2182,11 @@ func TestHandleUpdateUser(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("You are not allowed to modify accounts.")),
+						NewField(FieldError, []byte("You are not allowed to modify accounts.")),
 					},
 				},
 			},
@@ -2159,9 +2210,9 @@ func TestHandleUpdateUser(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranUpdateUser,
+					TranUpdateUser,
 					&[]byte{0, 0},
-					NewField(fieldData, []byte{
+					NewField(FieldData, []byte{
 						0x00, 0x01,
 						0x00, 0x65,
 						0x00, 0x03,
@@ -2173,11 +2224,11 @@ func TestHandleUpdateUser(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("You are not allowed to delete accounts.")),
+						NewField(FieldError, []byte("You are not allowed to delete accounts.")),
 					},
 				},
 			},
@@ -2219,7 +2270,7 @@ func TestHandleDelNewsArt(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranDelNewsArt,
+					TranDelNewsArt,
 					&[]byte{0, 0},
 				),
 			},
@@ -2227,11 +2278,11 @@ func TestHandleDelNewsArt(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("You are not allowed to delete news articles.")),
+						NewField(FieldError, []byte("You are not allowed to delete news articles.")),
 					},
 				},
 			},
@@ -2272,7 +2323,7 @@ func TestHandleDisconnectUser(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranDelNewsArt,
+					TranDelNewsArt,
 					&[]byte{0, 0},
 				),
 			},
@@ -2280,11 +2331,11 @@ func TestHandleDisconnectUser(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("You are not allowed to disconnect users.")),
+						NewField(FieldError, []byte("You are not allowed to disconnect users.")),
 					},
 				},
 			},
@@ -2317,20 +2368,20 @@ func TestHandleDisconnectUser(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranDelNewsArt,
+					TranDelNewsArt,
 					&[]byte{0, 0},
-					NewField(fieldUserID, []byte{0, 1}),
+					NewField(FieldUserID, []byte{0, 1}),
 				),
 			},
 			wantRes: []Transaction{
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("unnamed is not allowed to be disconnected.")),
+						NewField(FieldError, []byte("unnamed is not allowed to be disconnected.")),
 					},
 				},
 			},
@@ -2371,7 +2422,7 @@ func TestHandleSendInstantMsg(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranDelNewsArt,
+					TranDelNewsArt,
 					&[]byte{0, 0},
 				),
 			},
@@ -2379,15 +2430,15 @@ func TestHandleSendInstantMsg(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("You are not allowed to send private messages.")),
+						NewField(FieldError, []byte("You are not allowed to send private messages.")),
 					},
 				},
 			},
-			wantErr: assert.NoError,
+			wantErr: assert.Error,
 		},
 		{
 			name: "when client 1 sends a message to client 2",
@@ -2412,26 +2463,26 @@ func TestHandleSendInstantMsg(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranSendInstantMsg,
+					TranSendInstantMsg,
 					&[]byte{0, 1},
-					NewField(fieldData, []byte("hai")),
-					NewField(fieldUserID, []byte{0, 2}),
+					NewField(FieldData, []byte("hai")),
+					NewField(FieldUserID, []byte{0, 2}),
 				),
 			},
 			wantRes: []Transaction{
 				*NewTransaction(
-					tranServerMsg,
+					TranServerMsg,
 					&[]byte{0, 2},
-					NewField(fieldData, []byte("hai")),
-					NewField(fieldUserName, []byte("User1")),
-					NewField(fieldUserID, []byte{0, 1}),
-					NewField(fieldOptions, []byte{0, 1}),
+					NewField(FieldData, []byte("hai")),
+					NewField(FieldUserName, []byte("User1")),
+					NewField(FieldUserID, []byte{0, 1}),
+					NewField(FieldOptions, []byte{0, 1}),
 				),
 				{
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0x0, 0x6c},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields:    []Field(nil),
@@ -2464,34 +2515,34 @@ func TestHandleSendInstantMsg(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranSendInstantMsg,
+					TranSendInstantMsg,
 					&[]byte{0, 1},
-					NewField(fieldData, []byte("hai")),
-					NewField(fieldUserID, []byte{0, 2}),
+					NewField(FieldData, []byte("hai")),
+					NewField(FieldUserID, []byte{0, 2}),
 				),
 			},
 			wantRes: []Transaction{
 				*NewTransaction(
-					tranServerMsg,
+					TranServerMsg,
 					&[]byte{0, 2},
-					NewField(fieldData, []byte("hai")),
-					NewField(fieldUserName, []byte("User1")),
-					NewField(fieldUserID, []byte{0, 1}),
-					NewField(fieldOptions, []byte{0, 1}),
+					NewField(FieldData, []byte("hai")),
+					NewField(FieldUserName, []byte("User1")),
+					NewField(FieldUserID, []byte{0, 1}),
+					NewField(FieldOptions, []byte{0, 1}),
 				),
 				*NewTransaction(
-					tranServerMsg,
+					TranServerMsg,
 					&[]byte{0, 1},
-					NewField(fieldData, []byte("autohai")),
-					NewField(fieldUserName, []byte("User2")),
-					NewField(fieldUserID, []byte{0, 2}),
-					NewField(fieldOptions, []byte{0, 1}),
+					NewField(FieldData, []byte("autohai")),
+					NewField(FieldUserName, []byte("User2")),
+					NewField(FieldUserID, []byte{0, 2}),
+					NewField(FieldOptions, []byte{0, 1}),
 				),
 				{
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0x0, 0x6c},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields:    []Field(nil),
@@ -2523,26 +2574,26 @@ func TestHandleSendInstantMsg(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranSendInstantMsg,
+					TranSendInstantMsg,
 					&[]byte{0, 1},
-					NewField(fieldData, []byte("hai")),
-					NewField(fieldUserID, []byte{0, 2}),
+					NewField(FieldData, []byte("hai")),
+					NewField(FieldUserID, []byte{0, 2}),
 				),
 			},
 			wantRes: []Transaction{
 				*NewTransaction(
-					tranServerMsg,
+					TranServerMsg,
 					&[]byte{0, 1},
-					NewField(fieldData, []byte("User2 does not accept private messages.")),
-					NewField(fieldUserName, []byte("User2")),
-					NewField(fieldUserID, []byte{0, 2}),
-					NewField(fieldOptions, []byte{0, 2}),
+					NewField(FieldData, []byte("User2 does not accept private messages.")),
+					NewField(FieldUserName, []byte("User2")),
+					NewField(FieldUserID, []byte{0, 2}),
+					NewField(FieldOptions, []byte{0, 2}),
 				),
 				{
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0x0, 0x6c},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields:    []Field(nil),
@@ -2609,9 +2660,9 @@ func TestHandleDeleteFile(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranDeleteFile, &[]byte{0, 1},
-					NewField(fieldFileName, []byte("testfile")),
-					NewField(fieldFilePath, []byte{
+					TranDeleteFile, &[]byte{0, 1},
+					NewField(FieldFileName, []byte("testfile")),
+					NewField(FieldFilePath, []byte{
 						0x00, 0x01,
 						0x00, 0x00,
 						0x03,
@@ -2623,11 +2674,11 @@ func TestHandleDeleteFile(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("You are not allowed to delete files.")),
+						NewField(FieldError, []byte("You are not allowed to delete files.")),
 					},
 				},
 			},
@@ -2674,9 +2725,9 @@ func TestHandleDeleteFile(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranDeleteFile, &[]byte{0, 1},
-					NewField(fieldFileName, []byte("testfile")),
-					NewField(fieldFilePath, []byte{
+					TranDeleteFile, &[]byte{0, 1},
+					NewField(FieldFileName, []byte("testfile")),
+					NewField(FieldFilePath, []byte{
 						0x00, 0x01,
 						0x00, 0x00,
 						0x03,
@@ -2688,7 +2739,7 @@ func TestHandleDeleteFile(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0x0, 0xcc},
+					Type:      []byte{0, 0},
 					ID:        []byte{0x0, 0x0, 0x0, 0x0},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields:    []Field(nil),
@@ -2723,7 +2774,7 @@ func TestHandleGetFileNameList(t *testing.T) {
 		wantErr assert.ErrorAssertionFunc
 	}{
 		{
-			name: "when fieldFilePath is a drop box, but user does not have accessViewDropBoxes ",
+			name: "when FieldFilePath is a drop box, but user does not have accessViewDropBoxes ",
 			args: args{
 				cc: &ClientConn{
 					Account: &Account{
@@ -2743,8 +2794,8 @@ func TestHandleGetFileNameList(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranGetFileNameList, &[]byte{0, 1},
-					NewField(fieldFilePath, []byte{
+					TranGetFileNameList, &[]byte{0, 1},
+					NewField(FieldFilePath, []byte{
 						0x00, 0x01,
 						0x00, 0x00,
 						0x08,
@@ -2756,11 +2807,11 @@ func TestHandleGetFileNameList(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("You are not allowed to view drop boxes.")),
+						NewField(FieldError, []byte("You are not allowed to view drop boxes.")),
 					},
 				},
 			},
@@ -2780,8 +2831,8 @@ func TestHandleGetFileNameList(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranGetFileNameList, &[]byte{0, 1},
-					NewField(fieldFilePath, []byte{
+					TranGetFileNameList, &[]byte{0, 1},
+					NewField(FieldFilePath, []byte{
 						0x00, 0x00,
 						0x00, 0x00,
 					}),
@@ -2791,12 +2842,12 @@ func TestHandleGetFileNameList(t *testing.T) {
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0xc8},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
 						NewField(
-							fieldFileNameWithInfo,
+							FieldFileNameWithInfo,
 							func() []byte {
 								fnwi := FileNameWithInfo{
 									fileNameWithInfoHeader: fileNameWithInfoHeader{
@@ -2857,19 +2908,19 @@ func TestHandleGetClientInfoText(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranGetClientInfoText, &[]byte{0, 1},
-					NewField(fieldUserID, []byte{0, 1}),
+					TranGetClientInfoText, &[]byte{0, 1},
+					NewField(FieldUserID, []byte{0, 1}),
 				),
 			},
 			wantRes: []Transaction{
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("You are not allowed to get client info.")),
+						NewField(FieldError, []byte("You are not allowed to get client info.")),
 					},
 				},
 			},
@@ -2916,20 +2967,20 @@ func TestHandleGetClientInfoText(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranGetClientInfoText, &[]byte{0, 1},
-					NewField(fieldUserID, []byte{0, 1}),
+					TranGetClientInfoText, &[]byte{0, 1},
+					NewField(FieldUserID, []byte{0, 1}),
 				),
 			},
 			wantRes: []Transaction{
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0x1, 0x2f},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldData, []byte(
-							strings.Replace(`Nickname:   Testy McTest
+						NewField(FieldData, []byte(
+							strings.ReplaceAll(`Nickname:   Testy McTest
 Name:       test
 Account:    test
 Address:    1.2.3.4:12345
@@ -2954,9 +3005,9 @@ None.
 
 None.
 
-`, "\n", "\r", -1)),
+`, "\n", "\r")),
 						),
-						NewField(fieldUserName, []byte("Testy McTest")),
+						NewField(FieldUserName, []byte("Testy McTest")),
 					},
 				},
 			},
@@ -3008,10 +3059,10 @@ func TestHandleTranAgreed(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranAgreed, nil,
-					NewField(fieldUserName, []byte("username")),
-					NewField(fieldUserIconID, []byte{0, 1}),
-					NewField(fieldOptions, []byte{0, 0}),
+					TranAgreed, nil,
+					NewField(FieldUserName, []byte("username")),
+					NewField(FieldUserIconID, []byte{0, 1}),
+					NewField(FieldOptions, []byte{0, 0}),
 				),
 			},
 			wantRes: []Transaction{
@@ -3023,14 +3074,14 @@ func TestHandleTranAgreed(t *testing.T) {
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldBannerType, []byte("JPEG")),
+						NewField(FieldBannerType, []byte("JPEG")),
 					},
 				},
 				{
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x79},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields:    []Field{},
@@ -3083,9 +3134,9 @@ func TestHandleSetClientUserInfo(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranSetClientUserInfo, nil,
-					NewField(fieldUserIconID, []byte{0, 1}),
-					NewField(fieldUserName, []byte("NOPE")),
+					TranSetClientUserInfo, nil,
+					NewField(FieldUserIconID, []byte{0, 1}),
+					NewField(FieldUserName, []byte("NOPE")),
 				),
 			},
 			wantRes: []Transaction{
@@ -3097,10 +3148,10 @@ func TestHandleSetClientUserInfo(t *testing.T) {
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldUserID, []byte{0, 1}),
-						NewField(fieldUserIconID, []byte{0, 1}),
-						NewField(fieldUserFlags, []byte{0, 1}),
-						NewField(fieldUserName, []byte("Guest"))},
+						NewField(FieldUserID, []byte{0, 1}),
+						NewField(FieldUserIconID, []byte{0, 1}),
+						NewField(FieldUserFlags, []byte{0, 1}),
+						NewField(FieldUserName, []byte("Guest"))},
 				},
 			},
 			wantErr: assert.NoError,
@@ -3149,8 +3200,8 @@ func TestHandleDelNewsItem(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranDelNewsItem, nil,
-					NewField(fieldNewsPath,
+					TranDelNewsItem, nil,
+					NewField(FieldNewsPath,
 						[]byte{
 							0, 1,
 							0, 0,
@@ -3165,11 +3216,11 @@ func TestHandleDelNewsItem(t *testing.T) {
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("You are not allowed to delete news categories.")),
+						NewField(FieldError, []byte("You are not allowed to delete news categories.")),
 					},
 				},
 			},
@@ -3195,8 +3246,8 @@ func TestHandleDelNewsItem(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranDelNewsItem, nil,
-					NewField(fieldNewsPath,
+					TranDelNewsItem, nil,
+					NewField(FieldNewsPath,
 						[]byte{
 							0, 1,
 							0, 0,
@@ -3211,11 +3262,11 @@ func TestHandleDelNewsItem(t *testing.T) {
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("You are not allowed to delete news folders.")),
+						NewField(FieldError, []byte("You are not allowed to delete news folders.")),
 					},
 				},
 			},
@@ -3251,8 +3302,8 @@ func TestHandleDelNewsItem(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranDelNewsItem, nil,
-					NewField(fieldNewsPath,
+					TranDelNewsItem, nil,
+					NewField(FieldNewsPath,
 						[]byte{
 							0, 1,
 							0, 0,
@@ -3267,7 +3318,7 @@ func TestHandleDelNewsItem(t *testing.T) {
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0x01, 0x7c},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields:    []Field{},
@@ -3322,19 +3373,19 @@ func TestHandleDownloadBanner(t *testing.T) {
 						}(),
 					},
 				},
-				t: NewTransaction(tranDownloadBanner, nil),
+				t: NewTransaction(TranDownloadBanner, nil),
 			},
 			wantRes: []Transaction{
 				{
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0x00, 0xd4},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldRefNum, []byte{1, 2, 3, 4}),
-						NewField(fieldTransferSize, []byte{0, 0, 0, 0x64}),
+						NewField(FieldRefNum, []byte{1, 2, 3, 4}),
+						NewField(FieldTransferSize, []byte{0, 0, 0, 0x64}),
 					},
 				},
 			},
@@ -3376,19 +3427,19 @@ func TestHandleTranOldPostNews(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranOldPostNews, &[]byte{0, 1},
-					NewField(fieldData, []byte("hai")),
+					TranOldPostNews, &[]byte{0, 1},
+					NewField(FieldData, []byte("hai")),
 				),
 			},
 			wantRes: []Transaction{
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("You are not allowed to post news.")),
+						NewField(FieldError, []byte("You are not allowed to post news.")),
 					},
 				},
 			},
@@ -3416,15 +3467,15 @@ func TestHandleTranOldPostNews(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranOldPostNews, &[]byte{0, 1},
-					NewField(fieldData, []byte("hai")),
+					TranOldPostNews, &[]byte{0, 1},
+					NewField(FieldData, []byte("hai")),
 				),
 			},
 			wantRes: []Transaction{
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x67},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 0},
 				},
@@ -3466,17 +3517,17 @@ func TestHandleInviteNewChat(t *testing.T) {
 						}(),
 					},
 				},
-				t: NewTransaction(tranInviteNewChat, &[]byte{0, 1}),
+				t: NewTransaction(TranInviteNewChat, &[]byte{0, 1}),
 			},
 			wantRes: []Transaction{
 				{
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x00},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 1},
 					Fields: []Field{
-						NewField(fieldError, []byte("You are not allowed to request private chat.")),
+						NewField(FieldError, []byte("You are not allowed to request private chat.")),
 					},
 				},
 			},
@@ -3509,8 +3560,8 @@ func TestHandleInviteNewChat(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranInviteNewChat, &[]byte{0, 1},
-					NewField(fieldUserID, []byte{0, 2}),
+					TranInviteNewChat, &[]byte{0, 1},
+					NewField(FieldUserID, []byte{0, 2}),
 				),
 			},
 			wantRes: []Transaction{
@@ -3522,9 +3573,9 @@ func TestHandleInviteNewChat(t *testing.T) {
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldChatID, []byte{0x52, 0xfd, 0xfc, 0x07}),
-						NewField(fieldUserName, []byte("UserA")),
-						NewField(fieldUserID, []byte{0, 1}),
+						NewField(FieldChatID, []byte{0x52, 0xfd, 0xfc, 0x07}),
+						NewField(FieldUserName, []byte("UserA")),
+						NewField(FieldUserID, []byte{0, 1}),
 					},
 				},
 
@@ -3532,15 +3583,15 @@ func TestHandleInviteNewChat(t *testing.T) {
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x70},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldChatID, []byte{0x52, 0xfd, 0xfc, 0x07}),
-						NewField(fieldUserName, []byte("UserA")),
-						NewField(fieldUserID, []byte{0, 1}),
-						NewField(fieldUserIconID, []byte{0, 1}),
-						NewField(fieldUserFlags, []byte{0, 0}),
+						NewField(FieldChatID, []byte{0x52, 0xfd, 0xfc, 0x07}),
+						NewField(FieldUserName, []byte("UserA")),
+						NewField(FieldUserID, []byte{0, 1}),
+						NewField(FieldUserIconID, []byte{0, 1}),
+						NewField(FieldUserFlags, []byte{0, 0}),
 					},
 				},
 			},
@@ -3573,8 +3624,8 @@ func TestHandleInviteNewChat(t *testing.T) {
 					},
 				},
 				t: NewTransaction(
-					tranInviteNewChat, &[]byte{0, 1},
-					NewField(fieldUserID, []byte{0, 2}),
+					TranInviteNewChat, &[]byte{0, 1},
+					NewField(FieldUserID, []byte{0, 2}),
 				),
 			},
 			wantRes: []Transaction{
@@ -3586,25 +3637,25 @@ func TestHandleInviteNewChat(t *testing.T) {
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldData, []byte("UserB does not accept private chats.")),
-						NewField(fieldUserName, []byte("UserB")),
-						NewField(fieldUserID, []byte{0, 2}),
-						NewField(fieldOptions, []byte{0, 2}),
+						NewField(FieldData, []byte("UserB does not accept private chats.")),
+						NewField(FieldUserName, []byte("UserB")),
+						NewField(FieldUserID, []byte{0, 2}),
+						NewField(FieldOptions, []byte{0, 2}),
 					},
 				},
 				{
 					clientID:  &[]byte{0, 1},
 					Flags:     0x00,
 					IsReply:   0x01,
-					Type:      []byte{0, 0x70},
+					Type:      []byte{0, 0},
 					ID:        []byte{0, 0, 0, 0},
 					ErrorCode: []byte{0, 0, 0, 0},
 					Fields: []Field{
-						NewField(fieldChatID, []byte{0x52, 0xfd, 0xfc, 0x07}),
-						NewField(fieldUserName, []byte("UserA")),
-						NewField(fieldUserID, []byte{0, 1}),
-						NewField(fieldUserIconID, []byte{0, 1}),
-						NewField(fieldUserFlags, []byte{0, 0}),
+						NewField(FieldChatID, []byte{0x52, 0xfd, 0xfc, 0x07}),
+						NewField(FieldUserName, []byte("UserA")),
+						NewField(FieldUserID, []byte{0, 1}),
+						NewField(FieldUserIconID, []byte{0, 1}),
+						NewField(FieldUserFlags, []byte{0, 0}),
 					},
 				},
 			},
@@ -3622,3 +3673,281 @@ func TestHandleInviteNewChat(t *testing.T) {
 		})
 	}
 }
+
+func TestHandleGetNewsArtData(t *testing.T) {
+	type args struct {
+		cc *ClientConn
+		t  *Transaction
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantRes []Transaction
+		wantErr assert.ErrorAssertionFunc
+	}{
+		{
+			name: "when user does not have required permission",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							return bits
+						}(),
+					},
+					Server: &Server{
+						Accounts: map[string]*Account{},
+					},
+				},
+				t: NewTransaction(
+					TranGetNewsArtData, &[]byte{0, 1},
+				),
+			},
+			wantRes: []Transaction{
+				{
+					Flags:     0x00,
+					IsReply:   0x01,
+					Type:      []byte{0, 0},
+					ID:        []byte{0x9a, 0xcb, 0x04, 0x42},
+					ErrorCode: []byte{0, 0, 0, 1},
+					Fields: []Field{
+						NewField(FieldError, []byte("You are not allowed to read news.")),
+					},
+				},
+			},
+			wantErr: assert.NoError,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gotRes, err := HandleGetNewsArtData(tt.args.cc, tt.args.t)
+			if !tt.wantErr(t, err, fmt.Sprintf("HandleGetNewsArtData(%v, %v)", tt.args.cc, tt.args.t)) {
+				return
+			}
+			tranAssertEqual(t, tt.wantRes, gotRes)
+		})
+	}
+}
+
+func TestHandleGetNewsArtNameList(t *testing.T) {
+	type args struct {
+		cc *ClientConn
+		t  *Transaction
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantRes []Transaction
+		wantErr assert.ErrorAssertionFunc
+	}{
+		{
+			name: "when user does not have required permission",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							return bits
+						}(),
+					},
+					Server: &Server{
+						Accounts: map[string]*Account{},
+					},
+				},
+				t: NewTransaction(
+					TranGetNewsArtNameList, &[]byte{0, 1},
+				),
+			},
+			wantRes: []Transaction{
+				{
+					Flags:     0x00,
+					IsReply:   0x01,
+					Type:      []byte{0, 0},
+					ErrorCode: []byte{0, 0, 0, 1},
+					Fields: []Field{
+						NewField(FieldError, []byte("You are not allowed to read news.")),
+					},
+				},
+			},
+			wantErr: assert.NoError,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gotRes, err := HandleGetNewsArtNameList(tt.args.cc, tt.args.t)
+			if !tt.wantErr(t, err, fmt.Sprintf("HandleGetNewsArtNameList(%v, %v)", tt.args.cc, tt.args.t)) {
+				return
+			}
+			tranAssertEqual(t, tt.wantRes, gotRes)
+		})
+	}
+}
+
+func TestHandleNewNewsFldr(t *testing.T) {
+	type args struct {
+		cc *ClientConn
+		t  *Transaction
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantRes []Transaction
+		wantErr assert.ErrorAssertionFunc
+	}{
+		{
+			name: "when user does not have required permission",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							return bits
+						}(),
+					},
+					Server: &Server{
+						Accounts: map[string]*Account{},
+					},
+				},
+				t: NewTransaction(
+					TranGetNewsArtNameList, &[]byte{0, 1},
+				),
+			},
+			wantRes: []Transaction{
+				{
+					Flags:     0x00,
+					IsReply:   0x01,
+					Type:      []byte{0, 0},
+					ErrorCode: []byte{0, 0, 0, 1},
+					Fields: []Field{
+						NewField(FieldError, []byte("You are not allowed to create news folders.")),
+					},
+				},
+			},
+			wantErr: assert.NoError,
+		},
+		{
+			name: "with a valid request",
+			args: args{
+				cc: &ClientConn{
+					Account: &Account{
+						Access: func() accessBitmap {
+							var bits accessBitmap
+							bits.Set(accessNewsCreateFldr)
+							return bits
+						}(),
+					},
+					logger: NewTestLogger(),
+					ID:     &[]byte{0, 1},
+					Server: &Server{
+						ConfigDir: "/fakeConfigRoot",
+						FS: func() *MockFileStore {
+							mfs := &MockFileStore{}
+							mfs.On("WriteFile", "/fakeConfigRoot/ThreadedNews.yaml", mock.Anything, mock.Anything).Return(nil)
+							return mfs
+						}(),
+						ThreadedNews: &ThreadedNews{Categories: map[string]NewsCategoryListData15{
+							"test": {
+								Type:     []byte{0, 2},
+								Count:    nil,
+								NameSize: 0,
+								Name:     "test",
+								SubCats:  make(map[string]NewsCategoryListData15),
+							},
+						}},
+					},
+				},
+				t: NewTransaction(
+					TranGetNewsArtNameList, &[]byte{0, 1},
+					NewField(FieldFileName, []byte("testFolder")),
+					NewField(FieldNewsPath,
+						[]byte{
+							0, 1,
+							0, 0,
+							4,
+							0x74, 0x65, 0x73, 0x74,
+						},
+					),
+				),
+			},
+			wantRes: []Transaction{
+				{
+					clientID:  &[]byte{0, 1},
+					Flags:     0x00,
+					IsReply:   0x01,
+					Type:      []byte{0, 0},
+					ID:        []byte{0, 0, 0, 0},
+					ErrorCode: []byte{0, 0, 0, 0},
+					Fields:    []Field{},
+				},
+			},
+			wantErr: assert.NoError,
+		},
+		//{
+		//	name: "when there is an error writing the threaded news file",
+		//	args: args{
+		//		cc: &ClientConn{
+		//			Account: &Account{
+		//				Access: func() accessBitmap {
+		//					var bits accessBitmap
+		//					bits.Set(accessNewsCreateFldr)
+		//					return bits
+		//				}(),
+		//			},
+		//			logger: NewTestLogger(),
+		//			ID:     &[]byte{0, 1},
+		//			Server: &Server{
+		//				ConfigDir: "/fakeConfigRoot",
+		//				FS: func() *MockFileStore {
+		//					mfs := &MockFileStore{}
+		//					mfs.On("WriteFile", "/fakeConfigRoot/ThreadedNews.yaml", mock.Anything, mock.Anything).Return(os.ErrNotExist)
+		//					return mfs
+		//				}(),
+		//				ThreadedNews: &ThreadedNews{Categories: map[string]NewsCategoryListData15{
+		//					"test": {
+		//						Type:     []byte{0, 2},
+		//						Count:    nil,
+		//						NameSize: 0,
+		//						Name:     "test",
+		//						SubCats:  make(map[string]NewsCategoryListData15),
+		//					},
+		//				}},
+		//			},
+		//		},
+		//		t: NewTransaction(
+		//			TranGetNewsArtNameList, &[]byte{0, 1},
+		//			NewField(FieldFileName, []byte("testFolder")),
+		//			NewField(FieldNewsPath,
+		//				[]byte{
+		//					0, 1,
+		//					0, 0,
+		//					4,
+		//					0x74, 0x65, 0x73, 0x74,
+		//				},
+		//			),
+		//		),
+		//	},
+		//	wantRes: []Transaction{
+		//		{
+		//			clientID:  &[]byte{0, 1},
+		//			Flags:     0x00,
+		//			IsReply:   0x01,
+		//			Type:      []byte{0, 0},
+		//			ErrorCode: []byte{0, 0, 0, 1},
+		//			Fields: []Field{
+		//				NewField(FieldError, []byte("Error creating news folder.")),
+		//			},
+		//		},
+		//	},
+		//	wantErr: assert.Error,
+		// },
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gotRes, err := HandleNewNewsFldr(tt.args.cc, tt.args.t)
+			if !tt.wantErr(t, err, fmt.Sprintf("HandleNewNewsFldr(%v, %v)", tt.args.cc, tt.args.t)) {
+				return
+			}
+			tranAssertEqual(t, tt.wantRes, gotRes)
+		})
+	}
+}