X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/43ecc0f42eaeface5f640479df7372bfb8021f23..b25c4a19420c2fde1f290dd360c68b84e4eaa1ed:/hotline/client.go diff --git a/hotline/client.go b/hotline/client.go index 70e1d56..b423f9f 100644 --- a/hotline/client.go +++ b/hotline/client.go @@ -188,6 +188,43 @@ var clientHandlers = map[uint16]clientTHandler{ 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) { @@ -251,7 +288,7 @@ func handleGetFileNameList(c *Client, t *Transaction) (res []Transaction, err er } 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) } @@ -264,7 +301,7 @@ func handleGetFileNameList(c *Client, t *Transaction) (res []Transaction, err er 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) @@ -575,8 +612,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}), ), )