rudi/kbtui
1
0
Fork 0
mirror of https://github.com/Rudi9719/kbtui.git synced 2026-03-22 12:07:23 +00:00
Code Issues Releases Wiki Activity

Allow attachments and add support for dev runopt

Browse Source
This commit is contained in:
Gregory Rudolph
2019-10-04 10:19:38 -04:00
parent 58d3193826
commit b71aa1f865
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
main.go
View File

@ -13,6 +13,7 @@ import (
var commands = make(map[string]Command) var commands = make(map[string]Command)
var baseCommands = make([]string, 0) var baseCommands = make([]string, 0)
var dev = false
var k = keybase.NewKeybase() var k = keybase.NewKeybase()
var channel keybase.Channel var channel keybase.Channel
var channels []keybase.Channel var channels []keybase.Channel
@ -25,7 +26,6 @@ func main() {
fmt.Println("You are not logged in.") fmt.Println("You are not logged in.")
return return
} }
kbtui, err := gocui.NewGui(gocui.OutputNormal) kbtui, err := gocui.NewGui(gocui.OutputNormal)
if err != nil { if err != nil {
log.Printf("%+v", err) log.Printf("%+v", err)
@ -70,7 +70,7 @@ func populateChat() {
lastMessage.ID = api.Result.Messages[0].Msg.ID lastMessage.ID = api.Result.Messages[0].Msg.ID
} }
for _, message := range api.Result.Messages { for _, message := range api.Result.Messages {
if message.Msg.Content.Type == "text" { if message.Msg.Content.Type == "text" || message.Msg.Content.Type == "attachment" {
if lastMessage.ID < 1 { if lastMessage.ID < 1 {
lastMessage.ID = message.Msg.ID lastMessage.ID = message.Msg.ID
} }
@ -109,6 +109,17 @@ func formatOutput(api keybase.ChatAPI) string {
ret = strings.Replace(ret, "$DATE", fmt.Sprintf("%s", tm.Format(dateFormat)), 1) ret = strings.Replace(ret, "$DATE", fmt.Sprintf("%s", tm.Format(dateFormat)), 1)
ret = strings.Replace(ret, "$TIME", fmt.Sprintf("%s", tm.Format(timeFormat)), 1) ret = strings.Replace(ret, "$TIME", fmt.Sprintf("%s", tm.Format(timeFormat)), 1)
} }
if api.Msg.Content.Type == "attachment" {
ret = outputFormat
tm := time.Unix(int64(api.Msg.SentAt), 0)
ret = strings.Replace(ret, "$MSG", "ATTACHMENT MSG", 1)
ret = strings.Replace(ret, "$USER", api.Msg.Sender.Username, 1)
ret = strings.Replace(ret, "$DEVICE", api.Msg.Sender.DeviceName, 1)
ret = strings.Replace(ret, "$ID", fmt.Sprintf("%d", api.Msg.ID), 1)
ret = strings.Replace(ret, "$DATE", fmt.Sprintf("%s", tm.Format(dateFormat)), 1)
ret = strings.Replace(ret, "$TIME", fmt.Sprintf("%s", tm.Format(timeFormat)), 1)
}
return ret return ret
} }
@ -245,9 +256,14 @@ func initKeybindings() error {
} }
func updateChatWindow() { func updateChatWindow() {
runOpts := keybase.RunOptions {
Dev: dev,
}
k.Run(func(api keybase.ChatAPI) { k.Run(func(api keybase.ChatAPI) {
handleMessage(api) handleMessage(api)
}) },
runOpts)
} }
@ -257,7 +273,7 @@ func cleanChannelName(c string) string {
} }
func handleMessage(api keybase.ChatAPI) { func handleMessage(api keybase.ChatAPI) {
if api.Msg.Content.Type == "text" { if api.Msg.Content.Type == "text" || api.Msg.Content.Type == "attachment" {
go populateList() go populateList()
msgBody := api.Msg.Content.Text.Body msgBody := api.Msg.Content.Text.Body
msgSender := api.Msg.Sender.Username msgSender := api.Msg.Sender.Username