]> git.r.bdr.sh - rbdr/mobius/blobdiff - hotline/transaction_handlers.go
git.r.bdr.sh / rbdr / mobius / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Refactoring, cleanup, test backfilling
[rbdr/mobius] / hotline / transaction_handlers.go
diff --git a/hotline/transaction_handlers.go b/hotline/transaction_handlers.go
index f4c5a2fda080e349683ec78ee8d0fa9e615fcbff..718dd599bea8cb6997dbd857214030c1fc9141ce 100644 (file)
--- a/hotline/transaction_handlers.go
+++ b/hotline/transaction_handlers.go
@@ -1,290 +1,125 @@
 package hotline
 
 import (
 package hotline
 
 import (
+       "bufio"
        "bytes"
        "encoding/binary"
        "bytes"
        "encoding/binary"
-       "errors"
        "fmt"
        "fmt"
+       "github.com/davecgh/go-spew/spew"
        "gopkg.in/yaml.v3"
        "gopkg.in/yaml.v3"
-       "io/ioutil"
+       "io"
        "math/big"
        "os"
        "path"
        "math/big"
        "os"
        "path"
+       "path/filepath"
        "sort"
        "strings"
        "time"
 )
 
        "sort"
        "strings"
        "time"
 )
 
-type TransactionType struct {
-       Handler        func(*ClientConn, *Transaction) ([]Transaction, error) // function for handling the transaction type
-       Name           string                                                 // Name of transaction as it will appear in logging
-       RequiredFields []requiredField
+// HandlerFunc is the signature of a func to handle a Hotline transaction.
+type HandlerFunc func(*ClientConn, *Transaction) []Transaction
+
+// TransactionHandlers maps a transaction type to a handler function.
+var TransactionHandlers = map[TranType]HandlerFunc{
+       TranAgreed:             HandleTranAgreed,
+       TranChatSend:           HandleChatSend,
+       TranDelNewsArt:         HandleDelNewsArt,
+       TranDelNewsItem:        HandleDelNewsItem,
+       TranDeleteFile:         HandleDeleteFile,
+       TranDeleteUser:         HandleDeleteUser,
+       TranDisconnectUser:     HandleDisconnectUser,
+       TranDownloadFile:       HandleDownloadFile,
+       TranDownloadFldr:       HandleDownloadFolder,
+       TranGetClientInfoText:  HandleGetClientInfoText,
+       TranGetFileInfo:        HandleGetFileInfo,
+       TranGetFileNameList:    HandleGetFileNameList,
+       TranGetMsgs:            HandleGetMsgs,
+       TranGetNewsArtData:     HandleGetNewsArtData,
+       TranGetNewsArtNameList: HandleGetNewsArtNameList,
+       TranGetNewsCatNameList: HandleGetNewsCatNameList,
+       TranGetUser:            HandleGetUser,
+       TranGetUserNameList:    HandleGetUserNameList,
+       TranInviteNewChat:      HandleInviteNewChat,
+       TranInviteToChat:       HandleInviteToChat,
+       TranJoinChat:           HandleJoinChat,
+       TranKeepAlive:          HandleKeepAlive,
+       TranLeaveChat:          HandleLeaveChat,
+       TranListUsers:          HandleListUsers,
+       TranMoveFile:           HandleMoveFile,
+       TranNewFolder:          HandleNewFolder,
+       TranNewNewsCat:         HandleNewNewsCat,
+       TranNewNewsFldr:        HandleNewNewsFldr,
+       TranNewUser:            HandleNewUser,
+       TranUpdateUser:         HandleUpdateUser,
+       TranOldPostNews:        HandleTranOldPostNews,
+       TranPostNewsArt:        HandlePostNewsArt,
+       TranRejectChatInvite:   HandleRejectChatInvite,
+       TranSendInstantMsg:     HandleSendInstantMsg,
+       TranSetChatSubject:     HandleSetChatSubject,
+       TranMakeFileAlias:      HandleMakeAlias,
+       TranSetClientUserInfo:  HandleSetClientUserInfo,
+       TranSetFileInfo:        HandleSetFileInfo,
+       TranSetUser:            HandleSetUser,
+       TranUploadFile:         HandleUploadFile,
+       TranUploadFldr:         HandleUploadFolder,
+       TranUserBroadcast:      HandleUserBroadcast,
+       TranDownloadBanner:     HandleDownloadBanner,
 }
 
 }
 
-var TransactionHandlers = map[uint16]TransactionType{
-       // Server initiated
-       tranChatMsg: {
-               Name: "tranChatMsg",
-       },
-       // Server initiated
-       tranNotifyChangeUser: {
-               Name: "tranNotifyChangeUser",
-       },
-       tranError: {
-               Name: "tranError",
-       },
-       tranShowAgreement: {
-               Name: "tranShowAgreement",
-       },
-       tranUserAccess: {
-               Name: "tranUserAccess",
-       },
-       tranNotifyDeleteUser: {
-               Name: "tranNotifyDeleteUser",
-       },
-       tranAgreed: {
-               Name:    "tranAgreed",
-               Handler: HandleTranAgreed,
-       },
-       tranChatSend: {
-               Name:    "tranChatSend",
-               Handler: HandleChatSend,
-               RequiredFields: []requiredField{
-                       {
-                               ID:     fieldData,
-                               minLen: 0,
-                       },
-               },
-       },
-       tranDelNewsArt: {
-               Name:    "tranDelNewsArt",
-               Handler: HandleDelNewsArt,
-       },
-       tranDelNewsItem: {
-               Name:    "tranDelNewsItem",
-               Handler: HandleDelNewsItem,
-       },
-       tranDeleteFile: {
-               Name:    "tranDeleteFile",
-               Handler: HandleDeleteFile,
-       },
-       tranDeleteUser: {
-               Name:    "tranDeleteUser",
-               Handler: HandleDeleteUser,
-       },
-       tranDisconnectUser: {
-               Name:    "tranDisconnectUser",
-               Handler: HandleDisconnectUser,
-       },
-       tranDownloadFile: {
-               Name:    "tranDownloadFile",
-               Handler: HandleDownloadFile,
-       },
-       tranDownloadFldr: {
-               Name:    "tranDownloadFldr",
-               Handler: HandleDownloadFolder,
-       },
-       tranGetClientInfoText: {
-               Name:    "tranGetClientInfoText",
-               Handler: HandleGetClientConnInfoText,
-       },
-       tranGetFileInfo: {
-               Name:    "tranGetFileInfo",
-               Handler: HandleGetFileInfo,
-       },
-       tranGetFileNameList: {
-               Name:    "tranGetFileNameList",
-               Handler: HandleGetFileNameList,
-       },
-       tranGetMsgs: {
-               Name:    "tranGetMsgs",
-               Handler: HandleGetMsgs,
-       },
-       tranGetNewsArtData: {
-               Name:    "tranGetNewsArtData",
-               Handler: HandleGetNewsArtData,
-       },
-       tranGetNewsArtNameList: {
-               Name:    "tranGetNewsArtNameList",
-               Handler: HandleGetNewsArtNameList,
-       },
-       tranGetNewsCatNameList: {
-               Name:    "tranGetNewsCatNameList",
-               Handler: HandleGetNewsCatNameList,
-       },
-       tranGetUser: {
-               Name:    "tranGetUser",
-               Handler: HandleGetUser,
-       },
-       tranGetUserNameList: {
-               Name:    "tranHandleGetUserNameList",
-               Handler: HandleGetUserNameList,
-       },
-       tranInviteNewChat: {
-               Name:    "tranInviteNewChat",
-               Handler: HandleInviteNewChat,
-       },
-       tranInviteToChat: {
-               Name:    "tranInviteToChat",
-               Handler: HandleInviteToChat,
-       },
-       tranJoinChat: {
-               Name:    "tranJoinChat",
-               Handler: HandleJoinChat,
-       },
-       tranKeepAlive: {
-               Name:    "tranKeepAlive",
-               Handler: HandleKeepAlive,
-       },
-       tranLeaveChat: {
-               Name:    "tranJoinChat",
-               Handler: HandleLeaveChat,
-       },
-       tranListUsers: {
-               Name:    "tranListUsers",
-               Handler: HandleListUsers,
-       },
-       tranMoveFile: {
-               Name:    "tranMoveFile",
-               Handler: HandleMoveFile,
-       },
-       tranNewFolder: {
-               Name:    "tranNewFolder",
-               Handler: HandleNewFolder,
-       },
-       tranNewNewsCat: {
-               Name:    "tranNewNewsCat",
-               Handler: HandleNewNewsCat,
-       },
-       tranNewNewsFldr: {
-               Name:    "tranNewNewsFldr",
-               Handler: HandleNewNewsFldr,
-       },
-       tranNewUser: {
-               Name:    "tranNewUser",
-               Handler: HandleNewUser,
-       },
-       tranUpdateUser: {
-               Name:    "tranUpdateUser",
-               Handler: HandleUpdateUser,
-       },
-       tranOldPostNews: {
-               Name:    "tranOldPostNews",
-               Handler: HandleTranOldPostNews,
-       },
-       tranPostNewsArt: {
-               Name:    "tranPostNewsArt",
-               Handler: HandlePostNewsArt,
-       },
-       tranRejectChatInvite: {
-               Name:    "tranRejectChatInvite",
-               Handler: HandleRejectChatInvite,
-       },
-       tranSendInstantMsg: {
-               Name:    "tranSendInstantMsg",
-               Handler: HandleSendInstantMsg,
-               RequiredFields: []requiredField{
-                       {
-                               ID:     fieldData,
-                               minLen: 0,
-                       },
-                       {
-                               ID: fieldUserID,
-                       },
-               },
-       },
-       tranSetChatSubject: {
-               Name:    "tranSetChatSubject",
-               Handler: HandleSetChatSubject,
-       },
-       tranMakeFileAlias: {
-               Name:    "tranMakeFileAlias",
-               Handler: HandleMakeAlias,
-               RequiredFields: []requiredField{
-                       {ID: fieldFileName, minLen: 1},
-                       {ID: fieldFilePath, minLen: 1},
-                       {ID: fieldFileNewPath, minLen: 1},
-               },
-       },
-       tranSetClientUserInfo: {
-               Name:    "tranSetClientUserInfo",
-               Handler: HandleSetClientUserInfo,
-       },
-       tranSetFileInfo: {
-               Name:    "tranSetFileInfo",
-               Handler: HandleSetFileInfo,
-       },
-       tranSetUser: {
-               Name:    "tranSetUser",
-               Handler: HandleSetUser,
-       },
-       tranUploadFile: {
-               Name:    "tranUploadFile",
-               Handler: HandleUploadFile,
-       },
-       tranUploadFldr: {
-               Name:    "tranUploadFldr",
-               Handler: HandleUploadFolder,
-       },
-       tranUserBroadcast: {
-               Name:    "tranUserBroadcast",
-               Handler: HandleUserBroadcast,
-       },
-}
-
-func HandleChatSend(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       if !authorize(cc.Account.Access, accessSendChat) {
-               res = append(res, cc.NewErrReply(t, "You are not allowed to participate in chat."))
-               return res, err
+func HandleChatSend(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if !cc.Authorize(accessSendChat) {
+               return cc.NewErrReply(t, "You are not allowed to participate in chat.")
        }
 
        // Truncate long usernames
        trunc := fmt.Sprintf("%13s", cc.UserName)
        }
 
        // Truncate long usernames
        trunc := fmt.Sprintf("%13s", cc.UserName)
-       formattedMsg := fmt.Sprintf("\r%.14s:  %s", trunc, t.GetField(fieldData).Data)
+       formattedMsg := fmt.Sprintf("\r%.14s:  %s", trunc, t.GetField(FieldData).Data)
 
        // By holding the option key, Hotline chat allows users to send /me formatted messages like:
        // *** Halcyon does stuff
 
        // 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 {
-               formattedMsg = fmt.Sprintf("\r*** %s %s", cc.UserName, t.GetField(fieldData).Data)
+       // 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)
        }
 
        }
 
-       if bytes.Equal(t.GetField(fieldData).Data, []byte("/stats")) {
-               formattedMsg = strings.Replace(cc.Server.Stats.String(), "\n", "\r", -1)
-       }
-
-       chatID := t.GetField(fieldChatID).Data
-       // a non-nil chatID indicates the message belongs to a private chat
-       if chatID != nil {
-               chatInt := binary.BigEndian.Uint32(chatID)
-               privChat := cc.Server.PrivateChats[chatInt]
-
-               clients := sortedClients(privChat.ClientConn)
+       // 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
+       if chatID != nil && !bytes.Equal([]byte{0, 0, 0, 0}, chatID) {
+               privChat := cc.Server.PrivateChats[[4]byte(chatID)]
 
                // send the message to all connected clients of the private chat
 
                // send the message to all connected clients of the private chat
-               for _, c := range clients {
-                       res = append(res, *NewTransaction(
-                               tranChatMsg,
+               for _, c := range privChat.ClientConn {
+                       res = append(res, NewTransaction(
+                               TranChatMsg,
                                c.ID,
                                c.ID,
-                               NewField(fieldChatID, chatID),
-                               NewField(fieldData, []byte(formattedMsg)),
+                               NewField(FieldChatID, chatID),
+                               NewField(FieldData, []byte(formattedMsg)),
                        ))
                }
                        ))
                }
-               return res, err
+               return res
        }
 
        }
 
-       for _, c := range sortedClients(cc.Server.Clients) {
-               // Filter out clients that do not have the read chat permission
-               if authorize(c.Account.Access, accessReadChat) {
-                       res = append(res, *NewTransaction(tranChatMsg, c.ID, NewField(fieldData, []byte(formattedMsg))))
+       //cc.Server.mux.Lock()
+       for _, c := range cc.Server.Clients {
+               if c == nil || cc.Account == nil {
+                       continue
+               }
+               // Skip clients that do not have the read chat permission.
+               if c.Authorize(accessReadChat) {
+                       res = append(res, NewTransaction(TranChatMsg, c.ID, NewField(FieldData, []byte(formattedMsg))))
                }
        }
                }
        }
+       //cc.Server.mux.Unlock()
 
 
-       return res, err
+       return res
 }
 
 // HandleSendInstantMsg sends instant message to the user on the current server.
 // Fields used in the request:
 }
 
 // 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:
 //     103     User ID
 //     113     Options
 //             One of the following values:
