lug/matterbridge
10
0
Fork 2
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

matrix: get the type from the correct variable.

Browse Source 
run gofmt
This commit is contained in:
David Hill
2018-11-07 11:48:57 -05:00
parent 45c44aee50
commit 1a26475fbb
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bridge/matrix/matrix.go
View File

@@ -161,7 +161,8 @@ func (b *Bmatrix) handleEvent(ev *matrix.Event) {
// Text must be a string // Text must be a string
if rmsg.Text, ok = ev.Content["body"].(string); !ok { if rmsg.Text, ok = ev.Content["body"].(string); !ok {
b.Log.Errorf("Content[body] wasn't a %T ?", rmsg.Text) b.Log.Errorf("Content[body] is not a string: %T\n%#v",
ev.Content["body"], ev.Content)
return return
} }

11
bridge/slack/handlers.go
View File

@@ -166,15 +166,14 @@ func (b *Bslack) handleMessageEvent(ev *slack.MessageEvent) (*config.Message, er
} }
rmsg := config.Message{ rmsg := config.Message{
Text: ev.Text, Text: ev.Text,
Channel: channelInfo.Name, Channel: channelInfo.Name,
Account: b.Account, Account: b.Account,
ID: "slack " + ev.Timestamp, ID: "slack " + ev.Timestamp,
Extra: map[string][]interface{}{}, Extra: map[string][]interface{}{},
ParentID: ev.ThreadTimestamp, ParentID: ev.ThreadTimestamp,
} }
if b.useChannelID { if b.useChannelID {
rmsg.Channel = "ID:" + channelInfo.ID rmsg.Channel = "ID:" + channelInfo.ID
} }

4
gateway/gateway.go
View File

@@ -310,9 +310,9 @@ func (gw *Gateway) handleMessage(msg config.Message, dest *bridge.Bridge) []*BrM
msg.Channel = originchannel msg.Channel = originchannel
} }
msg.ParentID = gw.getDestMsgID(canonicalParentMsgID, dest, channel) msg.ParentID = gw.getDestMsgID(canonicalParentMsgID, dest, channel)
if msg.ParentID == "" { if msg.ParentID == "" {
msg.ParentID = canonicalParentMsgID msg.ParentID = canonicalParentMsgID
} }
mID, err := dest.Send(msg) mID, err := dest.Send(msg)