X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/58efb95f86cd806dda8cf00ad45d4347307a2306..40afb444ff58289700baa1eb07f3f92d4731436d:/hotline/ui.go?ds=inline

diff --git a/hotline/ui.go b/hotline/ui.go
index f21f1e8..e4dafd5 100644
--- a/hotline/ui.go
+++ b/hotline/ui.go
@@ -22,10 +22,14 @@ type UI struct {
 	userList     *tview.TextView
 	agreeModal   *tview.Modal
 	trackerList  *tview.List
-	settingsPage *tview.Box
 	HLClient     *Client
 }
 
+// pages
+const (
+	pageServerUI = "serverUI"
+)
+
 func NewUI(c *Client) *UI {
 	app := tview.NewApplication()
 	chatBox := tview.NewTextView().
@@ -35,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.
@@ -47,7 +51,7 @@ func NewUI(c *Client) *UI {
 				return
 			}
 
-			c.Send(
+			_ = c.Send(
 				*NewTransaction(tranChatSend, nil,
 					NewField(fieldData, []byte(chatInput.GetText())),
 				),
@@ -201,21 +205,21 @@ 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("The server connection has closed.").
+						SetDoneFunc(func(buttonIndex int, buttonLabel string) {
+							ui.Pages.SwitchToPage("home")
+						})
+					loginErrModal.Box.SetTitle("Server Connection Error")
+
+					ui.Pages.AddPage("loginErr", loginErrModal, false, true)
+					ui.App.Draw()
+					return
 				}
+				ui.Pages.SwitchToPage("home")
 
-				loginErrModal := tview.NewModal().
-					AddButtons([]string{"Ok"}).
-					SetText(msg).
-					SetDoneFunc(func(buttonIndex int, buttonLabel string) {
-						ui.Pages.SwitchToPage("home")
-					})
-				loginErrModal.Box.SetTitle("Server Connection Error")
-
-				ui.Pages.AddPage("loginErr", loginErrModal, false, true)
-				ui.App.Draw()
 				return
 			}
 		}
@@ -301,9 +305,10 @@ func (ui *UI) renderJoinServerForm(name, server, login, password, backPage strin
 }
 
 func (ui *UI) renderServerUI() *tview.Flex {
+	ui.chatBox.SetText("") // clear any previously existing chatbox text
 	commandList := tview.NewTextView().SetDynamicColors(true)
 	commandList.
-		SetText("[yellow]^n[-::]: Read News   [yellow]^p[-::]: Post News\n[yellow]^l[-::]: View Logs\n").
+		SetText("[yellow]^n[-::]: Read News   [yellow]^p[-::]: Post News\n[yellow]^l[-::]: View Logs   [yellow]^f[-::]: View Files\n").
 		SetBorder(true).
 		SetTitle("| Keyboard Shortcuts| ")
 
@@ -314,7 +319,7 @@ func (ui *UI) renderServerUI() *tview.Flex {
 	modal.SetDoneFunc(func(buttonIndex int, buttonLabel string) {
 		if buttonIndex == 1 {
 			_ = ui.HLClient.Disconnect()
-			ui.Pages.SwitchToPage("home")
+			ui.Pages.RemovePage(pageServerUI)
 		} else {
 			ui.Pages.HidePage("modal")
 		}
@@ -351,13 +356,12 @@ func (ui *UI) renderServerUI() *tview.Flex {
 		if event.Key() == tcell.KeyCtrlP {
 
 			newsFlex := tview.NewFlex()
-
+			newsFlex.SetBorderPadding(0, 0, 1, 1)
 			newsPostTextArea := tview.NewTextView()
-			newsPostTextArea.SetBackgroundColor(tcell.ColorDimGray)
+			newsPostTextArea.SetBackgroundColor(tcell.ColorDarkSlateGrey)
 			newsPostTextArea.SetChangedFunc(func() {
 				ui.App.Draw() // TODO: docs say this is bad but it's the only way to show content during initial render??
 			})
-			//newsPostTextArea.SetBorderPadding(0, 0, 1, 1)
 
 			newsPostForm := tview.NewForm().
 				SetButtonsAlign(tview.AlignRight).
@@ -365,10 +369,15 @@ func (ui *UI) renderServerUI() *tview.Flex {
 				AddButton("Send", nil)
 			newsPostForm.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
 				switch event.Key() {
+				case tcell.KeyEscape:
+					ui.Pages.RemovePage("newsInput")
 				case tcell.KeyTab:
 					ui.App.SetFocus(newsPostTextArea)
 				case tcell.KeyEnter:
 					newsText := strings.ReplaceAll(newsPostTextArea.GetText(true), "\n", "\r")
+					if len(newsText) == 0 {
+						return event
+					}
 					err := ui.HLClient.Send(
 						*NewTransaction(tranOldPostNews, nil,
 							NewField(fieldData, []byte(newsText)),
@@ -390,14 +399,13 @@ func (ui *UI) renderServerUI() *tview.Flex {
 				SetTitle("| Post Message |")
 
 			newsPostTextArea.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
-				ui.HLClient.Logger.Infow("key", "key", event.Key(), "rune", event.Rune())
 				switch event.Key() {
 				case tcell.KeyEscape:
 					ui.Pages.RemovePage("newsInput")
 				case tcell.KeyTab:
 					ui.App.SetFocus(newsPostForm)
 				case tcell.KeyEnter:
-					fmt.Fprintf(newsPostTextArea, "\n")
+					_, _ = fmt.Fprintf(newsPostTextArea, "\n")
 				default:
 					const windowsBackspaceRune = 8
 					const macBackspaceRune = 127
@@ -409,7 +417,7 @@ func (ui *UI) renderServerUI() *tview.Flex {
 							newsPostTextArea.SetText(curTxt)
 						}
 					default:
-						fmt.Fprintf(newsPostTextArea, string(event.Rune()))
+						_, _ = fmt.Fprintf(newsPostTextArea, string(event.Rune()))
 					}
 				}