patch: v0.0.10

[rbdr/mobius] / hotline / client.go

diff --git a/hotline/client.go b/hotline/client.go
index c21a780ed3455b50854fe4a2563d89a2f84b3f3d..84126d3d4dd2b0d768b9bc6841b5adfd2c1e2f94 100644 (file)
--- a/hotline/client.go
+++ b/hotline/client.go
@@ -21,6 +21,7 @@ import (
 
 const (
        trackerListPage = "trackerList"
 
 const (
        trackerListPage = "trackerList"

+       serverUIPage    = "serverUI"

 )
 
 //go:embed banners/*.txt
 )
 
 //go:embed banners/*.txt


@@ -46,6 +47,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 {


@@ -75,6 +82,7 @@ type Client struct {
        UserList    []User
        Logger      *zap.SugaredLogger
        activeTasks map[uint32]*Transaction
        UserList    []User
        Logger      *zap.SugaredLogger
        activeTasks map[uint32]*Transaction

+       serverName  string

 
        pref *ClientPrefs
 
 
        pref *ClientPrefs
 


@@ -188,6 +196,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) {


@@ -238,11 +282,9 @@ func handleGetFileNameList(c *Client, t *Transaction) (res []Transaction, err er
                root.AddChild(node)
        }
 
                root.AddChild(node)
        }
 

-       var fileList []FileNameWithInfo

        for _, f := range t.Fields {
                var fn FileNameWithInfo
                _, _ = fn.Read(f.Data)
        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))
 
                if bytes.Equal(fn.Type, []byte("fldr")) {
                        node := tview.NewTreeNode(fmt.Sprintf("[blue::]📁 %s[-:-:-]", fn.Name))


@@ -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("   %-30s %15v 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)
                }


@@ -280,7 +322,7 @@ func handleGetMsgs(c *Client, t *Transaction) (res []Transaction, err error) {
        newsTextView := tview.NewTextView().
                SetText(newsText).
                SetDoneFunc(func(key tcell.Key) {
        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")
                        c.UI.App.SetFocus(c.UI.chatInput)
                })
        newsTextView.SetBorder(true).SetTitle("News")


@@ -495,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.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 {
        c.UI.App.SetFocus(c.UI.chatInput)
 
        if err := c.Send(*NewTransaction(tranGetUserNameList, nil)); err != nil {


@@ -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}),
                ),
        )