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

Filter out messages from bots for now

This commit is contained in:
skkiesel 2017-11-09 06:21:43 -05:00
parent 695c749727
commit 4ecbe971ac
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
slack/slack.go
View File

@ -39,8 +39,8 @@ type Slack struct {
emoji map[string]string emoji map[string]string
eventReceived func(msg.Message) eventReceived func(msg.Message)
messageReceived func(msg.Message) messageReceived func(msg.Message)
replyMessageReceived func(msg.Message, string) replyMessageReceived func(msg.Message, string)
} }
@ -134,8 +134,9 @@ type slackMessage struct {
Text string `json:"text"` Text string `json:"text"`
User string `json:"user"` User string `json:"user"`
Username string `json:"username"` Username string `json:"username"`
BotId string `json:"bot_id"`
Ts string `json:"ts"` Ts string `json:"ts"`
ThreadTs string `json:"thread_ts"` ThreadTs string `json:"thread_ts"`
Error struct { Error struct {
Code uint64 `json:"code"` Code uint64 `json:"code"`
Msg string `json:"msg"` Msg string `json:"msg"`
@ -259,7 +260,7 @@ func (s *Slack) ReplyToMessageIdentifier(channel, message, identifier string) (s
url.Values{"token": {s.config.Slack.Token}, url.Values{"token": {s.config.Slack.Token},
"channel": {channel}, "channel": {channel},
"text": {message}, "text": {message},
"as_user": {"true"}, "as_user": {"true"},
"thread_ts": {identifier}, "thread_ts": {identifier},
}) })
@ -392,7 +393,7 @@ func (s *Slack) Serve() error {
} }
switch msg.Type { switch msg.Type {
case "message": case "message":
if !msg.Hidden && msg.ThreadTs == "" { if msg.BotId == "" && !msg.Hidden && msg.ThreadTs == "" {
m := s.buildMessage(msg) m := s.buildMessage(msg)
if m.Time.Before(s.lastRecieved) { if m.Time.Before(s.lastRecieved) {
log.Printf("Ignoring message: %+v\nlastRecieved: %v msg: %v", msg.ID, s.lastRecieved, m.Time) log.Printf("Ignoring message: %+v\nlastRecieved: %v msg: %v", msg.ID, s.lastRecieved, m.Time)