From: Jeff Halter <redacted>
Date: Thu, 5 Aug 2021 01:26:57 +0000 (-0700)
Subject: Minor cleanup
X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/commitdiff_plain/40afb444ff58289700baa1eb07f3f92d4731436d?hp=e78868689018a34ea936d8f904a3240bf9eb3501

Minor cleanup
---

diff --git a/hotline/client.go b/hotline/client.go
index d656db5..076cdba 100644
--- a/hotline/client.go
+++ b/hotline/client.go
@@ -21,6 +21,7 @@ import (
 
 const (
 	trackerListPage = "trackerList"
+	serverUIPage = "serverUI"
 )
 
 //go:embed banners/*.txt
@@ -280,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))
@@ -322,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")
@@ -537,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 {
diff --git a/hotline/ui.go b/hotline/ui.go
index 406c88f..e4dafd5 100644
--- a/hotline/ui.go
+++ b/hotline/ui.go
@@ -22,7 +22,6 @@ type UI struct {
 	userList     *tview.TextView
 	agreeModal   *tview.Modal
 	trackerList  *tview.List
-	settingsPage *tview.Box
 	HLClient     *Client
 }
 
@@ -40,7 +39,7 @@ func NewUI(c *Client) *UI {
 		SetChangedFunc(func() {
 			app.Draw() // TODO: docs say this is bad but it's the only way to show content during initial render??
 		})
-	chatBox.Box.SetBorder(true).SetTitle("Chat")
+	chatBox.Box.SetBorder(true).SetTitle("| Chat |")
 
 	chatInput := tview.NewInputField()
 	chatInput.
@@ -206,12 +205,10 @@ func (ui *UI) joinServer(addr, login, password string) error {
 			if err != nil {
 				ui.HLClient.Logger.Errorw("read error", "err", err)
 
-				msg := err.Error()
 				if err == io.EOF {
-					msg = "The server connection has unexpectedly closed."
 					loginErrModal := tview.NewModal().
 						AddButtons([]string{"Ok"}).
-						SetText(msg).
+						SetText("The server connection has closed.").
 						SetDoneFunc(func(buttonIndex int, buttonLabel string) {
 							ui.Pages.SwitchToPage("home")
 						})