@@ -297,347 +132,437 @@ func HandleChatSend(cc *ClientConn, t *Transaction) (res []Transaction, err erro
 //
 // Fields used in the reply:
 // None
 //
 // Fields used in the reply:
 // None
-func HandleSendInstantMsg(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       msg := t.GetField(fieldData)
-       ID := t.GetField(fieldUserID)
+func HandleSendInstantMsg(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if !cc.Authorize(accessSendPrivMsg) {
+               return cc.NewErrReply(t, "You are not allowed to send private messages.")
+       }
+
+       msg := t.GetField(FieldData)
+       userID := t.GetField(FieldUserID)
 
        reply := NewTransaction(
 
        reply := NewTransaction(
-               tranServerMsg,
-               &ID.Data,
-               NewField(fieldData, msg.Data),
-               NewField(fieldUserName, cc.UserName),
-               NewField(fieldUserID, *cc.ID),
-               NewField(fieldOptions, []byte{0, 1}),
+               TranServerMsg,
+               [2]byte(userID.Data),
+               NewField(FieldData, msg.Data),
+               NewField(FieldUserName, cc.UserName),
+               NewField(FieldUserID, cc.ID[:]),
+               NewField(FieldOptions, []byte{0, 1}),
        )
 
        )
 
-       // Later versions of Hotline include the original message in the fieldQuotingMsg field so
+       // Later versions of Hotline include the original message in the FieldQuotingMsg field so
        //  the receiving client can display both the received message and what it is in reply to
        //  the receiving client can display both the received message and what it is in reply to
-       if t.GetField(fieldQuotingMsg).Data != nil {
-               reply.Fields = append(reply.Fields, NewField(fieldQuotingMsg, t.GetField(fieldQuotingMsg).Data))
+       if t.GetField(FieldQuotingMsg).Data != nil {
+               reply.Fields = append(reply.Fields, NewField(FieldQuotingMsg, t.GetField(FieldQuotingMsg).Data))
        }
 
        }
 
-       res = append(res, *reply)
-
-       id, _ := byteToInt(ID.Data)
-       otherClient, ok := cc.Server.Clients[uint16(id)]
+       otherClient, ok := cc.Server.Clients[[2]byte(userID.Data)]
        if !ok {
        if !ok {
-               return res, errors.New("invalid client ID")
+               return res
+       }
+
+       // Check if target user has "Refuse private messages" flag
+       if otherClient.Flags.IsSet(UserFlagRefusePM) {
+               res = append(res,
+                       NewTransaction(
+                               TranServerMsg,
+                               cc.ID,
+                               NewField(FieldData, []byte(string(otherClient.UserName)+" does not accept private messages.")),
+                               NewField(FieldUserName, otherClient.UserName),
+                               NewField(FieldUserID, otherClient.ID[:]),
+                               NewField(FieldOptions, []byte{0, 2}),
+                       ),
+               )
+       } else {
+               res = append(res, reply)
        }
 
        // Respond with auto reply if other client has it enabled
        if len(otherClient.AutoReply) > 0 {
                res = append(res,
        }
 
        // Respond with auto reply if other client has it enabled
        if len(otherClient.AutoReply) > 0 {
                res = append(res,
-                       *NewTransaction(
-                               tranServerMsg,
+                       NewTransaction(
+                               TranServerMsg,
                                cc.ID,
                                cc.ID,
-                               NewField(fieldData, otherClient.AutoReply),
-                               NewField(fieldUserName, otherClient.UserName),
-                               NewField(fieldUserID, *otherClient.ID),
-                               NewField(fieldOptions, []byte{0, 1}),
+                               NewField(FieldData, otherClient.AutoReply),
+                               NewField(FieldUserName, otherClient.UserName),
+                               NewField(FieldUserID, otherClient.ID[:]),
+                               NewField(FieldOptions, []byte{0, 1}),
                        ),
                )
        }
 
                        ),
                )
        }
 
-       res = append(res, cc.NewReply(t))
-
-       return res, err
+       return append(res, cc.NewReply(t))
 }
 
 }
 
-func HandleGetFileInfo(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       fileName := t.GetField(fieldFileName).Data
-       filePath := t.GetField(fieldFilePath).Data
+var fileTypeFLDR = [4]byte{0x66, 0x6c, 0x64, 0x72}
+
+func HandleGetFileInfo(cc *ClientConn, t *Transaction) (res []Transaction) {
+       fileName := t.GetField(FieldFileName).Data
+       filePath := t.GetField(FieldFilePath).Data
 
 
-       ffo, err := NewFlattenedFileObject(cc.Server.Config.FileRoot, filePath, fileName, 0)
+       fullFilePath, err := readPath(cc.Server.Config.FileRoot, filePath, fileName)
        if err != nil {
        if err != nil {
-               return res, err
+               return res
        }
 
        }
 
-       res = append(res, cc.NewReply(t,
-               NewField(fieldFileName, fileName),
-               NewField(fieldFileTypeString, ffo.FlatFileInformationFork.friendlyType()),
-               NewField(fieldFileCreatorString, ffo.FlatFileInformationFork.CreatorSignature),
-               NewField(fieldFileComment, ffo.FlatFileInformationFork.Comment),
-               NewField(fieldFileType, ffo.FlatFileInformationFork.TypeSignature),
-               NewField(fieldFileCreateDate, ffo.FlatFileInformationFork.CreateDate),
-               NewField(fieldFileModifyDate, ffo.FlatFileInformationFork.ModifyDate),
-               NewField(fieldFileSize, ffo.FlatFileDataForkHeader.DataSize[:]),
-       ))
-       return res, err
+       fw, err := newFileWrapper(cc.Server.FS, fullFilePath, 0)
+       if err != nil {
+               return res
+       }
+
+       encodedName, err := txtEncoder.String(fw.name)
+       if err != nil {
+               return res
+       }
+
+       fields := []Field{
+               NewField(FieldFileName, []byte(encodedName)),
+               NewField(FieldFileTypeString, fw.ffo.FlatFileInformationFork.friendlyType()),
+               NewField(FieldFileCreatorString, fw.ffo.FlatFileInformationFork.friendlyCreator()),
+               NewField(FieldFileType, fw.ffo.FlatFileInformationFork.TypeSignature[:]),
+               NewField(FieldFileCreateDate, fw.ffo.FlatFileInformationFork.CreateDate[:]),
+               NewField(FieldFileModifyDate, fw.ffo.FlatFileInformationFork.ModifyDate[:]),
+       }
+
+       // Include the optional FileComment field if there is a comment.
+       if len(fw.ffo.FlatFileInformationFork.Comment) != 0 {
+               fields = append(fields, NewField(FieldFileComment, fw.ffo.FlatFileInformationFork.Comment))
+       }
+
+       // Include the FileSize field for files.
+       if fw.ffo.FlatFileInformationFork.TypeSignature != fileTypeFLDR {
+               fields = append(fields, NewField(FieldFileSize, fw.totalSize()))
+       }
+
+       res = append(res, cc.NewReply(t, fields...))
+       return res
 }
 
 }
 
-// HandleSetFileInfo updates a file or folder name and/or comment from the Get Info window
-// TODO: Implement support for comments
+// HandleSetFileInfo updates a file or folder Name and/or comment from the Get Info window
 // Fields used in the request:
 // Fields used in the request:
-// * 201       File name
+// * 201       File Name
 // * 202       File path       Optional
 // * 202       File path       Optional
-// * 211       File new name   Optional
+// * 211       File new Name   Optional
 // * 210       File comment    Optional
 // Fields used in the reply:   None
 // * 210       File comment    Optional
 // Fields used in the reply:   None
-func HandleSetFileInfo(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       fileName := t.GetField(fieldFileName).Data
-       filePath := t.GetField(fieldFilePath).Data
+func HandleSetFileInfo(cc *ClientConn, t *Transaction) (res []Transaction) {
+       fileName := t.GetField(FieldFileName).Data
+       filePath := t.GetField(FieldFilePath).Data
 
        fullFilePath, err := readPath(cc.Server.Config.FileRoot, filePath, fileName)
        if err != nil {
 
        fullFilePath, err := readPath(cc.Server.Config.FileRoot, filePath, fileName)
        if err != nil {
-               return res, err
+               return res
        }
 
        }
 
-       fullNewFilePath, err := readPath(cc.Server.Config.FileRoot, filePath, t.GetField(fieldFileNewName).Data)
+       fi, err := cc.Server.FS.Stat(fullFilePath)
        if err != nil {
        if err != nil {
-               return nil, err
+               return res
        }
 
        }
 
-       // fileComment := t.GetField(fieldFileComment).Data
-       fileNewName := t.GetField(fieldFileNewName).Data
+       hlFile, err := newFileWrapper(cc.Server.FS, fullFilePath, 0)
+       if err != nil {
+               return res
+       }
+       if t.GetField(FieldFileComment).Data != nil {
+               switch mode := fi.Mode(); {
+               case mode.IsDir():
+                       if !cc.Authorize(accessSetFolderComment) {
+                               return cc.NewErrReply(t, "You are not allowed to set comments for folders.")
+                       }
+               case mode.IsRegular():
+                       if !cc.Authorize(accessSetFileComment) {
+                               return cc.NewErrReply(t, "You are not allowed to set comments for files.")
+                       }
+               }
 
 
-       if fileNewName != nil {
-               fi, err := FS.Stat(fullFilePath)
+               if err := hlFile.ffo.FlatFileInformationFork.setComment(t.GetField(FieldFileComment).Data); err != nil {
+                       return res
+               }
+               w, err := hlFile.infoForkWriter()
+               if err != nil {
+                       return res
+               }
+               _, err = io.Copy(w, &hlFile.ffo.FlatFileInformationFork)
                if err != nil {
                if err != nil {
-                       return res, err
+                       return res
                }
                }
+       }
+
+       fullNewFilePath, err := readPath(cc.Server.Config.FileRoot, filePath, t.GetField(FieldFileNewName).Data)
+       if err != nil {
+               return nil
+       }
+
+       fileNewName := t.GetField(FieldFileNewName).Data
+
+       if fileNewName != nil {
                switch mode := fi.Mode(); {
                case mode.IsDir():
                switch mode := fi.Mode(); {
                case mode.IsDir():
-                       if !authorize(cc.Account.Access, accessRenameFolder) {
-                               res = append(res, cc.NewErrReply(t, "You are not allowed to rename folders."))
-                               return res, err
+                       if !cc.Authorize(accessRenameFolder) {
+                               return cc.NewErrReply(t, "You are not allowed to rename folders.")
+                       }
+                       err = os.Rename(fullFilePath, fullNewFilePath)
+                       if os.IsNotExist(err) {
+                               return cc.NewErrReply(t, "Cannot rename folder "+string(fileName)+" because it does not exist or cannot be found.")
+
                        }
                case mode.IsRegular():
                        }
                case mode.IsRegular():
-                       if !authorize(cc.Account.Access, accessRenameFile) {
-                               res = append(res, cc.NewErrReply(t, "You are not allowed to rename files."))
-                               return res, err
+                       if !cc.Authorize(accessRenameFile) {
+                               return cc.NewErrReply(t, "You are not allowed to rename files.")
+                       }
+                       fileDir, err := readPath(cc.Server.Config.FileRoot, filePath, []byte{})
+                       if err != nil {
+                               return nil
+                       }
+                       hlFile.name, err = txtDecoder.String(string(fileNewName))
+                       if err != nil {
+                               return res
                        }
                        }
-               }
 
 
-               err = os.Rename(fullFilePath, fullNewFilePath)
-               if os.IsNotExist(err) {
-                       res = append(res, cc.NewErrReply(t, "Cannot rename file "+string(fileName)+" because it does not exist or cannot be found."))
-                       return res, err
+                       err = hlFile.move(fileDir)
+                       if os.IsNotExist(err) {
+                               return cc.NewErrReply(t, "Cannot rename file "+string(fileName)+" because it does not exist or cannot be found.")
+                       }
+                       if err != nil {
+                               return res
+                       }
                }
        }
 
        res = append(res, cc.NewReply(t))
                }
        }
 
        res = append(res, cc.NewReply(t))
-       return res, err
+       return res
 }
 
 // HandleDeleteFile deletes a file or folder
 // Fields used in the request:
 }
 
 // HandleDeleteFile deletes a file or folder
 // Fields used in the request:
-// * 201       File name
+// * 201       File Name
 // * 202       File path
 // Fields used in the reply: none
 // * 202       File path
 // Fields used in the reply: none
-func HandleDeleteFile(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       fileName := t.GetField(fieldFileName).Data
-       filePath := t.GetField(fieldFilePath).Data
+func HandleDeleteFile(cc *ClientConn, t *Transaction) (res []Transaction) {
+       fileName := t.GetField(FieldFileName).Data
+       filePath := t.GetField(FieldFilePath).Data
 
        fullFilePath, err := readPath(cc.Server.Config.FileRoot, filePath, fileName)
        if err != nil {
 
        fullFilePath, err := readPath(cc.Server.Config.FileRoot, filePath, fileName)
        if err != nil {
-               return res, err
+               return res
        }
 
        }
 
-       cc.Server.Logger.Debugw("Delete file", "src", fullFilePath)
+       hlFile, err := newFileWrapper(cc.Server.FS, fullFilePath, 0)
+       if err != nil {
+               return res
+       }
 
 
-       fi, err := os.Stat(fullFilePath)
+       fi, err := hlFile.dataFile()
        if err != nil {
        if err != nil {
-               res = append(res, cc.NewErrReply(t, "Cannot delete file "+string(fileName)+" because it does not exist or cannot be found."))
-               return res, nil
+               return cc.NewErrReply(t, "Cannot delete file "+string(fileName)+" because it does not exist or cannot be found.")
        }
        }
+
        switch mode := fi.Mode(); {
        case mode.IsDir():
        switch mode := fi.Mode(); {
        case mode.IsDir():
-               if !authorize(cc.Account.Access, accessDeleteFolder) {
-                       res = append(res, cc.NewErrReply(t, "You are not allowed to delete folders."))
-                       return res, err
+               if !cc.Authorize(accessDeleteFolder) {
+                       return cc.NewErrReply(t, "You are not allowed to delete folders.")
                }
        case mode.IsRegular():
                }
        case mode.IsRegular():
-               if !authorize(cc.Account.Access, accessDeleteFile) {
-                       res = append(res, cc.NewErrReply(t, "You are not allowed to delete files."))
-                       return res, err
+               if !cc.Authorize(accessDeleteFile) {
+                       return cc.NewErrReply(t, "You are not allowed to delete files.")
                }
        }
 
                }
        }
 
-       if err := os.RemoveAll(fullFilePath); err != nil {
-               return res, err
+       if err := hlFile.delete(); err != nil {
+               return res
        }
 
        res = append(res, cc.NewReply(t))
        }
 
        res = append(res, cc.NewReply(t))
-       return res, err
+       return res
 }
 
 // HandleMoveFile moves files or folders. Note: seemingly not documented
 }
 
 // HandleMoveFile moves files or folders. Note: seemingly not documented
-func HandleMoveFile(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       fileName := string(t.GetField(fieldFileName).Data)
-       filePath := cc.Server.Config.FileRoot + ReadFilePath(t.GetField(fieldFilePath).Data)
-       fileNewPath := cc.Server.Config.FileRoot + ReadFilePath(t.GetField(fieldFileNewPath).Data)
+func HandleMoveFile(cc *ClientConn, t *Transaction) (res []Transaction) {
+       fileName := string(t.GetField(FieldFileName).Data)
 
 
-       cc.Server.Logger.Debugw("Move file", "src", filePath+"/"+fileName, "dst", fileNewPath+"/"+fileName)
+       filePath, err := readPath(cc.Server.Config.FileRoot, t.GetField(FieldFilePath).Data, t.GetField(FieldFileName).Data)
+       if err != nil {
+               return res
+       }
 
 
-       fp := filePath + "/" + fileName
-       fi, err := os.Stat(fp)
+       fileNewPath, err := readPath(cc.Server.Config.FileRoot, t.GetField(FieldFileNewPath).Data, nil)
        if err != nil {
        if err != nil {
-               return res, err
+               return res
+       }
+
+       cc.logger.Info("Move file", "src", filePath+"/"+fileName, "dst", fileNewPath+"/"+fileName)
+
+       hlFile, err := newFileWrapper(cc.Server.FS, filePath, 0)
+       if err != nil {
+               return res
+       }
+
+       fi, err := hlFile.dataFile()
+       if err != nil {
+               return cc.NewErrReply(t, "Cannot delete file "+fileName+" because it does not exist or cannot be found.")
        }
        switch mode := fi.Mode(); {
        case mode.IsDir():
        }
        switch mode := fi.Mode(); {
        case mode.IsDir():
-               if !authorize(cc.Account.Access, accessMoveFolder) {
-                       res = append(res, cc.NewErrReply(t, "You are not allowed to move folders."))
-                       return res, err
+               if !cc.Authorize(accessMoveFolder) {
+                       return cc.NewErrReply(t, "You are not allowed to move folders.")
                }
        case mode.IsRegular():
                }
        case mode.IsRegular():
-               if !authorize(cc.Account.Access, accessMoveFile) {
-                       res = append(res, cc.NewErrReply(t, "You are not allowed to move files."))
-                       return res, err
+               if !cc.Authorize(accessMoveFile) {
+                       return cc.NewErrReply(t, "You are not allowed to move files.")
                }
        }
                }
        }
-
-       err = os.Rename(filePath+"/"+fileName, fileNewPath+"/"+fileName)
-       if os.IsNotExist(err) {
-               res = append(res, cc.NewErrReply(t, "Cannot delete file "+fileName+" because it does not exist or cannot be found."))
-               return res, err
+       if err := hlFile.move(fileNewPath); err != nil {
+               return res
        }
        }
-       if err != nil {
-               return []Transaction{}, err
-       }
-       // TODO: handle other possible errors; e.g. file delete fails due to file permission issue
+       // TODO: handle other possible errors; e.g. fileWrapper delete fails due to fileWrapper permission issue
 
        res = append(res, cc.NewReply(t))
 
        res = append(res, cc.NewReply(t))
-       return res, err
+       return res
 }
 
 }
 
-func HandleNewFolder(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       if !authorize(cc.Account.Access, accessCreateFolder) {
-               res = append(res, cc.NewErrReply(t, "You are not allowed to create folders."))
-               return res, err
+func HandleNewFolder(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if !cc.Authorize(accessCreateFolder) {
+               return cc.NewErrReply(t, "You are not allowed to create folders.")
        }
        }
-       newFolderPath := cc.Server.Config.FileRoot
-       folderName := string(t.GetField(fieldFileName).Data)
+       folderName := string(t.GetField(FieldFileName).Data)
 
        folderName = path.Join("/", folderName)
 
 
        folderName = path.Join("/", folderName)
 
-       // fieldFilePath is only present for nested paths
-       if t.GetField(fieldFilePath).Data != nil {
+       var subPath string
+
+       // FieldFilePath is only present for nested paths
+       if t.GetField(FieldFilePath).Data != nil {
                var newFp FilePath
                var newFp FilePath
-               err := newFp.UnmarshalBinary(t.GetField(fieldFilePath).Data)
+               _, err := newFp.Write(t.GetField(FieldFilePath).Data)
                if err != nil {
                if err != nil {
-                       return nil, err
+                       return res
+               }
+
+               for _, pathItem := range newFp.Items {
+                       subPath = filepath.Join("/", subPath, string(pathItem.Name))
                }
                }
-               newFolderPath += newFp.String()
        }
        }
-       newFolderPath = path.Join(newFolderPath, folderName)
+       newFolderPath := path.Join(cc.Server.Config.FileRoot, subPath, folderName)
+       newFolderPath, err := txtDecoder.String(newFolderPath)
+       if err != nil {
+               return res
+       }
 
 
-       // TODO: check path and folder name lengths
+       // TODO: check path and folder Name lengths
 
 
-       if _, err := FS.Stat(newFolderPath); !os.IsNotExist(err) {
-               msg := fmt.Sprintf("Cannot create folder \"%s\" because there is already a file or folder with that name.", folderName)
-               return []Transaction{cc.NewErrReply(t, msg)}, nil
+       if _, err := cc.Server.FS.Stat(newFolderPath); !os.IsNotExist(err) {
+               msg := fmt.Sprintf("Cannot create folder \"%s\" because there is already a file or folder with that Name.", folderName)
+               return cc.NewErrReply(t, msg)
        }
 
        }
 
-       // TODO: check for disallowed characters to maintain compatibility for original client
-
-       if err := FS.Mkdir(newFolderPath, 0777); err != nil {
+       if err := cc.Server.FS.Mkdir(newFolderPath, 0777); err != nil {
                msg := fmt.Sprintf("Cannot create folder \"%s\" because an error occurred.", folderName)
                msg := fmt.Sprintf("Cannot create folder \"%s\" because an error occurred.", folderName)
-               return []Transaction{cc.NewErrReply(t, msg)}, nil
+               return cc.NewErrReply(t, msg)
        }
 
        res = append(res, cc.NewReply(t))
        }
 
        res = append(res, cc.NewReply(t))
-       return res, err
+       return res
 }
 
 }
 
-func HandleSetUser(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       if !authorize(cc.Account.Access, accessModifyUser) {
-               res = append(res, cc.NewErrReply(t, "You are not allowed to modify accounts."))
-               return res, err
+func HandleSetUser(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if !cc.Authorize(accessModifyUser) {
+               return cc.NewErrReply(t, "You are not allowed to modify accounts.")
        }
 
        }
 
-       login := DecodeUserString(t.GetField(fieldUserLogin).Data)
-       userName := string(t.GetField(fieldUserName).Data)
+       login := string(encodeString(t.GetField(FieldUserLogin).Data))
+       userName := string(t.GetField(FieldUserName).Data)
 
 
-       newAccessLvl := t.GetField(fieldUserAccess).Data
+       newAccessLvl := t.GetField(FieldUserAccess).Data
 
        account := cc.Server.Accounts[login]
 
        account := cc.Server.Accounts[login]
-       account.Access = &newAccessLvl
+       if account == nil {
+               return cc.NewErrReply(t, "Account not found.")
+       }
        account.Name = userName
        account.Name = userName
+       copy(account.Access[:], newAccessLvl)
 
        // If the password field is cleared in the Hotline edit user UI, the SetUser transaction does
 
        // If the password field is cleared in the Hotline edit user UI, the SetUser transaction does
-       // not include fieldUserPassword
-       if t.GetField(fieldUserPassword).Data == nil {
+       // not include FieldUserPassword
+       if t.GetField(FieldUserPassword).Data == nil {
                account.Password = hashAndSalt([]byte(""))
        }
                account.Password = hashAndSalt([]byte(""))
        }
-       if len(t.GetField(fieldUserPassword).Data) > 1 {
-               account.Password = hashAndSalt(t.GetField(fieldUserPassword).Data)
+
+       if !bytes.Equal([]byte{0}, t.GetField(FieldUserPassword).Data) {
+               account.Password = hashAndSalt(t.GetField(FieldUserPassword).Data)
        }
 
        out, err := yaml.Marshal(&account)
        if err != nil {
        }
 
        out, err := yaml.Marshal(&account)
        if err != nil {
-               return res, err
+               return res
        }
        }
-       if err := os.WriteFile(cc.Server.ConfigDir+"Users/"+login+".yaml", out, 0666); err != nil {
-               return res, err
+       if err := os.WriteFile(filepath.Join(cc.Server.ConfigDir, "Users", login+".yaml"), out, 0666); err != nil {
+               return res
        }
 
        // Notify connected clients logged in as the user of the new access level
        for _, c := range cc.Server.Clients {
                if c.Account.Login == login {
        }
 
        // Notify connected clients logged in as the user of the new access level
        for _, c := range cc.Server.Clients {
                if c.Account.Login == login {
-                       // Note: comment out these two lines to test server-side deny messages
-                       newT := NewTransaction(tranUserAccess, c.ID, NewField(fieldUserAccess, newAccessLvl))
-                       res = append(res, *newT)
+                       newT := NewTransaction(TranUserAccess, c.ID, NewField(FieldUserAccess, newAccessLvl))
+                       res = append(res, newT)
 
 
-                       flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(*c.Flags)))
-                       if authorize(c.Account.Access, accessDisconUser) {
-                               flagBitmap.SetBit(flagBitmap, userFlagAdmin, 1)
+                       if c.Authorize(accessDisconUser) {
+                               c.Flags.Set(UserFlagAdmin, 1)
                        } else {
                        } else {
-                               flagBitmap.SetBit(flagBitmap, userFlagAdmin, 0)
+                               c.Flags.Set(UserFlagAdmin, 0)
                        }
                        }
-                       binary.BigEndian.PutUint16(*c.Flags, uint16(flagBitmap.Int64()))
 
                        c.Account.Access = account.Access
 
                        cc.sendAll(
 
                        c.Account.Access = account.Access
 
                        cc.sendAll(
-                               tranNotifyChangeUser,
-                               NewField(fieldUserID, *c.ID),
-                               NewField(fieldUserFlags, *c.Flags),
-                               NewField(fieldUserName, c.UserName),
-                               NewField(fieldUserIconID, *c.Icon),
+                               TranNotifyChangeUser,
+                               NewField(FieldUserID, c.ID[:]),
+                               NewField(FieldUserFlags, c.Flags[:]),
+                               NewField(FieldUserName, c.UserName),
+                               NewField(FieldUserIconID, c.Icon),
                        )
                }
        }
 
        res = append(res, cc.NewReply(t))
                        )
                }
        }
 
        res = append(res, cc.NewReply(t))
-       return res, err
+       return res
 }
 
 }
 
