Fix error message on logout

[rbdr/mobius] / hotline / client.go

diff --git a/hotline/client.go b/hotline/client.go
index 70e1d56c490318ee4badad091f1bba2696d5fa49..d656db5eb73910c1962af7af6d854533e1955a4c 100644 (file)
--- a/hotline/client.go
+++ b/hotline/client.go
@@ -46,6 +46,12 @@ func (cp *ClientPrefs) IconBytes() []byte {
        return iconBytes
 }
 
        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 {
 func readConfig(cfgPath string) (*ClientPrefs, error) {
        fh, err := os.Open(cfgPath)
        if err != nil {


@@ -188,6 +194,42 @@ var clientHandlers = map[uint16]clientTHandler{
                Name:    "tranGetFileNameList",
                Handler: handleGetFileNameList,
        },
                Name:    "tranGetFileNameList",
                Handler: handleGetFileNameList,
        },

+       tranServerMsg: clientTransaction{
+               Name:    "tranServerMsg",
+               Handler: handleTranServerMsg,
+       },
+}
+
+func handleTranServerMsg(c *Client, t *Transaction) (res []Transaction, err error) {
+       time := time.Now().Format(time.RFC850)
+
+       msg := strings.ReplaceAll(string(t.GetField(fieldData).Data), "\r", "\n")
+       msg += "\n\nAt " + time
+       title := fmt.Sprintf("| Private Message From:   %s |", t.GetField(fieldUserName).Data)
+
+       msgBox := tview.NewTextView().SetScrollable(true)
+       msgBox.SetText(msg).SetBackgroundColor(tcell.ColorDarkSlateBlue)
+       msgBox.SetTitle(title).SetBorder(true)
+       msgBox.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
+               switch event.Key() {
+               case tcell.KeyEscape:
+                       c.UI.Pages.RemovePage("serverMsgModal" + time)
+               }
+               return event
+       })
+
+       centeredFlex := tview.NewFlex().
+               AddItem(nil, 0, 1, false).
+               AddItem(tview.NewFlex().SetDirection(tview.FlexRow).
+                       AddItem(nil, 0, 1, false).
+                       AddItem(msgBox, 0, 2, true).
+                       AddItem(nil, 0, 1, false), 0, 2, true).
+               AddItem(nil, 0, 1, false)
+
+       c.UI.Pages.AddPage("serverMsgModal"+time, centeredFlex, true, true)
+       c.UI.App.Draw() // TODO: errModal doesn't render without this.  wtf?
+
+       return res, err

 }
 
 func handleGetFileNameList(c *Client, t *Transaction) (res []Transaction, err error) {
 }
 
 func handleGetFileNameList(c *Client, t *Transaction) (res []Transaction, err error) {


@@ -251,7 +293,7 @@ func handleGetFileNameList(c *Client, t *Transaction) (res []Transaction, err er
                } else {
                        size := binary.BigEndian.Uint32(fn.FileSize) / 1024
 
                } else {
                        size := binary.BigEndian.Uint32(fn.FileSize) / 1024
 

-                       node := tview.NewTreeNode(fmt.Sprintf("   %-10s %10v KB", fn.Name, size))
+                       node := tview.NewTreeNode(fmt.Sprintf("   %-40s %10v KB", fn.Name, size))

                        node.SetReference(&fn)
                        root.AddChild(node)
                }
                        node.SetReference(&fn)
                        root.AddChild(node)
                }


@@ -264,7 +306,7 @@ func handleGetFileNameList(c *Client, t *Transaction) (res []Transaction, err er
                        SetDirection(tview.FlexRow).
                        AddItem(nil, 0, 1, false).
                        AddItem(fTree, 20, 1, true).
                        SetDirection(tview.FlexRow).
                        AddItem(nil, 0, 1, false).
                        AddItem(fTree, 20, 1, true).

-                       AddItem(nil, 0, 1, false), 40, 1, true).
+                       AddItem(nil, 0, 1, false), 60, 1, true).

                AddItem(nil, 0, 1, false)
 
        c.UI.Pages.AddPage("files", centerFlex, true, true)
                AddItem(nil, 0, 1, false)
 
        c.UI.Pages.AddPage("files", centerFlex, true, true)


@@ -575,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()),
                        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}),
                ),
        )
                        NewField(fieldVersion, []byte{0, 2}),
                ),
        )