Fix inconsistent sorting of user list

[rbdr/mobius] / hotline / ui.go

diff --git a/hotline/ui.go b/hotline/ui.go
index 406c88f7a258dadc0d6690a71a7c1256673fb9c7..d0fd6c04a999866fffc0d7743bd4f4967650e099 100644 (file)
--- a/hotline/ui.go
+++ b/hotline/ui.go
@@ -1,7 +1,6 @@
 package hotline
 
 import (
-       "errors"
        "fmt"
        "github.com/davecgh/go-spew/spew"
        "github.com/gdamore/tcell/v2"
@@ -15,15 +14,13 @@ import (
 )
 
 type UI struct {
-       chatBox      *tview.TextView
-       chatInput    *tview.InputField
-       App          *tview.Application
-       Pages        *tview.Pages
-       userList     *tview.TextView
-       agreeModal   *tview.Modal
-       trackerList  *tview.List
-       settingsPage *tview.Box
-       HLClient     *Client
+       chatBox     *tview.TextView
+       chatInput   *tview.InputField
+       App         *tview.Application
+       Pages       *tview.Pages
+       userList    *tview.TextView
+       trackerList *tview.List
+       HLClient    *Client
 }
 
 // pages
@@ -40,7 +37,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.
@@ -77,7 +74,6 @@ func NewUI(c *Client) *UI {
                chatInput:   chatInput,
                userList:    userList,
                trackerList: tview.NewList(),
-               agreeModal:  tview.NewModal(),
                HLClient:    c,
        }
 }
@@ -127,10 +123,11 @@ func (ui *UI) getTrackerList() *tview.List {
        shortcut := 97 // rune for "a"
        for i, srv := range listing {
                addr := srv.Addr()
+               srvName := srv.Name
                list.AddItem(string(srv.Name), string(srv.Description), rune(shortcut+i), func() {
                        ui.Pages.RemovePage("joinServer")
 
-                       newJS := ui.renderJoinServerForm("", addr, GuestAccount, "", trackerListPage, false, true)
+                       newJS := ui.renderJoinServerForm(string(srvName), addr, GuestAccount, "", trackerListPage, false, true)
 
                        ui.Pages.AddPage("joinServer", newJS, true, true)
                        ui.Pages.ShowPage("joinServer")
@@ -197,7 +194,7 @@ func (ui *UI) joinServer(addr, login, password string) error {
                addr += ":5500"
        }
        if err := ui.HLClient.JoinServer(addr, login, password); err != nil {
-               return errors.New(fmt.Sprintf("Error joining server: %v\n", err))
+               return fmt.Errorf("Error joining server: %v\n", err)
        }
 
        go func() {
@@ -206,12 +203,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")
                                                })
@@ -260,11 +255,18 @@ func (ui *UI) renderJoinServerForm(name, server, login, password, backPage strin
                        ui.Pages.SwitchToPage(backPage)
                }).
                AddButton("Connect", func() {
+                       srvAddr := joinServerForm.GetFormItem(0).(*tview.InputField).GetText()
+                       loginInput := joinServerForm.GetFormItem(1).(*tview.InputField).GetText()
                        err := ui.joinServer(
-                               joinServerForm.GetFormItem(0).(*tview.InputField).GetText(),
-                               joinServerForm.GetFormItem(1).(*tview.InputField).GetText(),
+                               srvAddr,
+                               loginInput,
                                joinServerForm.GetFormItem(2).(*tview.InputField).GetText(),
                        )
+                       if name == "" {
+                               name = fmt.Sprintf("%s@%s", loginInput, srvAddr)
+                       }
+                       ui.HLClient.serverName = name
+
                        if err != nil {
                                ui.HLClient.Logger.Errorw("login error", "err", err)
                                loginErrModal := tview.NewModal().
@@ -335,7 +337,7 @@ func (ui *UI) renderServerUI() *tview.Flex {
                        AddItem(ui.chatBox, 0, 8, false).
                        AddItem(ui.chatInput, 3, 0, true), 0, 1, true).
                AddItem(ui.userList, 25, 1, false)
-       serverUI.SetBorder(true).SetTitle("| Mobius - Connected to " + "TODO" + " |").SetTitleAlign(tview.AlignLeft)
+       serverUI.SetBorder(true).SetTitle("| Mobius - Connected to " + ui.HLClient.serverName + " |").SetTitleAlign(tview.AlignLeft)
        serverUI.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
                if event.Key() == tcell.KeyEscape {
                        ui.Pages.AddPage("modal", modal, false, true)