-func HandleGetUser(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       if !authorize(cc.Account.Access, accessOpenUser) {
-               res = append(res, cc.NewErrReply(t, "You are not allowed to view accounts."))
-               return res, err
+func HandleGetUser(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if !cc.Authorize(accessOpenUser) {
+               return cc.NewErrReply(t, "You are not allowed to view accounts.")
        }
 
        }
 
-       account := cc.Server.Accounts[string(t.GetField(fieldUserLogin).Data)]
+       account := cc.Server.Accounts[string(t.GetField(FieldUserLogin).Data)]
        if account == nil {
        if account == nil {
-               res = append(res, cc.NewErrReply(t, "Account does not exist."))
-               return res, err
+               return cc.NewErrReply(t, "Account does not exist.")
        }
 
        res = append(res, cc.NewReply(t,
        }
 
        res = append(res, cc.NewReply(t,
-               NewField(fieldUserName, []byte(account.Name)),
-               NewField(fieldUserLogin, negateString(t.GetField(fieldUserLogin).Data)),
-               NewField(fieldUserPassword, []byte(account.Password)),
-               NewField(fieldUserAccess, *account.Access),
+               NewField(FieldUserName, []byte(account.Name)),
+               NewField(FieldUserLogin, encodeString(t.GetField(FieldUserLogin).Data)),
+               NewField(FieldUserPassword, []byte(account.Password)),
+               NewField(FieldUserAccess, account.Access[:]),
        ))
        ))
-       return res, err
+       return res
 }
 
 }
 
-func HandleListUsers(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       if !authorize(cc.Account.Access, accessOpenUser) {
-               res = append(res, cc.NewErrReply(t, "You are not allowed to view accounts."))
-               return res, err
+func HandleListUsers(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if !cc.Authorize(accessOpenUser) {
+               return cc.NewErrReply(t, "You are not allowed to view accounts.")
        }
 
        var userFields []Field
        for _, acc := range cc.Server.Accounts {
        }
 
        var userFields []Field
        for _, acc := range cc.Server.Accounts {
-               userField := acc.MarshalBinary()
-               userFields = append(userFields, NewField(fieldData, userField))
+               accCopy := *acc
+               b, err := io.ReadAll(&accCopy)
+               if err != nil {
+                       return res
+               }
+
+               userFields = append(userFields, NewField(FieldData, b))
        }
 
        res = append(res, cc.NewReply(t, userFields...))
        }
 
        res = append(res, cc.NewReply(t, userFields...))
-       return res, err
+       return res
 }
 
 // HandleUpdateUser is used by the v1.5+ multi-user editor to perform account editing for multiple users at a time.
 }
 
 // HandleUpdateUser is used by the v1.5+ multi-user editor to perform account editing for multiple users at a time.
