X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/72dd37f1abb2b550aaaac48eac677403d5664797..93df4153a2028e7c6ffee0d005f58db8cec9917a:/hotline/client.go

diff --git a/hotline/client.go b/hotline/client.go
index dd113c9..24df7c3 100644
--- a/hotline/client.go
+++ b/hotline/client.go
@@ -10,7 +10,7 @@ import (
 	"github.com/rivo/tview"
 	"github.com/stretchr/testify/mock"
 	"go.uber.org/zap"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 	"math/big"
 	"math/rand"
 	"net"
@@ -61,7 +61,6 @@ func readConfig(cfgPath string) (*ClientPrefs, error) {
 
 	prefs := ClientPrefs{}
 	decoder := yaml.NewDecoder(fh)
-	decoder.SetStrict(true)
 	if err := decoder.Decode(&prefs); err != nil {
 		return nil, err
 	}
@@ -200,7 +199,7 @@ var clientHandlers = map[uint16]clientTHandler{
 		Handler: handleTranServerMsg,
 	},
 	tranKeepAlive: clientTransaction{
-		Name:    "tranKeepAlive",
+		Name: "tranKeepAlive",
 		Handler: func(client *Client, transaction *Transaction) (t []Transaction, err error) {
 			return t, err
 		},
@@ -336,8 +335,8 @@ func handleGetMsgs(c *Client, t *Transaction) (res []Transaction, err error) {
 	newsTextView.SetBorder(true).SetTitle("News")
 
 	c.UI.Pages.AddPage("news", newsTextView, true, true)
-	//c.UI.Pages.SwitchToPage("news")
-	//c.UI.App.SetFocus(newsTextView)
+	// c.UI.Pages.SwitchToPage("news")
+	// c.UI.App.SetFocus(newsTextView)
 	c.UI.App.Draw()
 
 	return res, err
@@ -605,10 +604,10 @@ var ServerHandshake = []byte{
 }
 
 func (c *Client) Handshake() error {
-	//Protocol ID	4	‘TRTP’	0x54 52 54 50
-	//Sub-protocol ID	4		User defined
-	//Version	2	1	Currently 1
-	//Sub-version	2		User defined
+	// Protocol ID	4	‘TRTP’	0x54 52 54 50
+	// Sub-protocol ID	4		User defined
+	// Version	2	1	Currently 1
+	// Sub-version	2		User defined
 	if _, err := c.Connection.Write(ClientHandshake); err != nil {
 		return fmt.Errorf("handshake write err: %s", err)
 	}
@@ -644,7 +643,7 @@ func (c *Client) Send(t Transaction) error {
 	requestNum := binary.BigEndian.Uint16(t.Type)
 	tID := binary.BigEndian.Uint32(t.ID)
 
-	//handler := TransactionHandlers[requestNum]
+	// handler := TransactionHandlers[requestNum]
 
 	// if transaction is NOT reply, add it to the list to transactions we're expecting a response for
 	if t.IsReply == 0 {
@@ -698,18 +697,6 @@ func (c *Client) HandleTransaction(t *Transaction) error {
 	return nil
 }
 
-func (c *Client) Connected() bool {
-	// c.Agreed == true &&
-	if c.UserAccess != nil {
-		return true
-	}
-	return false
-}
-
 func (c *Client) Disconnect() error {
-	err := c.Connection.Close()
-	if err != nil {
-		return err
-	}
-	return nil
+	return c.Connection.Close()
 }