X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/3d2bd095b354c5ba84f51073b26c752290467784..9004987d8ec11b788f972e6764f875f2d873cfd6:/hotline/client.go

diff --git a/hotline/client.go b/hotline/client.go
index 5016a50..84126d3 100644
--- a/hotline/client.go
+++ b/hotline/client.go
@@ -21,6 +21,7 @@ import (
 
 const (
 	trackerListPage = "trackerList"
+	serverUIPage    = "serverUI"
 )
 
 //go:embed banners/*.txt
@@ -46,6 +47,12 @@ func (cp *ClientPrefs) IconBytes() []byte {
 	return iconBytes
 }
 
+func (cp *ClientPrefs) AddBookmark(name, addr, login, pass string) error {
+	cp.Bookmarks = append(cp.Bookmarks, Bookmark{Addr: addr, Login: login, Password: pass})
+
+	return nil
+}
+
 func readConfig(cfgPath string) (*ClientPrefs, error) {
 	fh, err := os.Open(cfgPath)
 	if err != nil {
@@ -75,6 +82,7 @@ type Client struct {
 	UserList    []User
 	Logger      *zap.SugaredLogger
 	activeTasks map[uint32]*Transaction
+	serverName  string
 
 	pref *ClientPrefs
 
@@ -198,7 +206,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)
@@ -220,8 +228,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
@@ -275,11 +282,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))
@@ -288,7 +293,7 @@ func handleGetFileNameList(c *Client, t *Transaction) (res []Transaction, err er
 		} else {
 			size := binary.BigEndian.Uint32(fn.FileSize) / 1024
 
-			node := tview.NewTreeNode(fmt.Sprintf("   %-30s %15v KB", fn.Name, size))
+			node := tview.NewTreeNode(fmt.Sprintf("   %-40s %10v KB", fn.Name, size))
 			node.SetReference(&fn)
 			root.AddChild(node)
 		}
@@ -317,7 +322,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")
@@ -532,7 +537,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 {
@@ -612,8 +617,8 @@ func (c *Client) LogIn(login string, password string) error {
 			tranLogin, nil,
 			NewField(fieldUserName, []byte(c.pref.Username)),
 			NewField(fieldUserIconID, c.pref.IconBytes()),
-			NewField(fieldUserLogin, []byte(NegatedUserString([]byte(login)))),
-			NewField(fieldUserPassword, []byte(NegatedUserString([]byte(password)))),
+			NewField(fieldUserLogin, negateString([]byte(login))),
+			NewField(fieldUserPassword, negateString([]byte(password))),
 			NewField(fieldVersion, []byte{0, 2}),
 		),
 	)