@@ -649,288 +574,275 @@ func HandleListUsers(cc *ClientConn, t *Transaction) (res []Transaction, err err
 // The Transaction sent by the client includes one data field per user that was modified.  This data field in turn
 // contains another data field encoded in its payload with a varying number of sub fields depending on which action is
 // performed.  This seems to be the only place in the Hotline protocol where a data field contains another data field.
 // The Transaction sent by the client includes one data field per user that was modified.  This data field in turn
 // contains another data field encoded in its payload with a varying number of sub fields depending on which action is
 // performed.  This seems to be the only place in the Hotline protocol where a data field contains another data field.
-func HandleUpdateUser(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
+func HandleUpdateUser(cc *ClientConn, t *Transaction) (res []Transaction) {
        for _, field := range t.Fields {
        for _, field := range t.Fields {
-               subFields, err := ReadFields(field.Data[0:2], field.Data[2:])
-               if err != nil {
-                       return res, err
+               var subFields []Field
+
+               // Create a new scanner for parsing incoming bytes into transaction tokens
+               scanner := bufio.NewScanner(bytes.NewReader(field.Data[2:]))
+               scanner.Split(fieldScanner)
+
+               for i := 0; i < int(binary.BigEndian.Uint16(field.Data[0:2])); i++ {
+                       scanner.Scan()
+
+                       var field Field
+                       if _, err := field.Write(scanner.Bytes()); err != nil {
+                               return res
+                       }
+                       subFields = append(subFields, field)
                }
 
                }
 
+               // If there's only one subfield, that indicates this is a delete operation for the login in FieldData
                if len(subFields) == 1 {
                if len(subFields) == 1 {
-                       login := DecodeUserString(getField(fieldData, &subFields).Data)
-                       cc.Server.Logger.Infow("DeleteUser", "login", login)
-
-                       if !authorize(cc.Account.Access, accessDeleteUser) {
-                               res = append(res, cc.NewErrReply(t, "You are not allowed to delete accounts."))
-                               return res, err
+                       if !cc.Authorize(accessDeleteUser) {
+                               return cc.NewErrReply(t, "You are not allowed to delete accounts.")
                        }
 
                        }
 
+                       login := string(encodeString(getField(FieldData, &subFields).Data))
+                       cc.logger.Info("DeleteUser", "login", login)
+
                        if err := cc.Server.DeleteUser(login); err != nil {
                        if err := cc.Server.DeleteUser(login); err != nil {
-                               return res, err
+                               return res
                        }
                        continue
                }
 
                        }
                        continue
                }
 
-               login := DecodeUserString(getField(fieldUserLogin, &subFields).Data)
+               // login of the account to update
+               var accountToUpdate, loginToRename string
+
+               // If FieldData is included, this is a rename operation where FieldData contains the login of the existing
+               // account and FieldUserLogin contains the new login.
+               if getField(FieldData, &subFields) != nil {
+                       loginToRename = string(encodeString(getField(FieldData, &subFields).Data))
+               }
+               userLogin := string(encodeString(getField(FieldUserLogin, &subFields).Data))
+               if loginToRename != "" {
+                       accountToUpdate = loginToRename
+               } else {
+                       accountToUpdate = userLogin
+               }
 
 
-               // check if the login exists; if so, we know we are updating an existing user
-               if acc, ok := cc.Server.Accounts[login]; ok {
-                       cc.Server.Logger.Infow("UpdateUser", "login", login)
+               // Check if accountToUpdate has an existing account.  If so, we know we are updating an existing user.
+               if acc, ok := cc.Server.Accounts[accountToUpdate]; ok {
+                       if loginToRename != "" {
+                               cc.logger.Info("RenameUser", "prevLogin", accountToUpdate, "newLogin", userLogin)
+                       } else {
+                               cc.logger.Info("UpdateUser", "login", accountToUpdate)
+                       }
 
                        // account exists, so this is an update action
 
                        // account exists, so this is an update action
-                       if !authorize(cc.Account.Access, accessModifyUser) {
-                               res = append(res, cc.NewErrReply(t, "You are not allowed to modify accounts."))
-                               return res, err
+                       if !cc.Authorize(accessModifyUser) {
+                               return cc.NewErrReply(t, "You are not allowed to modify accounts.")
                        }
 
                        }
 
-                       if getField(fieldUserPassword, &subFields) != nil {
-                               newPass := getField(fieldUserPassword, &subFields).Data
-                               acc.Password = hashAndSalt(newPass)
+                       // This part is a bit tricky. There are three possibilities:
+                       // 1) The transaction is intended to update the password.
+                       //        In this case, FieldUserPassword is sent with the new password.
+                       // 2) The transaction is intended to remove the password.
+                       //    In this case, FieldUserPassword is not sent.
+                       // 3) The transaction updates the users access bits, but not the password.
+                       //    In this case, FieldUserPassword is sent with zero as the only byte.
+                       if getField(FieldUserPassword, &subFields) != nil {
+                               newPass := getField(FieldUserPassword, &subFields).Data
+                               if !bytes.Equal([]byte{0}, newPass) {
+                                       acc.Password = hashAndSalt(newPass)
+                               }
                        } else {
                                acc.Password = hashAndSalt([]byte(""))
                        }
 
                        } else {
                                acc.Password = hashAndSalt([]byte(""))
                        }
 
-                       if getField(fieldUserAccess, &subFields) != nil {
-                               acc.Access = &getField(fieldUserAccess, &subFields).Data
+                       if getField(FieldUserAccess, &subFields) != nil {
+                               copy(acc.Access[:], getField(FieldUserAccess, &subFields).Data)
                        }
 
                        }
 
-                       err = cc.Server.UpdateUser(
-                               DecodeUserString(getField(fieldData, &subFields).Data),
-                               DecodeUserString(getField(fieldUserLogin, &subFields).Data),
-                               string(getField(fieldUserName, &subFields).Data),
+                       err := cc.Server.UpdateUser(
+                               string(encodeString(getField(FieldData, &subFields).Data)),
+                               string(encodeString(getField(FieldUserLogin, &subFields).Data)),
+                               string(getField(FieldUserName, &subFields).Data),
                                acc.Password,
                                acc.Password,
-                               *acc.Access,
+                               acc.Access,
                        )
                        if err != nil {
                        )
                        if err != nil {
-                               return res, err
+                               return res
                        }
                } else {
                        }
                } else {
-                       cc.Server.Logger.Infow("CreateUser", "login", login)
+                       if !cc.Authorize(accessCreateUser) {
+                               return cc.NewErrReply(t, "You are not allowed to create new accounts.")
+                       }
+
+                       cc.logger.Info("CreateUser", "login", userLogin)
+
+                       newAccess := accessBitmap{}
+                       copy(newAccess[:], getField(FieldUserAccess, &subFields).Data)
 
 
-                       if !authorize(cc.Account.Access, accessCreateUser) {
-                               res = append(res, cc.NewErrReply(t, "You are not allowed to create new accounts."))
-                               return res, err
+                       // Prevent account from creating new account with greater permission
+                       for i := 0; i < 64; i++ {
+                               if newAccess.IsSet(i) {
+                                       if !cc.Authorize(i) {
+                                               return cc.NewErrReply(t, "Cannot create account with more access than yourself.")
+                                       }
+                               }
                        }
 
                        }
 
-                       err := cc.Server.NewUser(
-                               login,
-                               string(getField(fieldUserName, &subFields).Data),
-                               string(getField(fieldUserPassword, &subFields).Data),
-                               getField(fieldUserAccess, &subFields).Data,
-                       )
+                       err := cc.Server.NewUser(userLogin, string(getField(FieldUserName, &subFields).Data), string(getField(FieldUserPassword, &subFields).Data), newAccess)
                        if err != nil {
                        if err != nil {
-                               return []Transaction{}, err
+                               return cc.NewErrReply(t, "Cannot create account because there is already an account with that login.")
                        }
                }
        }
 
                        }
                }
        }
 
-       res = append(res, cc.NewReply(t))
-       return res, err
+       return append(res, cc.NewReply(t))
 }
 
 // HandleNewUser creates a new user account
 }
 
 // HandleNewUser creates a new user account
-func HandleNewUser(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       if !authorize(cc.Account.Access, accessCreateUser) {
-               res = append(res, cc.NewErrReply(t, "You are not allowed to create new accounts."))
-               return res, err
+func HandleNewUser(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if !cc.Authorize(accessCreateUser) {
+               return cc.NewErrReply(t, "You are not allowed to create new accounts.")
        }
 
        }
 
-       login := DecodeUserString(t.GetField(fieldUserLogin).Data)
+       login := string(encodeString(t.GetField(FieldUserLogin).Data))
 
 
-       // If the account already exists, reply with an error
+       // If the account already dataFile, reply with an error
        if _, ok := cc.Server.Accounts[login]; ok {
        if _, ok := cc.Server.Accounts[login]; ok {
-               res = append(res, cc.NewErrReply(t, "Cannot create account "+login+" because there is already an account with that login."))
-               return res, err
+               return cc.NewErrReply(t, "Cannot create account "+login+" because there is already an account with that login.")
        }
 
        }
 
-       if err := cc.Server.NewUser(
-               login,
-               string(t.GetField(fieldUserName).Data),
-               string(t.GetField(fieldUserPassword).Data),
-               t.GetField(fieldUserAccess).Data,
-       ); err != nil {
-               return []Transaction{}, err
+       newAccess := accessBitmap{}
+       copy(newAccess[:], t.GetField(FieldUserAccess).Data)
+
+       // Prevent account from creating new account with greater permission
+       for i := 0; i < 64; i++ {
+               if newAccess.IsSet(i) {
+                       if !cc.Authorize(i) {
+                               return cc.NewErrReply(t, "Cannot create account with more access than yourself.")
+                       }
+               }
        }
 
        }
 
-       res = append(res, cc.NewReply(t))
-       return res, err
+       if err := cc.Server.NewUser(login, string(t.GetField(FieldUserName).Data), string(t.GetField(FieldUserPassword).Data), newAccess); err != nil {
+               return cc.NewErrReply(t, "Cannot create account because there is already an account with that login.")
+       }
+
+       return append(res, cc.NewReply(t))
 }
 
 }
 
-func HandleDeleteUser(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       if !authorize(cc.Account.Access, accessDeleteUser) {
-               res = append(res, cc.NewErrReply(t, "You are not allowed to delete accounts."))
-               return res, err
+func HandleDeleteUser(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if !cc.Authorize(accessDeleteUser) {
+               return cc.NewErrReply(t, "You are not allowed to delete accounts.")
        }
 
        }
 
-       // TODO: Handle case where account doesn't exist; e.g. delete race condition
-       login := DecodeUserString(t.GetField(fieldUserLogin).Data)
+       login := string(encodeString(t.GetField(FieldUserLogin).Data))
 
        if err := cc.Server.DeleteUser(login); err != nil {
 
        if err := cc.Server.DeleteUser(login); err != nil {
-               return res, err
+               return res
        }
 
        }
 
-       res = append(res, cc.NewReply(t))
-       return res, err
+       return append(res, cc.NewReply(t))
 }
 
 // HandleUserBroadcast sends an Administrator Message to all connected clients of the server
 }
 
 // HandleUserBroadcast sends an Administrator Message to all connected clients of the server
-func HandleUserBroadcast(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       if !authorize(cc.Account.Access, accessBroadcast) {
-               res = append(res, cc.NewErrReply(t, "You are not allowed to send broadcast messages."))
-               return res, err
+func HandleUserBroadcast(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if !cc.Authorize(accessBroadcast) {
+               return cc.NewErrReply(t, "You are not allowed to send broadcast messages.")
        }
 
        cc.sendAll(
        }
 
        cc.sendAll(
-               tranServerMsg,
-               NewField(fieldData, t.GetField(tranGetMsgs).Data),
-               NewField(fieldChatOptions, []byte{0}),
+               TranServerMsg,
+               NewField(FieldData, t.GetField(FieldData).Data),
+               NewField(FieldChatOptions, []byte{0}),
        )
 
        )
 
-       res = append(res, cc.NewReply(t))
-       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")
+       return append(res, cc.NewReply(t))
 }
 
 }
 
-func HandleGetClientConnInfoText(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       if !authorize(cc.Account.Access, accessGetClientInfo) {
-               res = append(res, cc.NewErrReply(t, "You are not allowed to get client info"))
-               return res, err
+// HandleGetClientInfoText returns user information for the specific user.
+//
+// Fields used in the request:
+// 103 User ID
+//
+// Fields used in the reply:
+// 102 User Name
+// 101 Data            User info text string
+func HandleGetClientInfoText(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if !cc.Authorize(accessGetClientInfo) {
+               return cc.NewErrReply(t, "You are not allowed to get client info.")
        }
 
        }
 
-       clientID, _ := byteToInt(t.GetField(fieldUserID).Data)
+       clientID := t.GetField(FieldUserID).Data
 
 
-       clientConn := cc.Server.Clients[uint16(clientID)]
+       clientConn := cc.Server.Clients[[2]byte(clientID)]
        if clientConn == nil {
        if clientConn == nil {
-               return res, errors.New("invalid client")
-       }
-
-       // TODO: Implement non-hardcoded values
-       template := `Nickname:   %s
-Name:       %s
-Account:    %s
-Address:    %s
-
--------- File Downloads ---------
-
-%s
-
-------- Folder Downloads --------
-
-None.
-
---------- File Uploads ----------
-
-None.
-
--------- Folder Uploads ---------
-
-None.
-
-------- Waiting Downloads -------
-
-None.
-
-       `
-
-       activeDownloads := clientConn.Transfers[FileDownload]
-       activeDownloadList := "None."
-       for _, dl := range activeDownloads {
-               activeDownloadList += dl.String() + "\n"
+               return cc.NewErrReply(t, "User not found.")
        }
 
        }
 
-       template = fmt.Sprintf(
-               template,
-               clientConn.UserName,
-               clientConn.Account.Name,
-               clientConn.Account.Login,
-               clientConn.RemoteAddr,
-               activeDownloadList,
-       )
-       template = strings.Replace(template, "\n", "\r", -1)
-
        res = append(res, cc.NewReply(t,
        res = append(res, cc.NewReply(t,
-               NewField(fieldData, []byte(template)),
-               NewField(fieldUserName, clientConn.UserName),
+               NewField(FieldData, []byte(clientConn.String())),
+               NewField(FieldUserName, clientConn.UserName),
        ))
        ))
-       return res, err
+       return res
 }
 
 }
 
-func HandleGetUserNameList(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       res = append(res, cc.NewReply(t, cc.Server.connectedUsers()...))
-
-       return res, err
+func HandleGetUserNameList(cc *ClientConn, t *Transaction) (res []Transaction) {
+       return []Transaction{cc.NewReply(t, cc.Server.connectedUsers()...)}
 }
 
 }
 
-func HandleTranAgreed(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       cc.Agreed = true
-       cc.UserName = t.GetField(fieldUserName).Data
-       *cc.Icon = t.GetField(fieldUserIconID).Data
+func HandleTranAgreed(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if t.GetField(FieldUserName).Data != nil {
+               if cc.Authorize(accessAnyName) {
+                       cc.UserName = t.GetField(FieldUserName).Data
+               } else {
+                       cc.UserName = []byte(cc.Account.Name)
+               }
+       }
 
 
-       options := t.GetField(fieldOptions).Data
-       optBitmap := big.NewInt(int64(binary.BigEndian.Uint16(options)))
+       cc.Icon = t.GetField(FieldUserIconID).Data
 
 
-       flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(*cc.Flags)))
+       cc.logger = cc.logger.With("Name", string(cc.UserName))
+       cc.logger.Info("Login successful", "clientVersion", fmt.Sprintf("%v", func() int { i, _ := byteToInt(cc.Version); return i }()))
+
+       options := t.GetField(FieldOptions).Data
+       optBitmap := big.NewInt(int64(binary.BigEndian.Uint16(options)))
 
        // Check refuse private PM option
 
        // Check refuse private PM option
-       if optBitmap.Bit(refusePM) == 1 {
-               flagBitmap.SetBit(flagBitmap, userFlagRefusePM, 1)
-               binary.BigEndian.PutUint16(*cc.Flags, uint16(flagBitmap.Int64()))
-       }
+
+       cc.flagsMU.Lock()
+       defer cc.flagsMU.Unlock()
+       cc.Flags.Set(UserFlagRefusePM, optBitmap.Bit(UserOptRefusePM))
 
        // Check refuse private chat option
 
        // Check refuse private chat option
-       if optBitmap.Bit(refuseChat) == 1 {
-               flagBitmap.SetBit(flagBitmap, userFLagRefusePChat, 1)
-               binary.BigEndian.PutUint16(*cc.Flags, uint16(flagBitmap.Int64()))
-       }
+       cc.Flags.Set(UserFlagRefusePChat, optBitmap.Bit(UserOptRefuseChat))
 
        // Check auto response
 
        // Check auto response
-       if optBitmap.Bit(autoResponse) == 1 {
-               cc.AutoReply = t.GetField(fieldAutomaticResponse).Data
-       } else {
-               cc.AutoReply = []byte{}
+       if optBitmap.Bit(UserOptAutoResponse) == 1 {
+               cc.AutoReply = t.GetField(FieldAutomaticResponse).Data
        }
 
        }
 
-       cc.notifyOthers(
-               *NewTransaction(
-                       tranNotifyChangeUser, nil,
-                       NewField(fieldUserName, cc.UserName),
-                       NewField(fieldUserID, *cc.ID),
-                       NewField(fieldUserIconID, *cc.Icon),
-                       NewField(fieldUserFlags, *cc.Flags),
+       trans := cc.notifyOthers(
+               NewTransaction(
+                       TranNotifyChangeUser, [2]byte{0, 0},
+                       NewField(FieldUserName, cc.UserName),
+                       NewField(FieldUserID, cc.ID[:]),
+                       NewField(FieldUserIconID, cc.Icon),
+                       NewField(FieldUserFlags, cc.Flags[:]),
                ),
        )
                ),
        )
+       res = append(res, trans...)
+
+       if cc.Server.Config.BannerFile != "" {
+               res = append(res, NewTransaction(TranServerBanner, cc.ID, NewField(FieldBannerType, []byte("JPEG"))))
+       }
 
        res = append(res, cc.NewReply(t))
 
 
        res = append(res, cc.NewReply(t))
 
-       return res, err
+       return res
 }
 
 }
 
-const defaultNewsDateFormat = "Jan02 15:04" // Jun23 20:49
-//  "Mon, 02 Jan 2006 15:04:05 MST"
-
-const defaultNewsTemplate = `From %s (%s):
-
-%s
-
-__________________________________________________________`
-
 // HandleTranOldPostNews updates the flat news
 // Fields used in this request:
 // 101 Data
 // HandleTranOldPostNews updates the flat news
 // Fields used in this request:
 // 101 Data
