cws
/
catbase
mirror of https://github.com/velour/catbase.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #94 from velour/bot2bot 

one more try
This commit is contained in:
Scott Kiesel 2017-11-17 10:45:12 -05:00 committed by GitHub
parent bcdd9a2a29 7841da0f48
commit ce292934cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slack/slack.go
View File

@ -230,7 +230,9 @@ func (s *Slack) SendMessageType(channel, message string, meMessage bool) (string
type MessageResponse struct { type MessageResponse struct {
OK bool `json:"ok"` OK bool `json:"ok"`
Timestamp string `json:"ts"` Timestamp string `json:"ts"`
BotID string `json:"message.bot_id"` Message struct {
BotID string `json:"bot_id"`
} `json:"message"`
} }
var mr MessageResponse var mr MessageResponse
@ -243,7 +245,7 @@ func (s *Slack) SendMessageType(channel, message string, meMessage bool) (string
return "", errors.New("failure response received") return "", errors.New("failure response received")
} }
s.myBotID = mr.BotID s.myBotID = mr.Message.BotID
return mr.Timestamp, err return mr.Timestamp, err
} }
@ -397,7 +399,7 @@ func (s *Slack) Serve() error {
} }
switch msg.Type { switch msg.Type {
case "message": case "message":
isItMe := s.myBotID != "" && msg.BotID != s.myBotID isItMe := msg.BotID != "" && msg.BotID == s.myBotID
if !isItMe && !msg.Hidden && msg.ThreadTs == "" { if !isItMe && !msg.Hidden && msg.ThreadTs == "" {
m := s.buildMessage(msg) m := s.buildMessage(msg)
if m.Time.Before(s.lastRecieved) { if m.Time.Before(s.lastRecieved) {