uwaru/matterbridge
1
0
Fork 0
forked from jshiffer/matterbridge
Code Pull Requests Activity

Fix go-keybase-chat-bot api changes

Browse Source
This commit is contained in:
Wim 2020-02-08 16:50:53 +01:00
parent ff8cf067b8
commit c01c8edeb8
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bridge/keybase/handlers.go
View File

@ -4,7 +4,7 @@ import (
"strconv" "strconv"
"github.com/42wim/matterbridge/bridge/config" "github.com/42wim/matterbridge/bridge/config"
"github.com/keybase/go-keybase-chat-bot/kbchat" "github.com/keybase/go-keybase-chat-bot/kbchat/types/chat1"
) )
func (b *Bkeybase) handleKeybase() { func (b *Bkeybase) handleKeybase() {
@ -20,7 +20,7 @@ func (b *Bkeybase) handleKeybase() {
b.Log.Errorf("failed to read message: %s", err.Error()) b.Log.Errorf("failed to read message: %s", err.Error())
} }
if msg.Message.Content.Type != "text" { if msg.Message.Content.TypeName != "text" {
continue continue
} }
@ -34,7 +34,7 @@ func (b *Bkeybase) handleKeybase() {
}() }()
} }
func (b *Bkeybase) handleMessage(msg kbchat.Message) { func (b *Bkeybase) handleMessage(msg chat1.MsgSummary) {
b.Log.Debugf("== Receiving event: %#v", msg) b.Log.Debugf("== Receiving event: %#v", msg)
if msg.Channel.TopicName != b.channel || msg.Channel.Name != b.team { if msg.Channel.TopicName != b.channel || msg.Channel.Name != b.team {
return return
@ -45,10 +45,10 @@ func (b *Bkeybase) handleMessage(msg kbchat.Message) {
// TODO download avatar // TODO download avatar
// Create our message // Create our message
rmsg := config.Message{Username: msg.Sender.Username, Text: msg.Content.Text.Body, UserID: msg.Sender.Uid, Channel: msg.Channel.TopicName, ID: strconv.Itoa(msg.MsgID), Account: b.Account} rmsg := config.Message{Username: msg.Sender.Username, Text: msg.Content.Text.Body, UserID: string(msg.Sender.Uid), Channel: msg.Channel.TopicName, ID: strconv.Itoa(int(msg.Id)), Account: b.Account}
// Text must be a string // Text must be a string
if msg.Content.Type != "text" { if msg.Content.TypeName != "text" {
b.Log.Errorf("message is not text") b.Log.Errorf("message is not text")
return return
} }

7
bridge/keybase/keybase.go
View File

@ -90,16 +90,17 @@ func (b *Bkeybase) Send(msg config.Message) (string, error) {
return "", err return "", err
} }
_, _ = b.kbc.SendAttachmentByTeam(b.team, fpath, fcaption, &b.channel) _, _ = b.kbc.SendAttachmentByTeam(b.team, &b.channel, fpath, fcaption)
} }
return "", nil return "", nil
} }
// Send regular message // Send regular message
resp, err := b.kbc.SendMessageByTeamName(b.team, msg.Username+msg.Text, &b.channel) text := msg.Username + msg.Text
resp, err := b.kbc.SendMessageByTeamName(b.team, &b.channel, text)
if err != nil { if err != nil {
return "", err return "", err
} }
return strconv.Itoa(resp.Result.MsgID), err return strconv.Itoa(int(*resp.Result.MessageID)), err
} }