-func HandleTranOldPostNews(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       if !authorize(cc.Account.Access, accessNewsPostArt) {
-               res = append(res, cc.NewErrReply(t, "You are not allowed to post news."))
-               return res, err
+func HandleTranOldPostNews(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if !cc.Authorize(accessNewsPostArt) {
+               return cc.NewErrReply(t, "You are not allowed to post news.")
        }
 
        cc.Server.flatNewsMux.Lock()
        }
 
        cc.Server.flatNewsMux.Lock()
@@ -946,61 +858,94 @@ func HandleTranOldPostNews(cc *ClientConn, t *Transaction) (res []Transaction, e
                newsTemplate = cc.Server.Config.NewsDelimiter
        }
 
                newsTemplate = cc.Server.Config.NewsDelimiter
        }
 
-       newsPost := fmt.Sprintf(newsTemplate+"\r", cc.UserName, time.Now().Format(newsDateTemplate), t.GetField(fieldData).Data)
-       newsPost = strings.Replace(newsPost, "\n", "\r", -1)
+       newsPost := fmt.Sprintf(newsTemplate+"\r", cc.UserName, time.Now().Format(newsDateTemplate), t.GetField(FieldData).Data)
+       newsPost = strings.ReplaceAll(newsPost, "\n", "\r")
 
        // update news in memory
        cc.Server.FlatNews = append([]byte(newsPost), cc.Server.FlatNews...)
 
        // update news on disk
 
        // update news in memory
        cc.Server.FlatNews = append([]byte(newsPost), cc.Server.FlatNews...)
 
        // update news on disk
-       if err := ioutil.WriteFile(cc.Server.ConfigDir+"MessageBoard.txt", cc.Server.FlatNews, 0644); err != nil {
-               return res, err
+       if err := cc.Server.FS.WriteFile(filepath.Join(cc.Server.ConfigDir, "MessageBoard.txt"), cc.Server.FlatNews, 0644); err != nil {
+               return res
        }
 
        // Notify all clients of updated news
        cc.sendAll(
        }
 
        // Notify all clients of updated news
        cc.sendAll(
-               tranNewMsg,
-               NewField(fieldData, []byte(newsPost)),
+               TranNewMsg,
+               NewField(FieldData, []byte(newsPost)),
        )
 
        res = append(res, cc.NewReply(t))
        )
 
        res = append(res, cc.NewReply(t))
-       return res, err
+       return res
 }
 
 }
 
-func HandleDisconnectUser(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       if !authorize(cc.Account.Access, accessDisconUser) {
-               res = append(res, cc.NewErrReply(t, "You are not allowed to disconnect users."))
-               return res, err
+func HandleDisconnectUser(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if !cc.Authorize(accessDisconUser) {
+               return cc.NewErrReply(t, "You are not allowed to disconnect users.")
        }
 
        }
 
-       clientConn := cc.Server.Clients[binary.BigEndian.Uint16(t.GetField(fieldUserID).Data)]
+       clientConn := cc.Server.Clients[[2]byte(t.GetField(FieldUserID).Data)]
 
 
-       if authorize(clientConn.Account.Access, accessCannotBeDiscon) {
-               res = append(res, cc.NewErrReply(t, clientConn.Account.Login+" is not allowed to be disconnected."))
-               return res, err
+       if clientConn.Authorize(accessCannotBeDiscon) {
+               return cc.NewErrReply(t, clientConn.Account.Login+" is not allowed to be disconnected.")
        }
 
        }
 
-       if err := clientConn.Connection.Close(); err != nil {
-               return res, err
+       // If FieldOptions is set, then the client IP is banned in addition to disconnected.
+       // 00 01 = temporary ban
+       // 00 02 = permanent ban
+       if t.GetField(FieldOptions).Data != nil {
+               switch t.GetField(FieldOptions).Data[1] {
+               case 1:
+                       // send message: "You are temporarily banned on this server"
+                       cc.logger.Info("Disconnect & temporarily ban " + string(clientConn.UserName))
+
+                       res = append(res, NewTransaction(
+                               TranServerMsg,
+                               clientConn.ID,
+                               NewField(FieldData, []byte("You are temporarily banned on this server")),
+                               NewField(FieldChatOptions, []byte{0, 0}),
+                       ))
+
+                       banUntil := time.Now().Add(tempBanDuration)
+                       cc.Server.banList[strings.Split(clientConn.RemoteAddr, ":")[0]] = &banUntil
+               case 2:
+                       // send message: "You are permanently banned on this server"
+                       cc.logger.Info("Disconnect & ban " + string(clientConn.UserName))
+
+                       res = append(res, NewTransaction(
+                               TranServerMsg,
+                               clientConn.ID,
+                               NewField(FieldData, []byte("You are permanently banned on this server")),
+                               NewField(FieldChatOptions, []byte{0, 0}),
+                       ))
+
+                       cc.Server.banList[strings.Split(clientConn.RemoteAddr, ":")[0]] = nil
+               }
+
+               err := cc.Server.writeBanList()
+               if err != nil {
+                       return res
+               }
        }
 
        }
 
-       res = append(res, cc.NewReply(t))
-       return res, err
+       // TODO: remove this awful hack
+       go func() {
+               time.Sleep(1 * time.Second)
+               clientConn.Disconnect()
+       }()
+
+       return append(res, cc.NewReply(t))
 }
 
 // HandleGetNewsCatNameList returns a list of news categories for a path
 // Fields used in the request:
 // 325 News path       (Optional)
 }
 
 // HandleGetNewsCatNameList returns a list of news categories for a path
 // Fields used in the request:
 // 325 News path       (Optional)
-func HandleGetNewsCatNameList(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       if !authorize(cc.Account.Access, accessNewsReadArt) {
-               res = append(res, cc.NewErrReply(t, "You are not allowed to read news."))
-               return res, err
+func HandleGetNewsCatNameList(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if !cc.Authorize(accessNewsReadArt) {
+               return cc.NewErrReply(t, "You are not allowed to read news.")
        }
 
        }
 
-       newsPath := t.GetField(fieldNewsPath).Data
-       cc.Server.Logger.Infow("NewsPath: ", "np", string(newsPath))
-
-       pathStrs := ReadNewsPath(t.GetField(fieldNewsPath).Data)
+       pathStrs := ReadNewsPath(t.GetField(FieldNewsPath).Data)
        cats := cc.Server.GetNewsCatByPath(pathStrs)
 
        // To store the keys in slice in sorted order
        cats := cc.Server.GetNewsCatByPath(pathStrs)
 
        // To store the keys in slice in sorted order
@@ -1015,80 +960,77 @@ func HandleGetNewsCatNameList(cc *ClientConn, t *Transaction) (res []Transaction
        var fieldData []Field
        for _, k := range keys {
                cat := cats[k]
        var fieldData []Field
        for _, k := range keys {
                cat := cats[k]
-               b, _ := cat.MarshalBinary()
-               fieldData = append(fieldData, NewField(
-                       fieldNewsCatListData15,
-                       b,
-               ))
+
+               b, _ := io.ReadAll(&cat)
+
+               fieldData = append(fieldData, NewField(FieldNewsCatListData15, b))
        }
 
        res = append(res, cc.NewReply(t, fieldData...))
        }
 
        res = append(res, cc.NewReply(t, fieldData...))
-       return res, err
+       return res
 }
 
 }
 
-func HandleNewNewsCat(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       if !authorize(cc.Account.Access, accessNewsCreateCat) {
-               res = append(res, cc.NewErrReply(t, "You are not allowed to create news categories."))
-               return res, err
+func HandleNewNewsCat(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if !cc.Authorize(accessNewsCreateCat) {
+               return cc.NewErrReply(t, "You are not allowed to create news categories.")
        }
 
        }
 
-       name := string(t.GetField(fieldNewsCatName).Data)
-       pathStrs := ReadNewsPath(t.GetField(fieldNewsPath).Data)
+       name := string(t.GetField(FieldNewsCatName).Data)
+       pathStrs := ReadNewsPath(t.GetField(FieldNewsPath).Data)
 
        cats := cc.Server.GetNewsCatByPath(pathStrs)
        cats[name] = NewsCategoryListData15{
                Name:     name,
 
        cats := cc.Server.GetNewsCatByPath(pathStrs)
        cats[name] = NewsCategoryListData15{
                Name:     name,
-               Type:     []byte{0, 3},
+               Type:     [2]byte{0, 3},
                Articles: map[uint32]*NewsArtData{},
                SubCats:  make(map[string]NewsCategoryListData15),
        }
 
        if err := cc.Server.writeThreadedNews(); err != nil {
                Articles: map[uint32]*NewsArtData{},
                SubCats:  make(map[string]NewsCategoryListData15),
        }
 
        if err := cc.Server.writeThreadedNews(); err != nil {
-               return res, err
+               return res
        }
        res = append(res, cc.NewReply(t))
        }
        res = append(res, cc.NewReply(t))
-       return res, err
+       return res
 }
 
 // Fields used in the request:
 }
 
 // Fields used in the request:
-// 322 News category name
+// 322 News category Name
 // 325 News path
 // 325 News path
-func HandleNewNewsFldr(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       if !authorize(cc.Account.Access, accessNewsCreateFldr) {
-               res = append(res, cc.NewErrReply(t, "You are not allowed to create news folders."))
-               return res, err
+func HandleNewNewsFldr(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if !cc.Authorize(accessNewsCreateFldr) {
+               return cc.NewErrReply(t, "You are not allowed to create news folders.")
        }
 
        }
 
-       name := string(t.GetField(fieldFileName).Data)
-       pathStrs := ReadNewsPath(t.GetField(fieldNewsPath).Data)
-
-       cc.Server.Logger.Infof("Creating new news folder %s", name)
+       name := string(t.GetField(FieldFileName).Data)
+       pathStrs := ReadNewsPath(t.GetField(FieldNewsPath).Data)
 
        cats := cc.Server.GetNewsCatByPath(pathStrs)
        cats[name] = NewsCategoryListData15{
                Name:     name,
 
        cats := cc.Server.GetNewsCatByPath(pathStrs)
        cats[name] = NewsCategoryListData15{
                Name:     name,
-               Type:     []byte{0, 2},
+               Type:     [2]byte{0, 2},
                Articles: map[uint32]*NewsArtData{},
                SubCats:  make(map[string]NewsCategoryListData15),
        }
        if err := cc.Server.writeThreadedNews(); err != nil {
                Articles: map[uint32]*NewsArtData{},
                SubCats:  make(map[string]NewsCategoryListData15),
        }
        if err := cc.Server.writeThreadedNews(); err != nil {
-               return res, err
+               return res
        }
        res = append(res, cc.NewReply(t))
        }
        res = append(res, cc.NewReply(t))
-       return res, err
+       return res
 }
 
 }
 
+// HandleGetNewsArtData gets the list of article names at the specified news path.
+
 // Fields used in the request:
 // 325 News path       Optional
 // Fields used in the request:
 // 325 News path       Optional
-//
-// Reply fields:
+
+// Fields used in the reply:
 // 321 News article list data  Optional
 // 321 News article list data  Optional
-func HandleGetNewsArtNameList(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       if !authorize(cc.Account.Access, accessNewsReadArt) {
-               res = append(res, cc.NewErrReply(t, "You are not allowed to read news."))
-               return res, err
+func HandleGetNewsArtNameList(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if !cc.Authorize(accessNewsReadArt) {
+               return cc.NewErrReply(t, "You are not allowed to read news.")
        }
        }
-       pathStrs := ReadNewsPath(t.GetField(fieldNewsPath).Data)
+
+       pathStrs := ReadNewsPath(t.GetField(FieldNewsPath).Data)
 
        var cat NewsCategoryListData15
        cats := cc.Server.ThreadedNews.Categories
 
        var cat NewsCategoryListData15
        cats := cc.Server.ThreadedNews.Categories
@@ -1100,77 +1042,81 @@ func HandleGetNewsArtNameList(cc *ClientConn, t *Transaction) (res []Transaction
 
        nald := cat.GetNewsArtListData()
 
 
        nald := cat.GetNewsArtListData()
 
-       res = append(res, cc.NewReply(t, NewField(fieldNewsArtListData, nald.Payload())))
-       return res, err
-}
-
-func HandleGetNewsArtData(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       if !authorize(cc.Account.Access, accessNewsReadArt) {
-               res = append(res, cc.NewErrReply(t, "You are not allowed to read news."))
-               return res, err
+       b, err := io.ReadAll(&nald)
+       if err != nil {
+               return res
        }
 
        }
 
-       // Request fields
-       // 325  News fp
-       // 326  News article ID
-       // 327  News article data flavor
+       res = append(res, cc.NewReply(t, NewField(FieldNewsArtListData, b)))
+       return res
+}
 
 
-       pathStrs := ReadNewsPath(t.GetField(fieldNewsPath).Data)
+// 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) {
+       if !cc.Authorize(accessNewsReadArt) {
+               return cc.NewErrReply(t, "You are not allowed to read news.")
+       }
 
        var cat NewsCategoryListData15
        cats := cc.Server.ThreadedNews.Categories
 
 
        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
        }
                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
+       }
 
 
-       art := cat.Articles[uint32(convertedArtID)]
+       art := cat.Articles[uint32(convertedID)]
        if art == nil {
        if art == nil {
-               res = append(res, cc.NewReply(t))
-               return res, err
+               return append(res, cc.NewReply(t))
        }
 
        }
 
-       // 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,
        res = append(res, cc.NewReply(t,
-               NewField(fieldNewsArtTitle, []byte(art.Title)),
-               NewField(fieldNewsArtPoster, []byte(art.Poster)),
-               NewField(fieldNewsArtDate, art.Date),
-               NewField(fieldNewsArtPrevArt, art.PrevArt),
-               NewField(fieldNewsArtNextArt, art.NextArt),
-               NewField(fieldNewsArtParentArt, art.ParentArt),
-               NewField(fieldNewsArt1stChildArt, art.FirstChildArt),
-               NewField(fieldNewsArtDataFlav, []byte("text/plain")),
-               NewField(fieldNewsArtData, []byte(art.Data)),
+               NewField(FieldNewsArtTitle, []byte(art.Title)),
+               NewField(FieldNewsArtPoster, []byte(art.Poster)),
+               NewField(FieldNewsArtDate, art.Date[:]),
+               NewField(FieldNewsArtPrevArt, art.PrevArt[:]),
+               NewField(FieldNewsArtNextArt, art.NextArt[:]),
+               NewField(FieldNewsArtParentArt, art.ParentArt[:]),
+               NewField(FieldNewsArt1stChildArt, art.FirstChildArt[:]),
+               NewField(FieldNewsArtDataFlav, []byte("text/plain")),
+               NewField(FieldNewsArtData, []byte(art.Data)),
        ))
        ))
-       return res, err
+       return res
 }
 
 }
 
