diff options
author | cori hudson <54032873+hyperobject@users.noreply.github.com> | 2019-08-26 15:00:31 -0400 |
---|---|---|
committer | Wim <wim@42.be> | 2019-08-26 21:00:31 +0200 |
commit | 921f2dfcdf1a6263220b55eb55716e497373dfcf (patch) | |
tree | 436478bd7b61ea598d75af0d27520b512dad1683 /bridge | |
parent | 79a006c8de311a7bbab540e62bd3fac998d415d5 (diff) | |
download | matterbridge-msglm-921f2dfcdf1a6263220b55eb55716e497373dfcf.tar.gz matterbridge-msglm-921f2dfcdf1a6263220b55eb55716e497373dfcf.tar.bz2 matterbridge-msglm-921f2dfcdf1a6263220b55eb55716e497373dfcf.zip |
Add initial Keybase Chat support (#877)
* initial work on native keybase bridging
* Hopefully make a functional keybase bridge
* add keybase to bridgemap
* send to right channel, try to figure out received msgs
* add account and userid
* i am a Dam Fool
* Fix formatting for messages, handle /me
* update vendors, ran golint and goimports
* move handlers to handlers.go, clean up unused config options
* add sample config, fix inconsistent remote nick handling
* Update readme with keybase links
* Resolve fixmie errors
* Error -> Errorf
* fix linting errors in go.mod and go.sum
* explicitly join channels, ignore messages from non-specified channels
* check that team names match before bridging message
Diffstat (limited to 'bridge')
-rw-r--r-- | bridge/config/config.go | 3 | ||||
-rw-r--r-- | bridge/keybase/handlers.go | 59 | ||||
-rw-r--r-- | bridge/keybase/keybase.go | 82 |
3 files changed, 143 insertions, 1 deletions
diff --git a/bridge/config/config.go b/bridge/config/config.go index e7d8da59..cf6872a0 100644 --- a/bridge/config/config.go +++ b/bridge/config/config.go @@ -131,7 +131,7 @@ type Protocol struct { StripNick bool // all protocols SyncTopic bool // slack TengoModifyMessage string // general - Team string // mattermost + Team string // mattermost, keybase Token string // gitter, slack, discord, api Topic string // zulip URL string // mattermost, slack // DEPRECATED @@ -198,6 +198,7 @@ type BridgeValues struct { SSHChat map[string]Protocol WhatsApp map[string]Protocol // TODO is this struct used? Search for "SlackLegacy" for example didn't return any results Zulip map[string]Protocol + Keybase map[string]Protocol General Protocol Tengo Tengo Gateway []Gateway diff --git a/bridge/keybase/handlers.go b/bridge/keybase/handlers.go new file mode 100644 index 00000000..165aeb16 --- /dev/null +++ b/bridge/keybase/handlers.go @@ -0,0 +1,59 @@ +package bkeybase + +import ( + "strconv" + + "github.com/42wim/matterbridge/bridge/config" + "github.com/keybase/go-keybase-chat-bot/kbchat" +) + +func (b *Bkeybase) handleKeybase() { + sub, err := b.kbc.ListenForNewTextMessages() + if err != nil { + b.Log.Errorf("Error listening: %s", err.Error()) + } + + go func() { + for { + msg, err := sub.Read() + if err != nil { + b.Log.Errorf("failed to read message: %s", err.Error()) + } + + if msg.Message.Content.Type != "text" { + continue + } + + if msg.Message.Sender.Username == b.kbc.GetUsername() { + continue + } + + b.handleMessage(msg.Message) + + } + }() +} + +func (b *Bkeybase) handleMessage(msg kbchat.Message) { + b.Log.Debugf("== Receiving event: %#v", msg) + if msg.Channel.TopicName != b.channel || msg.Channel.Name != b.team { + return + } + + if msg.Sender.Username != b.kbc.GetUsername() { + + // TODO download avatar + + // 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} + + // Text must be a string + if msg.Content.Type != "text" { + b.Log.Errorf("message is not text") + return + } + + b.Log.Debugf("<= Sending message from %s on %s to gateway", msg.Sender.Username, msg.Channel.Name) + b.Remote <- rmsg + } +} diff --git a/bridge/keybase/keybase.go b/bridge/keybase/keybase.go new file mode 100644 index 00000000..a4b12742 --- /dev/null +++ b/bridge/keybase/keybase.go @@ -0,0 +1,82 @@ +package bkeybase + +import ( + "strconv" + + "github.com/42wim/matterbridge/bridge" + "github.com/42wim/matterbridge/bridge/config" + "github.com/keybase/go-keybase-chat-bot/kbchat" +) + +// Bkeybase bridge structure +type Bkeybase struct { + kbc *kbchat.API + user string + channel string + team string + *bridge.Config +} + +// New initializes Bkeybase object and sets team +func New(cfg *bridge.Config) bridge.Bridger { + b := &Bkeybase{Config: cfg} + b.team = b.Config.GetString("Team") + return b +} + +// Connect starts keybase API and listener loop +func (b *Bkeybase) Connect() error { + var err error + b.Log.Infof("Connecting %s", b.GetString("Team")) + + // use default keybase location (`keybase`) + b.kbc, err = kbchat.Start(kbchat.RunOptions{}) + if err != nil { + return err + } + b.user = b.kbc.GetUsername() + b.Log.Info("Connection succeeded") + go b.handleKeybase() + return nil +} + +// Disconnect doesn't do anything for now +func (b *Bkeybase) Disconnect() error { + return nil +} + +// JoinChannel sets channel name in struct +func (b *Bkeybase) JoinChannel(channel config.ChannelInfo) error { + if _, err := b.kbc.JoinChannel(b.team, channel.Name); err != nil { + return err + } + b.channel = channel.Name + return nil +} + +// Send receives bridge messages and sends them to Keybase chat room +func (b *Bkeybase) Send(msg config.Message) (string, error) { + b.Log.Debugf("=> Receiving %#v", msg) + + // Handle /me events + if msg.Event == config.EventUserAction { + msg.Text = "_" + msg.Text + "_" + } + + // Delete message if we have an ID + // Delete message not supported by keybase go library yet + + // Upload a file if it exists + // kbchat lib does not support attachments yet + + // Edit message if we have an ID + // kbchat lib does not support message editing yet + + // Send regular message + resp, err := b.kbc.SendMessageByTeamName(b.team, msg.Username+msg.Text, &b.channel) + if err != nil { + return "", err + } + + return strconv.Itoa(resp.Result.MsgID), err +} |