X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/da1e0d79561ded0b3998a50a1d14a16b5c9a24bc..eabc4b6cacc4749db226af272e71fcff1556f433:/hotline/client.go?ds=sidebyside

diff --git a/hotline/client.go b/hotline/client.go
index e676e65..6aad5a1 100644
--- a/hotline/client.go
+++ b/hotline/client.go
@@ -21,6 +21,7 @@ import (
 
 const (
 	trackerListPage = "trackerList"
+	serverUIPage    = "serverUI"
 )
 
 //go:embed banners/*.txt
@@ -81,6 +82,7 @@ type Client struct {
 	UserList    []User
 	Logger      *zap.SugaredLogger
 	activeTasks map[uint32]*Transaction
+	serverName  string
 
 	pref *ClientPrefs
 
@@ -88,7 +90,6 @@ type Client struct {
 
 	UI *UI
 
-	outbox chan *Transaction
 	Inbox  chan *Transaction
 }
 
@@ -204,7 +205,7 @@ func handleTranServerMsg(c *Client, t *Transaction) (res []Transaction, err erro
 	time := time.Now().Format(time.RFC850)
 
 	msg := strings.ReplaceAll(string(t.GetField(fieldData).Data), "\r", "\n")
-	msg +=  "\n\nAt " + time
+	msg += "\n\nAt " + time
 	title := fmt.Sprintf("| Private Message From: 	%s |", t.GetField(fieldUserName).Data)
 
 	msgBox := tview.NewTextView().SetScrollable(true)
@@ -226,8 +227,7 @@ func handleTranServerMsg(c *Client, t *Transaction) (res []Transaction, err erro
 			AddItem(nil, 0, 1, false), 0, 2, true).
 		AddItem(nil, 0, 1, false)
 
-
-	c.UI.Pages.AddPage("serverMsgModal" + time, centeredFlex, true, true)
+	c.UI.Pages.AddPage("serverMsgModal"+time, centeredFlex, true, true)
 	c.UI.App.Draw() // TODO: errModal doesn't render without this.  wtf?
 
 	return res, err
@@ -281,11 +281,9 @@ func handleGetFileNameList(c *Client, t *Transaction) (res []Transaction, err er
 		root.AddChild(node)
 	}
 
-	var fileList []FileNameWithInfo
 	for _, f := range t.Fields {
 		var fn FileNameWithInfo
 		_, _ = fn.Read(f.Data)
-		fileList = append(fileList, fn)
 
 		if bytes.Equal(fn.Type, []byte("fldr")) {
 			node := tview.NewTreeNode(fmt.Sprintf("[blue::]📁 %s[-:-:-]", fn.Name))
@@ -323,7 +321,7 @@ func handleGetMsgs(c *Client, t *Transaction) (res []Transaction, err error) {
 	newsTextView := tview.NewTextView().
 		SetText(newsText).
 		SetDoneFunc(func(key tcell.Key) {
-			c.UI.Pages.SwitchToPage("serverUI")
+			c.UI.Pages.SwitchToPage(serverUIPage)
 			c.UI.App.SetFocus(c.UI.chatInput)
 		})
 	newsTextView.SetBorder(true).SetTitle("News")
@@ -538,7 +536,7 @@ func handleClientTranLogin(c *Client, t *Transaction) (res []Transaction, err er
 		c.Logger.Error(string(t.GetField(fieldError).Data))
 		return nil, errors.New("login error: " + string(t.GetField(fieldError).Data))
 	}
-	c.UI.Pages.AddAndSwitchToPage("serverUI", c.UI.renderServerUI(), true)
+	c.UI.Pages.AddAndSwitchToPage(serverUIPage, c.UI.renderServerUI(), true)
 	c.UI.App.SetFocus(c.UI.chatInput)
 
 	if err := c.Send(*NewTransaction(tranGetUserNameList, nil)); err != nil {