-func HandleDelNewsItem(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       // Has multiple access flags: News Delete Folder (37) or News Delete Category (35)
-       // TODO: Implement
-
-       pathStrs := ReadNewsPath(t.GetField(fieldNewsPath).Data)
-
-       // TODO: determine if path is a Folder (Bundle) or Category and check for permission
-
-       cc.Server.Logger.Infof("DelNewsItem %v", pathStrs)
+// HandleDelNewsItem deletes an existing threaded news folder or category from the server.
+// Fields used in the request:
+// 325 News path
+// Fields used in the reply:
+// None
+func HandleDelNewsItem(cc *ClientConn, t *Transaction) (res []Transaction) {
+       pathStrs := ReadNewsPath(t.GetField(FieldNewsPath).Data)
 
        cats := cc.Server.ThreadedNews.Categories
 
        cats := cc.Server.ThreadedNews.Categories
-
        delName := pathStrs[len(pathStrs)-1]
        if len(pathStrs) > 1 {
                for _, fp := range pathStrs[0 : len(pathStrs)-1] {
        delName := pathStrs[len(pathStrs)-1]
        if len(pathStrs) > 1 {
                for _, fp := range pathStrs[0 : len(pathStrs)-1] {
@@ -1178,31 +1124,40 @@ func HandleDelNewsItem(cc *ClientConn, t *Transaction) (res []Transaction, err e
                }
        }
 
                }
        }
 
+       if cats[delName].Type == [2]byte{0, 3} {
+               if !cc.Authorize(accessNewsDeleteCat) {
+                       return cc.NewErrReply(t, "You are not allowed to delete news categories.")
+               }
+       } else {
+               if !cc.Authorize(accessNewsDeleteFldr) {
+                       return cc.NewErrReply(t, "You are not allowed to delete news folders.")
+               }
+       }
+
        delete(cats, delName)
 
        delete(cats, delName)
 
-       err = cc.Server.writeThreadedNews()
-       if err != nil {
-               return res, err
+       if err := cc.Server.writeThreadedNews(); err != nil {
+               return res
        }
 
        }
 
-       // Reply params: none
-       res = append(res, cc.NewReply(t))
-
-       return res, err
+       return append(res, cc.NewReply(t))
 }
 
 }
 
-func HandleDelNewsArt(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       if !authorize(cc.Account.Access, accessNewsDeleteArt) {
-               res = append(res, cc.NewErrReply(t, "You are not allowed to delete news articles."))
-               return res, err
+func HandleDelNewsArt(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if !cc.Authorize(accessNewsDeleteArt) {
+               return cc.NewErrReply(t, "You are not allowed to delete news articles.")
+
        }
 
        // Request Fields
        // 325  News path
        // 326  News article ID
        // 337  News article – recursive delete       Delete child articles (1) or not (0)
        }
 
        // Request Fields
        // 325  News path
        // 326  News article ID
        // 337  News article – recursive delete       Delete child articles (1) or not (0)
-       pathStrs := ReadNewsPath(t.GetField(fieldNewsPath).Data)
-       ID := binary.BigEndian.Uint16(t.GetField(fieldNewsArtID).Data)
+       pathStrs := ReadNewsPath(t.GetField(FieldNewsPath).Data)
+       ID, err := byteToInt(t.GetField(FieldNewsArtID).Data)
+       if err != nil {
+               return res
+       }
 
        // TODO: Delete recursive
        cats := cc.Server.GetNewsCatByPath(pathStrs[:len(pathStrs)-1])
 
        // TODO: Delete recursive
        cats := cc.Server.GetNewsCatByPath(pathStrs[:len(pathStrs)-1])
@@ -1214,11 +1169,11 @@ func HandleDelNewsArt(cc *ClientConn, t *Transaction) (res []Transaction, err er
 
        cats[catName] = cat
        if err := cc.Server.writeThreadedNews(); err != nil {
 
        cats[catName] = cat
        if err := cc.Server.writeThreadedNews(); err != nil {
-               return res, err
+               return res
        }
 
        res = append(res, cc.NewReply(t))
        }
 
        res = append(res, cc.NewReply(t))
-       return res, err
+       return res
 }
 
 // Request fields
 }
 
 // Request fields
@@ -1228,28 +1183,35 @@ func HandleDelNewsArt(cc *ClientConn, t *Transaction) (res []Transaction, err er
 // 334 News article flags
 // 327 News article data flavor                Currently “text/plain”
 // 333 News article data
 // 334 News article flags
 // 327 News article data flavor                Currently “text/plain”
 // 333 News article data
-func HandlePostNewsArt(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       if !authorize(cc.Account.Access, accessNewsPostArt) {
-               res = append(res, cc.NewErrReply(t, "You are not allowed to post news articles."))
-               return res, err
+func HandlePostNewsArt(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if !cc.Authorize(accessNewsPostArt) {
+               return cc.NewErrReply(t, "You are not allowed to post news articles.")
        }
 
        }
 
-       pathStrs := ReadNewsPath(t.GetField(fieldNewsPath).Data)
+       pathStrs := ReadNewsPath(t.GetField(FieldNewsPath).Data)
        cats := cc.Server.GetNewsCatByPath(pathStrs[:len(pathStrs)-1])
 
        catName := pathStrs[len(pathStrs)-1]
        cat := cats[catName]
 
        cats := cc.Server.GetNewsCatByPath(pathStrs[:len(pathStrs)-1])
 
        catName := pathStrs[len(pathStrs)-1]
        cat := cats[catName]
 
+       artID, err := byteToInt(t.GetField(FieldNewsArtID).Data)
+       if err != nil {
+               return res
+       }
+       convertedArtID := uint32(artID)
+       bs := make([]byte, 4)
+       binary.BigEndian.PutUint32(bs, convertedArtID)
+
+       cc.Server.mux.Lock()
+       defer cc.Server.mux.Unlock()
+
        newArt := NewsArtData{
        newArt := NewsArtData{
-               Title:         string(t.GetField(fieldNewsArtTitle).Data),
-               Poster:        string(cc.UserName),
-               Date:          toHotlineTime(time.Now()),
-               PrevArt:       []byte{0, 0, 0, 0},
-               NextArt:       []byte{0, 0, 0, 0},
-               ParentArt:     append([]byte{0, 0}, t.GetField(fieldNewsArtID).Data...),
-               FirstChildArt: []byte{0, 0, 0, 0},
-               DataFlav:      []byte("text/plain"),
-               Data:          string(t.GetField(fieldNewsArtData).Data),
+               Title:     string(t.GetField(FieldNewsArtTitle).Data),
+               Poster:    string(cc.UserName),
+               Date:      toHotlineTime(time.Now()),
+               ParentArt: [4]byte(bs),
+               DataFlav:  []byte("text/plain"),
+               Data:      string(t.GetField(FieldNewsArtData).Data),
        }
 
        var keys []int
        }
 
        var keys []int
@@ -1263,19 +1225,19 @@ func HandlePostNewsArt(cc *ClientConn, t *Transaction) (res []Transaction, err e
                prevID := uint32(keys[len(keys)-1])
                nextID = prevID + 1
 
                prevID := uint32(keys[len(keys)-1])
                nextID = prevID + 1
 
-               binary.BigEndian.PutUint32(newArt.PrevArt, prevID)
+               binary.BigEndian.PutUint32(newArt.PrevArt[:], prevID)
 
                // Set next article ID
 
                // Set next article ID
-               binary.BigEndian.PutUint32(cat.Articles[prevID].NextArt, nextID)
+               binary.BigEndian.PutUint32(cat.Articles[prevID].NextArt[:], nextID)
        }
 
        // Update parent article with first child reply
        }
 
        // Update parent article with first child reply
-       parentID := binary.BigEndian.Uint16(t.GetField(fieldNewsArtID).Data)
+       parentID := convertedArtID
        if parentID != 0 {
        if parentID != 0 {
-               parentArt := cat.Articles[uint32(parentID)]
+               parentArt := cat.Articles[parentID]
 
 
-               if bytes.Equal(parentArt.FirstChildArt, []byte{0, 0, 0, 0}) {
-                       binary.BigEndian.PutUint32(parentArt.FirstChildArt, nextID)
+               if parentArt.FirstChildArt == [4]byte{0, 0, 0, 0} {
+                       binary.BigEndian.PutUint32(parentArt.FirstChildArt[:], nextID)
                }
        }
 
                }
        }
 
@@ -1283,249 +1245,202 @@ func HandlePostNewsArt(cc *ClientConn, t *Transaction) (res []Transaction, err e
 
        cats[catName] = cat
        if err := cc.Server.writeThreadedNews(); err != nil {
 
        cats[catName] = cat
        if err := cc.Server.writeThreadedNews(); err != nil {
-               return res, err
+               return res
        }
 
        }
 
-       res = append(res, cc.NewReply(t))
-       return res, err
+       return append(res, cc.NewReply(t))
 }
 
 // HandleGetMsgs returns the flat news data
 }
 
 // HandleGetMsgs returns the flat news data
-func HandleGetMsgs(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       if !authorize(cc.Account.Access, accessNewsReadArt) {
-               res = append(res, cc.NewErrReply(t, "You are not allowed to read news."))
-               return res, err
+func HandleGetMsgs(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if !cc.Authorize(accessNewsReadArt) {
+               return cc.NewErrReply(t, "You are not allowed to read news.")
        }
 
        }
 
-       res = append(res, cc.NewReply(t, NewField(fieldData, cc.Server.FlatNews)))
+       res = append(res, cc.NewReply(t, NewField(FieldData, cc.Server.FlatNews)))
 
 
-       return res, err
+       return res
 }
 
 }
 
-func HandleDownloadFile(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       if !authorize(cc.Account.Access, accessDownloadFile) {
-               res = append(res, cc.NewErrReply(t, "You are not allowed to download files."))
-               return res, err
+func HandleDownloadFile(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if !cc.Authorize(accessDownloadFile) {
+               return cc.NewErrReply(t, "You are not allowed to download files.")
        }
 
        }
 
-       fileName := t.GetField(fieldFileName).Data
-       filePath := t.GetField(fieldFilePath).Data
-
-       resumeData := t.GetField(fieldFileResumeData).Data
+       fileName := t.GetField(FieldFileName).Data
+       filePath := t.GetField(FieldFilePath).Data
+       resumeData := t.GetField(FieldFileResumeData).Data
 
        var dataOffset int64
        var frd FileResumeData
        if resumeData != nil {
 
        var dataOffset int64
        var frd FileResumeData
        if resumeData != nil {
-               if err := frd.UnmarshalBinary(t.GetField(fieldFileResumeData).Data); err != nil {
-                       return res, err
+               if err := frd.UnmarshalBinary(t.GetField(FieldFileResumeData).Data); err != nil {
+                       return res
                }
                }
+               // TODO: handle rsrc fork offset
                dataOffset = int64(binary.BigEndian.Uint32(frd.ForkInfoList[0].DataSize[:]))
        }
 
                dataOffset = int64(binary.BigEndian.Uint32(frd.ForkInfoList[0].DataSize[:]))
        }
 
-       var fp FilePath
-       err = fp.UnmarshalBinary(filePath)
+       fullFilePath, err := readPath(cc.Server.Config.FileRoot, filePath, fileName)
        if err != nil {
        if err != nil {
-               return res, err
+               return res
        }
 
        }
 
-       ffo, err := NewFlattenedFileObject(cc.Server.Config.FileRoot, filePath, fileName, dataOffset)
+       hlFile, err := newFileWrapper(cc.Server.FS, fullFilePath, dataOffset)
        if err != nil {
        if err != nil {
-               return res, err
+               return res
        }
 
        }
 
-       transactionRef := cc.Server.NewTransactionRef()
-       data := binary.BigEndian.Uint32(transactionRef)
+       xferSize := hlFile.ffo.TransferSize(0)
 
 
-       ft := &FileTransfer{
-               FileName:        fileName,
-               FilePath:        filePath,
-               ReferenceNumber: transactionRef,
-               Type:            FileDownload,
-       }
+       ft := cc.newFileTransfer(FileDownload, fileName, filePath, xferSize)
 
 
+       // TODO: refactor to remove this
        if resumeData != nil {
                var frd FileResumeData
        if resumeData != nil {
                var frd FileResumeData
-               if err := frd.UnmarshalBinary(t.GetField(fieldFileResumeData).Data); err != nil {
-                       return res, err
+               if err := frd.UnmarshalBinary(t.GetField(FieldFileResumeData).Data); err != nil {
+                       return res
                }
                ft.fileResumeData = &frd
        }
 
                }
                ft.fileResumeData = &frd
        }
 
-       xferSize := ffo.TransferSize()
-
        // Optional field for when a HL v1.5+ client requests file preview
        // Used only for TEXT, JPEG, GIFF, BMP or PICT files
        // The value will always be 2
        // Optional field for when a HL v1.5+ client requests file preview
        // Used only for TEXT, JPEG, GIFF, BMP or PICT files
        // The value will always be 2
-       if t.GetField(fieldFileTransferOptions).Data != nil {
-               ft.options = t.GetField(fieldFileTransferOptions).Data
-               xferSize = ffo.FlatFileDataForkHeader.DataSize[:]
+       if t.GetField(FieldFileTransferOptions).Data != nil {
+               ft.options = t.GetField(FieldFileTransferOptions).Data
+               xferSize = hlFile.ffo.FlatFileDataForkHeader.DataSize[:]
        }
 
        }
 
-       cc.Server.mux.Lock()
-       defer cc.Server.mux.Unlock()
-       cc.Server.FileTransfers[data] = ft
-
-       cc.Transfers[FileDownload] = append(cc.Transfers[FileDownload], ft)
-
        res = append(res, cc.NewReply(t,
        res = append(res, cc.NewReply(t,
-               NewField(fieldRefNum, transactionRef),
-               NewField(fieldWaitingCount, []byte{0x00, 0x00}), // TODO: Implement waiting count
-               NewField(fieldTransferSize, xferSize),
-               NewField(fieldFileSize, ffo.FlatFileDataForkHeader.DataSize[:]),
+               NewField(FieldRefNum, ft.refNum[:]),
+               NewField(FieldWaitingCount, []byte{0x00, 0x00}), // TODO: Implement waiting count
+               NewField(FieldTransferSize, xferSize),
+               NewField(FieldFileSize, hlFile.ffo.FlatFileDataForkHeader.DataSize[:]),
        ))
 
        ))
 
-       return res, err
+       return res
 }
 
 // Download all files from the specified folder and sub-folders
 }
 
 // Download all files from the specified folder and sub-folders
-func HandleDownloadFolder(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       if !authorize(cc.Account.Access, accessDownloadFile) {
-               res = append(res, cc.NewErrReply(t, "You are not allowed to download folders."))
-               return res, err
-       }
-
-       transactionRef := cc.Server.NewTransactionRef()
-       data := binary.BigEndian.Uint32(transactionRef)
-
-       fileTransfer := &FileTransfer{
-               FileName:        t.GetField(fieldFileName).Data,
-               FilePath:        t.GetField(fieldFilePath).Data,
-               ReferenceNumber: transactionRef,
-               Type:            FolderDownload,
+func HandleDownloadFolder(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if !cc.Authorize(accessDownloadFile) {
+               return cc.NewErrReply(t, "You are not allowed to download folders.")
        }
        }
-       cc.Server.mux.Lock()
-       cc.Server.FileTransfers[data] = fileTransfer
-       cc.Server.mux.Unlock()
-       cc.Transfers[FolderDownload] = append(cc.Transfers[FolderDownload], fileTransfer)
 
 
-       var fp FilePath
-       err = fp.UnmarshalBinary(t.GetField(fieldFilePath).Data)
+       fullFilePath, err := readPath(cc.Server.Config.FileRoot, t.GetField(FieldFilePath).Data, t.GetField(FieldFileName).Data)
        if err != nil {
        if err != nil {
-               return res, err
-       }
-
-       fullFilePath, err := readPath(cc.Server.Config.FileRoot, t.GetField(fieldFilePath).Data, t.GetField(fieldFileName).Data)
-       if err != nil {
-               return res, err
+               return res
        }
 
        transferSize, err := CalcTotalSize(fullFilePath)
        if err != nil {
        }
 
        transferSize, err := CalcTotalSize(fullFilePath)
        if err != nil {
-               return res, err
+               return res
        }
        itemCount, err := CalcItemCount(fullFilePath)
        if err != nil {
        }
        itemCount, err := CalcItemCount(fullFilePath)
        if err != nil {
-               return res, err
+               return res
        }
        }
+       spew.Dump(itemCount)
+
+       fileTransfer := cc.newFileTransfer(FolderDownload, t.GetField(FieldFileName).Data, t.GetField(FieldFilePath).Data, transferSize)
+
+       var fp FilePath
+       _, err = fp.Write(t.GetField(FieldFilePath).Data)
+       if err != nil {
+               return res
+       }
+
        res = append(res, cc.NewReply(t,
        res = append(res, cc.NewReply(t,
-               NewField(fieldRefNum, transactionRef),
-               NewField(fieldTransferSize, transferSize),
-               NewField(fieldFolderItemCount, itemCount),
-               NewField(fieldWaitingCount, []byte{0x00, 0x00}), // TODO: Implement waiting count
+               NewField(FieldRefNum, fileTransfer.refNum[:]),
+               NewField(FieldTransferSize, transferSize),
+               NewField(FieldFolderItemCount, itemCount),
+               NewField(FieldWaitingCount, []byte{0x00, 0x00}), // TODO: Implement waiting count
        ))
        ))
-       return res, err
+       return res
 }
 
 // Upload all files from the local folder and its subfolders to the specified path on the server
 // Fields used in the request
 }
 
 // Upload all files from the local folder and its subfolders to the specified path on the server
 // Fields used in the request
-// 201 File name
+// 201 File Name
 // 202 File path
 // 108 transfer size   Total size of all items in the folder
 // 220 Folder item count
 // 204 File transfer options   "Optional Currently set to 1" (TODO: ??)
 // 202 File path
 // 108 transfer size   Total size of all items in the folder
 // 220 Folder item count
 // 204 File transfer options   "Optional Currently set to 1" (TODO: ??)
-func HandleUploadFolder(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       transactionRef := cc.Server.NewTransactionRef()
-       data := binary.BigEndian.Uint32(transactionRef)
-
+func HandleUploadFolder(cc *ClientConn, t *Transaction) (res []Transaction) {
        var fp FilePath
        var fp FilePath
-       if t.GetField(fieldFilePath).Data != nil {
-               if err = fp.UnmarshalBinary(t.GetField(fieldFilePath).Data); err != nil {
-                       return res, err
+       if t.GetField(FieldFilePath).Data != nil {
+               if _, err := fp.Write(t.GetField(FieldFilePath).Data); err != nil {
+                       return res
                }
        }
 
        // Handle special cases for Upload and Drop Box folders
                }
        }
 
        // Handle special cases for Upload and Drop Box folders
-       if !authorize(cc.Account.Access, accessUploadAnywhere) {
+       if !cc.Authorize(accessUploadAnywhere) {
                if !fp.IsUploadDir() && !fp.IsDropbox() {
                if !fp.IsUploadDir() && !fp.IsDropbox() {
-                       res = append(res, cc.NewErrReply(t, fmt.Sprintf("Cannot accept upload of the folder \"%v\" because you are only allowed to upload to the \"Uploads\" folder.", string(t.GetField(fieldFileName).Data))))
-                       return res, err
+                       return cc.NewErrReply(t, fmt.Sprintf("Cannot accept upload of the folder \"%v\" because you are only allowed to upload to the \"Uploads\" folder.", string(t.GetField(FieldFileName).Data)))
                }
        }
 
                }
        }
 
-       fileTransfer := &FileTransfer{
-               FileName:        t.GetField(fieldFileName).Data,
-               FilePath:        t.GetField(fieldFilePath).Data,
-               ReferenceNumber: transactionRef,
-               Type:            FolderUpload,
-               FolderItemCount: t.GetField(fieldFolderItemCount).Data,
-               TransferSize:    t.GetField(fieldTransferSize).Data,
-       }
-       cc.Server.FileTransfers[data] = fileTransfer
+       fileTransfer := cc.newFileTransfer(FolderUpload,
+               t.GetField(FieldFileName).Data,
+               t.GetField(FieldFilePath).Data,
+               t.GetField(FieldTransferSize).Data,
+       )
+
+       fileTransfer.FolderItemCount = t.GetField(FieldFolderItemCount).Data
 
 
-       res = append(res, cc.NewReply(t, NewField(fieldRefNum, transactionRef)))
-       return res, err
+       return append(res, cc.NewReply(t, NewField(FieldRefNum, fileTransfer.refNum[:])))
 }
 
 // HandleUploadFile
 // Fields used in the request:
 }
 
 // HandleUploadFile
 // Fields used in the request:
-// 201 File name
+// 201 File Name
 // 202 File path
 // 204 File transfer options   "Optional
 // Used only to resume download, currently has value 2"
 // 108 File transfer size      "Optional used if download is not resumed"
 // 202 File path
 // 204 File transfer options   "Optional
 // Used only to resume download, currently has value 2"
 // 108 File transfer size      "Optional used if download is not resumed"
-func HandleUploadFile(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       if !authorize(cc.Account.Access, accessUploadFile) {
-               res = append(res, cc.NewErrReply(t, "You are not allowed to upload files."))
-               return res, err
+func HandleUploadFile(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if !cc.Authorize(accessUploadFile) {
+               return cc.NewErrReply(t, "You are not allowed to upload files.")
        }
 
        }
 
-       fileName := t.GetField(fieldFileName).Data
-       filePath := t.GetField(fieldFilePath).Data
-
-       transferOptions := t.GetField(fieldFileTransferOptions).Data
-
-       // TODO: is this field useful for anything?
-       // transferSize := t.GetField(fieldTransferSize).Data
+       fileName := t.GetField(FieldFileName).Data
+       filePath := t.GetField(FieldFilePath).Data
+       transferOptions := t.GetField(FieldFileTransferOptions).Data
+       transferSize := t.GetField(FieldTransferSize).Data // not sent for resume
 
        var fp FilePath
        if filePath != nil {
 
        var fp FilePath
        if filePath != nil {
-               if err = fp.UnmarshalBinary(filePath); err != nil {
-                       return res, err
+               if _, err := fp.Write(filePath); err != nil {
+                       return res
                }
        }
 
        // Handle special cases for Upload and Drop Box folders
                }
        }
 
        // Handle special cases for Upload and Drop Box folders
-       if !authorize(cc.Account.Access, accessUploadAnywhere) {
+       if !cc.Authorize(accessUploadAnywhere) {
                if !fp.IsUploadDir() && !fp.IsDropbox() {
                if !fp.IsUploadDir() && !fp.IsDropbox() {
-                       res = append(res, cc.NewErrReply(t, fmt.Sprintf("Cannot accept upload of the file \"%v\" because you are only allowed to upload to the \"Uploads\" folder.", string(fileName))))
-                       return res, err
+                       return cc.NewErrReply(t, fmt.Sprintf("Cannot accept upload of the file \"%v\" because you are only allowed to upload to the \"Uploads\" folder.", string(fileName)))
                }
        }
                }
        }
+       fullFilePath, err := readPath(cc.Server.Config.FileRoot, filePath, fileName)
+       if err != nil {
+               return res
+       }
 
 
-       transactionRef := cc.Server.NewTransactionRef()
-       data := binary.BigEndian.Uint32(transactionRef)
-
-       cc.Server.mux.Lock()
-       cc.Server.FileTransfers[data] = &FileTransfer{
-               FileName:        fileName,
-               FilePath:        filePath,
-               ReferenceNumber: transactionRef,
-               Type:            FileUpload,
+       if _, err := cc.Server.FS.Stat(fullFilePath); err == nil {
+               return cc.NewErrReply(t, fmt.Sprintf("Cannot accept upload because there is already a file named \"%v\".  Try choosing a different Name.", string(fileName)))
        }
        }
-       cc.Server.mux.Unlock()
 
 
-       replyT := cc.NewReply(t, NewField(fieldRefNum, transactionRef))
+       ft := cc.newFileTransfer(FileUpload, fileName, filePath, transferSize)
 
 
-       // client has requested to resume a partially transfered file
-       if transferOptions != nil {
-               fullFilePath, err := readPath(cc.Server.Config.FileRoot, filePath, fileName)
-               if err != nil {
-                       return res, err
-               }
+       replyT := cc.NewReply(t, NewField(FieldRefNum, ft.refNum[:]))
 
 
-               fileInfo, err := FS.Stat(fullFilePath + incompleteFileSuffix)
+       // client has requested to resume a partially transferred file
+       if transferOptions != nil {
+               fileInfo, err := cc.Server.FS.Stat(fullFilePath + incompleteFileSuffix)
                if err != nil {
                if err != nil {
-                       return res, err
+                       return res
                }
 
                offset := make([]byte, 4)
                }
 
                offset := make([]byte, 4)
@@ -1537,330 +1452,358 @@ func HandleUploadFile(cc *ClientConn, t *Transaction) (res []Transaction, err er
 
                b, _ := fileResumeData.BinaryMarshal()
 
 
                b, _ := fileResumeData.BinaryMarshal()
 
-               replyT.Fields = append(replyT.Fields, NewField(fieldFileResumeData, b))
+               ft.TransferSize = offset
+
+               replyT.Fields = append(replyT.Fields, NewField(FieldFileResumeData, b))
        }
 
        res = append(res, replyT)
        }
 
        res = append(res, replyT)
-       return res, err
+       return res
 }
 
 }
 
-func HandleSetClientUserInfo(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       var icon []byte
-       if len(t.GetField(fieldUserIconID).Data) == 4 {
-               icon = t.GetField(fieldUserIconID).Data[2:]
+func HandleSetClientUserInfo(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if len(t.GetField(FieldUserIconID).Data) == 4 {
+               cc.Icon = t.GetField(FieldUserIconID).Data[2:]
        } else {
        } else {
-               icon = t.GetField(fieldUserIconID).Data
+               cc.Icon = t.GetField(FieldUserIconID).Data
+       }
+       if cc.Authorize(accessAnyName) {
+               cc.UserName = t.GetField(FieldUserName).Data
        }
        }
-       *cc.Icon = icon
-       cc.UserName = t.GetField(fieldUserName).Data
 
 
-       // the options field is only passed by the client versions > 1.2.3.
-       options := t.GetField(fieldOptions).Data
+       cc.flagsMU.Lock()
+       defer cc.flagsMU.Unlock()
 
 
+       // the options field is only passed by the client versions > 1.2.3.
+       options := t.GetField(FieldOptions).Data
        if options != nil {
                optBitmap := big.NewInt(int64(binary.BigEndian.Uint16(options)))
        if options != nil {
                optBitmap := big.NewInt(int64(binary.BigEndian.Uint16(options)))
-               flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(*cc.Flags)))
+               flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(cc.Flags[:])))
 
 
-               flagBitmap.SetBit(flagBitmap, userFlagRefusePM, optBitmap.Bit(refusePM))
-               binary.BigEndian.PutUint16(*cc.Flags, uint16(flagBitmap.Int64()))
+               flagBitmap.SetBit(flagBitmap, UserFlagRefusePM, optBitmap.Bit(UserOptRefusePM))
+               binary.BigEndian.PutUint16(cc.Flags[:], uint16(flagBitmap.Int64()))
 
 
-               flagBitmap.SetBit(flagBitmap, userFLagRefusePChat, optBitmap.Bit(refuseChat))
-               binary.BigEndian.PutUint16(*cc.Flags, uint16(flagBitmap.Int64()))
+               flagBitmap.SetBit(flagBitmap, UserFlagRefusePChat, optBitmap.Bit(UserOptRefuseChat))
+               binary.BigEndian.PutUint16(cc.Flags[:], uint16(flagBitmap.Int64()))
 
                // Check auto response
 
                // Check auto response
-               if optBitmap.Bit(autoResponse) == 1 {
-                       cc.AutoReply = t.GetField(fieldAutomaticResponse).Data
+               if optBitmap.Bit(UserOptAutoResponse) == 1 {
+                       cc.AutoReply = t.GetField(FieldAutomaticResponse).Data
                } else {
                        cc.AutoReply = []byte{}
                }
        }
 
                } else {
                        cc.AutoReply = []byte{}
                }
        }
 
-       // Notify all clients of updated user info
-       cc.sendAll(
-               tranNotifyChangeUser,
-               NewField(fieldUserID, *cc.ID),
-               NewField(fieldUserIconID, *cc.Icon),
-               NewField(fieldUserFlags, *cc.Flags),
-               NewField(fieldUserName, cc.UserName),
-       )
+       for _, c := range cc.Server.Clients {
+               res = append(res, NewTransaction(
+                       TranNotifyChangeUser,
+                       c.ID,
+                       NewField(FieldUserID, cc.ID[:]),
+                       NewField(FieldUserIconID, cc.Icon),
+                       NewField(FieldUserFlags, cc.Flags[:]),
+                       NewField(FieldUserName, cc.UserName),
+               ))
+       }
 
 
-       return res, err
+       return res
 }
 
 // HandleKeepAlive responds to keepalive transactions with an empty reply
 // * HL 1.9.2 Client sends keepalive msg every 3 minutes
 // * HL 1.2.3 Client doesn't send keepalives
 }
 
 // HandleKeepAlive responds to keepalive transactions with an empty reply
 // * HL 1.9.2 Client sends keepalive msg every 3 minutes
 // * HL 1.2.3 Client doesn't send keepalives
