diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/application.go | 18 | ||||
| -rw-r--r-- | client/channel_window.go | 3 | ||||
| -rw-r--r-- | client/cmd_window.go | 6 | ||||
| -rw-r--r-- | client/command.go | 16 | ||||
| -rw-r--r-- | client/ui.go | 20 | ||||
| -rw-r--r-- | client/user_messages.go | 60 |
6 files changed, 111 insertions, 12 deletions
diff --git a/client/application.go b/client/application.go index 5ac3b9d..fb12717 100644 --- a/client/application.go +++ b/client/application.go @@ -64,7 +64,7 @@ func (a *application) OnEvent(cmd proto.Command) { } case "update": if len(cmd.Args) > 0 { - a.cache.Update(cmd.Target, cmd.Args[0]) + a.onUpdate(cmd.Target, cmd.Args[0]) } case "delete": a.cache.Gone(cmd.Target) @@ -80,6 +80,13 @@ func (a *application) OnResponse(requestId string, cmd proto.Command) { } } +func (a *application) onUpdate(target string, update proto.Object) { + if target == a.uid { + a.logUserUpdate(target, update) + } + a.cache.Update(target, update) +} + func (a *application) Sub(id string) { a.Request(proto.NewCmd("s", id), func(cmd proto.Command) { if cmd.Kind == "i" && len(cmd.Args) > 0 { @@ -126,12 +133,7 @@ func (a *application) auth(name string, authCallback func(success bool)) { } func (a *application) sendUpdate(o proto.Object, cb func(proto.Command)) { - a.Request(proto.NewCmd("update", o.Id, o), func(response proto.Command) { - if response.Kind == "ok" { - a.cache.Update(o.Id, o) - } - cb(response) - }) + a.Request(proto.NewCmd("update", o.Id, o), cb) } func (a *application) lookup( @@ -212,8 +214,6 @@ func (a *application) setNick(newName string) { if len(response.Args) != 0 { a.cmdWindow.err(proto.Strfail(response.Args[0])) } - case "ok": - a.cmdWindow.info("your name is: %s", newName) } } a.sendUpdate( diff --git a/client/channel_window.go b/client/channel_window.go index b516775..d8f4c2c 100644 --- a/client/channel_window.go +++ b/client/channel_window.go @@ -98,8 +98,7 @@ func (cw *channelWindow) Send(text string) { } case "fail": if len(response.Args) > 0 { - f := proto.Fail(response.Args[0]) - globalApp.cmdWindow.err(f.Error()) + globalApp.cmdWindow.fail(response.Args[0]) } } } diff --git a/client/cmd_window.go b/client/cmd_window.go index fe6e60a..c423b87 100644 --- a/client/cmd_window.go +++ b/client/cmd_window.go @@ -1,9 +1,9 @@ package main import ( - "citrons.xyz/talk/client/buffer" "citrons.xyz/talk/client/window" "citrons.xyz/talk/tui" + "citrons.xyz/talk/proto" "fmt" ) @@ -119,6 +119,10 @@ func (w *cmdWindow) err(f string, a ...any) { w.Buf.Add(logMsg {lastIndex, fmt.Sprintf(f, a...), logErr}) } +func (w *cmdWindow) fail(o proto.Object) { + w.err(proto.Strfail(o)) +} + func (w *cmdWindow) cmd(f string, a ...any) { lastIndex++ w.Buf.Add(logMsg {lastIndex, fmt.Sprintf(f, a...), logCmd}) diff --git a/client/command.go b/client/command.go index 2c146e9..3122dc6 100644 --- a/client/command.go +++ b/client/command.go @@ -1,5 +1,9 @@ package main +import ( + "citrons.xyz/talk/proto" +) + func isCommand(text string) (bool, string) { if text[0] == '/' { if len(text) > 1 && text[1] == '/' { @@ -93,6 +97,18 @@ func (a *application) doCommand(command string, args []string, text string) { a.cmdWindow.Buffer().Add(msg) }) } + case "status": + if !a.authenticated { + break + } + cb := func(response proto.Command) { + if response.Kind == "fail" && len(response.Args) > 0 { + a.cmdWindow.fail(response.Args[0]) + } + } + a.sendUpdate(proto.Object { + "u", a.uid, map[string]string {"status": text}, + }, cb) case "create": if a.authenticated { a.createChannel(text) diff --git a/client/ui.go b/client/ui.go index 740cc54..f3a79c6 100644 --- a/client/ui.go +++ b/client/ui.go @@ -3,6 +3,7 @@ package main import ( "citrons.xyz/talk/client/window" "citrons.xyz/talk/tui" + "citrons.xyz/talk/proto" "zgo.at/termfo/keys" "os" ) @@ -68,6 +69,25 @@ func (a *application) onInput(ev tui.Event) { } +func (a *application) logUserUpdate(uid string, update proto.Object) { + u := a.cache.Get(uid) + if u == nil { + return + } + switch { + case update.Fields["status"] != "": + lastIndex++ + a.cmdWindow.Buffer().Add(userStatusMsg { + lastIndex, uid, u.Fields[""], update.Fields["status"], + }) + case update.Fields[""] != "": + lastIndex++ + a.cmdWindow.Buffer().Add(nameChangeMsg { + lastIndex, uid, u.Fields[""], update.Fields[""], + }) + } +} + func (a *application) showNickBox() { tui.Push("username", tui.Box {Width: tui.TextSize, Height: tui.TextSize}) tui.Text("[", nil) diff --git a/client/user_messages.go b/client/user_messages.go new file mode 100644 index 0000000..80b8fcc --- /dev/null +++ b/client/user_messages.go @@ -0,0 +1,60 @@ +package main + +import ( + "citrons.xyz/talk/tui" + "fmt" +) + +type nameChangeMsg struct { + index int + uid string + oldName string + newName string +} + +type userStatusMsg struct { + index int + uid string + username string + status string +} + +func (m nameChangeMsg) Id() string { + return fmt.Sprintf("name change.%d", m.index) +} + +func (m userStatusMsg) Id() string { + return fmt.Sprintf("user status.%d", m.index) +} + +func (m nameChangeMsg) Show(odd bool) { + tui.Push("", tui.Box {Width: tui.Fill, Height: tui.TextSize}) + tui.Text("nick: ", &tui.Style { + Fg: tui.BrightBlack, Bg: colorDefault[odd], + }) + tui.Text(m.oldName, &tui.Style { + Fg: tui.White, Bg: colorDefault[odd], Italic: true, + }) + tui.Text(" -> ", &tui.Style { + Fg: tui.BrightBlack, Bg: colorDefault[odd], + }) + tui.Text(m.newName, &tui.Style { + Fg: tui.White, Bg: colorDefault[odd], Bold: true, + }) + tui.Pop() +} + +func (m userStatusMsg) Show(odd bool) { + tui.Push("", tui.Box {Width: tui.Fill, Height: tui.TextSize}) + tui.Text("status: ", &tui.Style { + Fg: tui.BrightBlack, Bg: colorDefault[odd], + }) + tui.Text(m.username, &tui.Style { + Fg: tui.White, Bg: colorDefault[odd], Bold: true, + }) + tui.Text(" : ", &tui.Style { + Fg: tui.BrightBlack, Bg: colorDefault[odd], + }) + tui.Text(m.status, nil) + tui.Pop() +} |