commit ec289b15cae987a2dc1e9f0cd37f991161c81072
Author: Jerry Heiselman <jheiselman@users.noreply.github.com>
Date: Wed Apr 25 14:27:34 2018 +0000
Properly set Slack user who initiated slash command (#394)
* Properly set Slack user who initiated slash command
diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go
index 0abd83c..95c8515 100644
--- a/bridge/slack/slack.go
+++ b/bridge/slack/slack.go
@@ -4857 +4857 @@ func (b *Bslack) handleMessageEvent(ev *slack.MessageEvent) (*config.Message, er
rmsg := config.Message{Text: ev.Text, Channel: channel.Name, Account: b.Account, ID: "slack " + ev.Timestamp, Extra: make(map[string][]interface{})}
// find the user id and name
- if ev.BotID == "" && ev.SubType != messageDeleted && ev.SubType != "file_comment" {
+ if ev.User != "" && ev.SubType != messageDeleted && ev.SubType != "file_comment" {
user, err := b.rtm.GetUserInfo(ev.User)
if err != nil {
return nil, err
@@ -5097 +5097 @@ func (b *Bslack) handleMessageEvent(ev *slack.MessageEvent) (*config.Message, er
}
// when using webhookURL we can't check if it's our webhook or not for now
- if ev.BotID != "" && b.GetString("WebhookURL") == "" {
+ if rmsg.Username == "" && ev.BotID != "" && b.GetString("WebhookURL") == "" {
bot, err := b.rtm.GetBotInfo(ev.BotID)
if err != nil {
return nil, err