-func HandleKeepAlive(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
+func HandleKeepAlive(cc *ClientConn, t *Transaction) (res []Transaction) {
        res = append(res, cc.NewReply(t))
 
        res = append(res, cc.NewReply(t))
 
-       return res, err
+       return res
 }
 
 }
 
-func HandleGetFileNameList(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
+func HandleGetFileNameList(cc *ClientConn, t *Transaction) (res []Transaction) {
        fullPath, err := readPath(
                cc.Server.Config.FileRoot,
        fullPath, err := readPath(
                cc.Server.Config.FileRoot,
-               t.GetField(fieldFilePath).Data,
+               t.GetField(FieldFilePath).Data,
                nil,
        )
        if err != nil {
                nil,
        )
        if err != nil {
-               return res, err
+               return res
        }
 
        var fp FilePath
        }
 
        var fp FilePath
-       if t.GetField(fieldFilePath).Data != nil {
-               if err = fp.UnmarshalBinary(t.GetField(fieldFilePath).Data); err != nil {
-                       return res, err
+       if t.GetField(FieldFilePath).Data != nil {
+               if _, err = fp.Write(t.GetField(FieldFilePath).Data); err != nil {
+                       return res
                }
        }
 
        // Handle special case for drop box folders
                }
        }
 
        // Handle special case for drop box folders
-       if fp.IsDropbox() && !authorize(cc.Account.Access, accessViewDropBoxes) {
-               res = append(res, cc.NewReply(t))
-               return res, err
+       if fp.IsDropbox() && !cc.Authorize(accessViewDropBoxes) {
+               return cc.NewErrReply(t, "You are not allowed to view drop boxes.")
        }
 
        }
 
-       fileNames, err := getFileNameList(fullPath)
+       fileNames, err := getFileNameList(fullPath, cc.Server.Config.IgnoreFiles)
        if err != nil {
        if err != nil {
-               return res, err
+               return res
        }
 
        res = append(res, cc.NewReply(t, fileNames...))
 
        }
 
        res = append(res, cc.NewReply(t, fileNames...))
 
-       return res, err
+       return res
 }
 
 // =================================
 //     Hotline private chat flow
 // =================================
 }
 
 // =================================
 //     Hotline private chat flow
 // =================================
-// 1. ClientA sends tranInviteNewChat to server with user ID to invite
+// 1. ClientA sends TranInviteNewChat to server with user ID to invite
 // 2. Server creates new ChatID
 // 2. Server creates new ChatID
-// 3. Server sends tranInviteToChat to invitee
+// 3. Server sends TranInviteToChat to invitee
 // 4. Server replies to ClientA with new Chat ID
 //
 // A dialog box pops up in the invitee client with options to accept or decline the invitation.
 // If Accepted is clicked:
 // 4. Server replies to ClientA with new Chat ID
 //
 // A dialog box pops up in the invitee client with options to accept or decline the invitation.
 // If Accepted is clicked:
-// 1. ClientB sends tranJoinChat with fieldChatID
+// 1. ClientB sends TranJoinChat with FieldChatID
 
 // HandleInviteNewChat invites users to new private chat
 
 // HandleInviteNewChat invites users to new private chat
-func HandleInviteNewChat(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       if !authorize(cc.Account.Access, accessOpenChat) {
-               res = append(res, cc.NewErrReply(t, "You are not allowed to request private chat."))
-               return res, err
+func HandleInviteNewChat(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if !cc.Authorize(accessOpenChat) {
+               return cc.NewErrReply(t, "You are not allowed to request private chat.")
        }
 
        // Client to Invite
        }
 
        // Client to Invite
-       targetID := t.GetField(fieldUserID).Data
+       targetID := t.GetField(FieldUserID).Data
        newChatID := cc.Server.NewPrivateChat(cc)
 
        newChatID := cc.Server.NewPrivateChat(cc)
 
-       res = append(res,
-               *NewTransaction(
-                       tranInviteToChat,
-                       &targetID,
-                       NewField(fieldChatID, newChatID),
-                       NewField(fieldUserName, cc.UserName),
-                       NewField(fieldUserID, *cc.ID),
-               ),
-       )
+       // Check if target user has "Refuse private chat" flag
+       targetClient := cc.Server.Clients[[2]byte(targetID)]
+       flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(targetClient.Flags[:])))
+       if flagBitmap.Bit(UserFlagRefusePChat) == 1 {
+               res = append(res,
+                       NewTransaction(
+                               TranServerMsg,
+                               cc.ID,
+                               NewField(FieldData, []byte(string(targetClient.UserName)+" does not accept private chats.")),
+                               NewField(FieldUserName, targetClient.UserName),
+                               NewField(FieldUserID, targetClient.ID[:]),
+                               NewField(FieldOptions, []byte{0, 2}),
+                       ),
+               )
+       } else {
+               res = append(res,
+                       NewTransaction(
+                               TranInviteToChat,
+                               [2]byte(targetID),
+                               NewField(FieldChatID, newChatID[:]),
+                               NewField(FieldUserName, cc.UserName),
+                               NewField(FieldUserID, cc.ID[:]),
+                       ),
+               )
+       }
 
        res = append(res,
                cc.NewReply(t,
 
        res = append(res,
                cc.NewReply(t,
-                       NewField(fieldChatID, newChatID),
-                       NewField(fieldUserName, cc.UserName),
-                       NewField(fieldUserID, *cc.ID),
-                       NewField(fieldUserIconID, *cc.Icon),
-                       NewField(fieldUserFlags, *cc.Flags),
+                       NewField(FieldChatID, newChatID[:]),
+                       NewField(FieldUserName, cc.UserName),
+                       NewField(FieldUserID, cc.ID[:]),
+                       NewField(FieldUserIconID, cc.Icon),
+                       NewField(FieldUserFlags, cc.Flags[:]),
                ),
        )
 
                ),
        )
 
-       return res, err
+       return res
 }
 
 }
 
-func HandleInviteToChat(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       if !authorize(cc.Account.Access, accessOpenChat) {
-               res = append(res, cc.NewErrReply(t, "You are not allowed to request private chat."))
-               return res, err
+func HandleInviteToChat(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if !cc.Authorize(accessOpenChat) {
+               return cc.NewErrReply(t, "You are not allowed to request private chat.")
        }
 
        // Client to Invite
        }
 
        // Client to Invite
-       targetID := t.GetField(fieldUserID).Data
-       chatID := t.GetField(fieldChatID).Data
-
-       res = append(res,
-               *NewTransaction(
-                       tranInviteToChat,
-                       &targetID,
-                       NewField(fieldChatID, chatID),
-                       NewField(fieldUserName, cc.UserName),
-                       NewField(fieldUserID, *cc.ID),
+       targetID := t.GetField(FieldUserID).Data
+       chatID := t.GetField(FieldChatID).Data
+
+       return []Transaction{
+               NewTransaction(
+                       TranInviteToChat,
+                       [2]byte(targetID),
+                       NewField(FieldChatID, chatID),
+                       NewField(FieldUserName, cc.UserName),
+                       NewField(FieldUserID, cc.ID[:]),
                ),
                ),
-       )
-       res = append(res,
                cc.NewReply(
                        t,
                cc.NewReply(
                        t,
-                       NewField(fieldChatID, chatID),
-                       NewField(fieldUserName, cc.UserName),
-                       NewField(fieldUserID, *cc.ID),
-                       NewField(fieldUserIconID, *cc.Icon),
-                       NewField(fieldUserFlags, *cc.Flags),
+                       NewField(FieldChatID, chatID),
+                       NewField(FieldUserName, cc.UserName),
+                       NewField(FieldUserID, cc.ID[:]),
+                       NewField(FieldUserIconID, cc.Icon),
+                       NewField(FieldUserFlags, cc.Flags[:]),
                ),
                ),
-       )
-
-       return res, err
+       }
 }
 
 }
 
-func HandleRejectChatInvite(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       chatID := t.GetField(fieldChatID).Data
-       chatInt := binary.BigEndian.Uint32(chatID)
-
-       privChat := cc.Server.PrivateChats[chatInt]
+func HandleRejectChatInvite(cc *ClientConn, t *Transaction) (res []Transaction) {
+       chatID := [4]byte(t.GetField(FieldChatID).Data)
+       privChat := cc.Server.PrivateChats[chatID]
 
 
-       resMsg := append(cc.UserName, []byte(" declined invitation to chat")...)
-
-       for _, c := range sortedClients(privChat.ClientConn) {
+       for _, c := range privChat.ClientConn {
                res = append(res,
                res = append(res,
-                       *NewTransaction(
-                               tranChatMsg,
+                       NewTransaction(
+                               TranChatMsg,
                                c.ID,
                                c.ID,
-                               NewField(fieldChatID, chatID),
-                               NewField(fieldData, resMsg),
+                               NewField(FieldChatID, chatID[:]),
+                               NewField(FieldData, append(cc.UserName, []byte(" declined invitation to chat")...)),
                        ),
                )
        }
 
                        ),
                )
        }
 
-       return res, err
+       return res
 }
 
 // HandleJoinChat is sent from a v1.8+ Hotline client when the joins a private chat
 // Fields used in the reply:
 // * 115       Chat subject
 }
 
 // HandleJoinChat is sent from a v1.8+ Hotline client when the joins a private chat
 // Fields used in the reply:
 // * 115       Chat subject
-// * 300       User name with info (Optional)
+// * 300       User Name with info (Optional)
 // * 300       (more user names with info)
 // * 300       (more user names with info)
-func HandleJoinChat(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       chatID := t.GetField(fieldChatID).Data
-       chatInt := binary.BigEndian.Uint32(chatID)
+func HandleJoinChat(cc *ClientConn, t *Transaction) (res []Transaction) {
+       chatID := t.GetField(FieldChatID).Data
 
 
-       privChat := cc.Server.PrivateChats[chatInt]
+       privChat := cc.Server.PrivateChats[[4]byte(chatID)]
 
 
-       // Send tranNotifyChatChangeUser to current members of the chat to inform of new user
-       for _, c := range sortedClients(privChat.ClientConn) {
+       // Send TranNotifyChatChangeUser to current members of the chat to inform of new user
+       for _, c := range privChat.ClientConn {
                res = append(res,
                res = append(res,
-                       *NewTransaction(
-                               tranNotifyChatChangeUser,
+                       NewTransaction(
+                               TranNotifyChatChangeUser,
                                c.ID,
                                c.ID,
-                               NewField(fieldChatID, chatID),
-                               NewField(fieldUserName, cc.UserName),
-                               NewField(fieldUserID, *cc.ID),
-                               NewField(fieldUserIconID, *cc.Icon),
-                               NewField(fieldUserFlags, *cc.Flags),
+                               NewField(FieldChatID, chatID),
+                               NewField(FieldUserName, cc.UserName),
+                               NewField(FieldUserID, cc.ID[:]),
+                               NewField(FieldUserIconID, cc.Icon),
+                               NewField(FieldUserFlags, cc.Flags[:]),
                        ),
                )
        }
 
                        ),
                )
        }
 
-       privChat.ClientConn[cc.uint16ID()] = cc
+       privChat.ClientConn[cc.ID] = cc
 
 
-       replyFields := []Field{NewField(fieldChatSubject, []byte(privChat.Subject))}
-       for _, c := range sortedClients(privChat.ClientConn) {
-               user := User{
-                       ID:    *c.ID,
-                       Icon:  *c.Icon,
-                       Flags: *c.Flags,
+       replyFields := []Field{NewField(FieldChatSubject, []byte(privChat.Subject))}
+       for _, c := range privChat.ClientConn {
+               b, err := io.ReadAll(&User{
+                       ID:    c.ID,
+                       Icon:  c.Icon,
+                       Flags: c.Flags[:],
                        Name:  string(c.UserName),
                        Name:  string(c.UserName),
+               })
+               if err != nil {
+                       return res
                }
                }
-
-               replyFields = append(replyFields, NewField(fieldUsernameWithInfo, user.Payload()))
+               replyFields = append(replyFields, NewField(FieldUsernameWithInfo, b))
        }
 
        res = append(res, cc.NewReply(t, replyFields...))
        }
 
        res = append(res, cc.NewReply(t, replyFields...))
-       return res, err
+       return res
 }
 
 // HandleLeaveChat is sent from a v1.8+ Hotline client when the user exits a private chat
 // Fields used in the request:
 }
 
 // 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.
 // Reply is not expected.
-func HandleLeaveChat(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       chatID := t.GetField(fieldChatID).Data
-       chatInt := binary.BigEndian.Uint32(chatID)
+func HandleLeaveChat(cc *ClientConn, t *Transaction) (res []Transaction) {
+       chatID := t.GetField(FieldChatID).Data
 
 
-       privChat := cc.Server.PrivateChats[chatInt]
+       privChat, ok := cc.Server.PrivateChats[[4]byte(chatID)]
+       if !ok {
+               return res
+       }
 
 
-       delete(privChat.ClientConn, cc.uint16ID())
+       delete(privChat.ClientConn, cc.ID)
 
        // Notify members of the private chat that the user has left
 
        // Notify members of the private chat that the user has left
-       for _, c := range sortedClients(privChat.ClientConn) {
+       for _, c := range privChat.ClientConn {
                res = append(res,
                res = append(res,
-                       *NewTransaction(
-                               tranNotifyChatDeleteUser,
+                       NewTransaction(
+                               TranNotifyChatDeleteUser,
                                c.ID,
                                c.ID,
-                               NewField(fieldChatID, chatID),
-                               NewField(fieldUserID, *cc.ID),
+                               NewField(FieldChatID, chatID),
+                               NewField(FieldUserID, cc.ID[:]),
                        ),
                )
        }
 
                        ),
                )
        }
 
-       return res, err
+       return res
 }
 
 // HandleSetChatSubject is sent from a v1.8+ Hotline client when the user sets a private chat subject
 // Fields used in the request:
 // * 114       Chat ID
 }
 
 // HandleSetChatSubject is sent from a v1.8+ Hotline client when the user sets a private chat subject
 // Fields used in the request:
 // * 114       Chat ID
-// * 115       Chat subject    Chat subject string
+// * 115       Chat subject
 // Reply is not expected.
 // Reply is not expected.
-func HandleSetChatSubject(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       chatID := t.GetField(fieldChatID).Data
-       chatInt := binary.BigEndian.Uint32(chatID)
+func HandleSetChatSubject(cc *ClientConn, t *Transaction) (res []Transaction) {
+       chatID := t.GetField(FieldChatID).Data
 
 
-       privChat := cc.Server.PrivateChats[chatInt]
-       privChat.Subject = string(t.GetField(fieldChatSubject).Data)
+       privChat := cc.Server.PrivateChats[[4]byte(chatID)]
+       privChat.Subject = string(t.GetField(FieldChatSubject).Data)
 
 
-       for _, c := range sortedClients(privChat.ClientConn) {
+       for _, c := range privChat.ClientConn {
                res = append(res,
                res = append(res,
-                       *NewTransaction(
-                               tranNotifyChatSubject,
+                       NewTransaction(
+                               TranNotifyChatSubject,
                                c.ID,
                                c.ID,
-                               NewField(fieldChatID, chatID),
-                               NewField(fieldChatSubject, t.GetField(fieldChatSubject).Data),
+                               NewField(FieldChatID, chatID),
+                               NewField(FieldChatSubject, t.GetField(FieldChatSubject).Data),
                        ),
                )
        }
 
                        ),
                )
        }
 
-       return res, err
+       return res
 }
 
 // HandleMakeAlias makes a file alias using the specified path.
 // Fields used in the request:
 }
 
 // HandleMakeAlias makes a file alias using the specified path.
 // Fields used in the request:
-// 201 File name
+// 201 File Name
 // 202 File path
 // 212 File new path   Destination path
 //
 // Fields used in the reply:
 // None
 // 202 File path
 // 212 File new path   Destination path
 //
 // Fields used in the reply:
 // None
-func HandleMakeAlias(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-       if !authorize(cc.Account.Access, accessMakeAlias) {
-               res = append(res, cc.NewErrReply(t, "You are not allowed to make aliases."))
-               return res, err
+func HandleMakeAlias(cc *ClientConn, t *Transaction) (res []Transaction) {
+       if !cc.Authorize(accessMakeAlias) {
+               return cc.NewErrReply(t, "You are not allowed to make aliases.")
        }
        }
-       fileName := t.GetField(fieldFileName).Data
-       filePath := t.GetField(fieldFilePath).Data
-       fileNewPath := t.GetField(fieldFileNewPath).Data
+       fileName := t.GetField(FieldFileName).Data
+       filePath := t.GetField(FieldFilePath).Data
+       fileNewPath := t.GetField(FieldFileNewPath).Data
 
        fullFilePath, err := readPath(cc.Server.Config.FileRoot, filePath, fileName)
        if err != nil {
 
        fullFilePath, err := readPath(cc.Server.Config.FileRoot, filePath, fileName)
        if err != nil {
-               return res, err
+               return res
        }
 
        fullNewFilePath, err := readPath(cc.Server.Config.FileRoot, fileNewPath, fileName)
        if err != nil {
        }
 
        fullNewFilePath, err := readPath(cc.Server.Config.FileRoot, fileNewPath, fileName)
        if err != nil {
-               return res, err
+               return res
        }
 
        }
 
-       cc.Server.Logger.Debugw("Make alias", "src", fullFilePath, "dst", fullNewFilePath)
+       cc.logger.Debug("Make alias", "src", fullFilePath, "dst", fullNewFilePath)
 
 
-       if err := FS.Symlink(fullFilePath, fullNewFilePath); err != nil {
-               res = append(res, cc.NewErrReply(t, "Error creating alias"))
-               return res, nil
+       if err := cc.Server.FS.Symlink(fullFilePath, fullNewFilePath); err != nil {
+               return cc.NewErrReply(t, "Error creating alias")
        }
 
        res = append(res, cc.NewReply(t))
        }
 
        res = append(res, cc.NewReply(t))
-       return res, err
+       return res
+}
+
+// HandleDownloadBanner handles requests for a new banner from the server
+// Fields used in the request:
+// None
+// Fields used in the reply:
+// 107 FieldRefNum                     Used later for transfer
+// 108 FieldTransferSize       Size of data to be downloaded
+func HandleDownloadBanner(cc *ClientConn, t *Transaction) (res []Transaction) {
+       ft := cc.newFileTransfer(bannerDownload, []byte{}, []byte{}, make([]byte, 4))
+       binary.BigEndian.PutUint32(ft.TransferSize, uint32(len(cc.Server.banner)))
+
+       return append(res, cc.NewReply(t,
+               NewField(FieldRefNum, ft.refNum[:]),
+               NewField(FieldTransferSize, ft.TransferSize),
+       ))
 }
 }
Friendship Quest remix of mobius, a hotline server in go #cli