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

sometimes you have an id, sometimes a message, we should support relpying to both

This commit is contained in:
skkiesel 2017-10-31 10:16:41 -04:00
parent 3009a646e6
commit d9bb7ec3c0
6 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bot/handlers.go
View File

@ -63,8 +63,12 @@ func (b *bot) SendAction(channel, message string) string {
return b.conn.SendAction(channel, message) return b.conn.SendAction(channel, message)
} }
func (b *bot) ReplyToMessage(channel, message, identifier string) (string, bool) { func (b *bot) ReplyToMessageIdentifier(channel, message, identifier string) (string, bool) {
return b.conn.ReplyToMessage(channel, message, identifier) return b.conn.ReplyToMessageIdentifier(channel, message, identifier)
}
func (b *bot) ReplyToMessage(channel, message string, replyTo msg.Message) (string, bool) {
return b.conn.ReplyToMessage(channel, message, replyTo)
} }
func (b *bot) React(channel, reaction string, message msg.Message) bool { func (b *bot) React(channel, reaction string, message msg.Message) bool {

6
bot/interfaces.go
View File

@ -17,7 +17,8 @@ type Bot interface {
AddHandler(string, Handler) AddHandler(string, Handler)
SendMessage(string, string) string SendMessage(string, string) string
SendAction(string, string) string SendAction(string, string) string
ReplyToMessage(channel, message, identifier string) (string, bool) ReplyToMessageIdentifier(string, string, string) (string, bool)
ReplyToMessage(string, string, msg.Message) (string, bool)
React(string, string, msg.Message) bool React(string, string, msg.Message) bool
Edit(string, string, string) bool Edit(string, string, string) bool
MsgReceived(msg.Message) MsgReceived(msg.Message)
@ -35,7 +36,8 @@ type Connector interface {
SendMessage(channel, message string) string SendMessage(channel, message string) string
SendAction(channel, message string) string SendAction(channel, message string) string
ReplyToMessage(channel, message, identifier string) (string, bool) ReplyToMessageIdentifier(string, string, string) (string, bool)
ReplyToMessage(string, string, msg.Message) (string, bool)
React(string, string, msg.Message) bool React(string, string, msg.Message) bool
Edit(string, string, string) bool Edit(string, string, string) bool
GetEmojiList() map[string]string GetEmojiList() map[string]string

3
bot/mock.go
View File

@ -39,7 +39,8 @@ func (mb *MockBot) SendAction(ch string, msg string) string {
mb.Actions = append(mb.Actions, msg) mb.Actions = append(mb.Actions, msg)
return fmt.Sprintf("a-%d", len(mb.Actions)-1) return fmt.Sprintf("a-%d", len(mb.Actions)-1)
} }
func (mb *MockBot) ReplyToMessage(channel, message, identifier string) (string, bool) { return "", false } func (mb *MockBot) ReplyToMessageIdentifier(channel, message, identifier string) (string, bool) { return "", false }
func (mb *MockBot) ReplyToMessage(channel, message string, replyTo msg.Message) (string, bool) { return "", false }
func (mb *MockBot) MsgReceived(msg msg.Message) {} func (mb *MockBot) MsgReceived(msg msg.Message) {}
func (mb *MockBot) EventReceived(msg msg.Message) {} func (mb *MockBot) EventReceived(msg msg.Message) {}
func (mb *MockBot) Filter(msg msg.Message, s string) string { return "" } func (mb *MockBot) Filter(msg msg.Message, s string) string { return "" }

6
irc/irc.go
View File

@ -101,7 +101,11 @@ func (i *Irc) SendAction(channel, message string) string {
return "NO_IRC_IDENTIFIERS" return "NO_IRC_IDENTIFIERS"
} }
func (i *Irc) ReplyToMessage(channel, message, identifier string) (string, bool) { func (i *Irc) ReplyToMessageIdentifier(channel, message, identifier string) (string, bool) {
return "NO_IRC_IDENTIFIERS", false
}
func (i *Irc) ReplyToMessage(channel, message string, replyTo msg.Message) (string, bool) {
return "NO_IRC_IDENTIFIERS", false return "NO_IRC_IDENTIFIERS", false
} }

2
plugins/rpgORdie/rpgORdie.go
View File

@ -33,7 +33,7 @@ func (p *RPGPlugin) Message(message msg.Message) bool {
} }
p.Bot.Edit(message.Channel, "HECK YES", ts) p.Bot.Edit(message.Channel, "HECK YES", ts)
p.Bot.ReplyToMessage(message.Channel, "How's this reply?", ts) p.Bot.ReplyToMessageIdentifier(message.Channel, "How's this reply?", ts)
} }
return false return false
} }

6
slack/slack.go
View File

@ -247,7 +247,7 @@ func (s *Slack) SendAction(channel, message string) string {
return identifier return identifier
} }
func (s *Slack) ReplyToMessage(channel, message, identifier string) (string, bool) { func (s *Slack) ReplyToMessageIdentifier(channel, message, identifier string) (string, bool) {
resp, err := http.PostForm("https://slack.com/api/chat.postMessage", resp, err := http.PostForm("https://slack.com/api/chat.postMessage",
url.Values{"token": {s.config.Slack.Token}, url.Values{"token": {s.config.Slack.Token},
"channel": {channel}, "channel": {channel},
@ -288,6 +288,10 @@ func (s *Slack) ReplyToMessage(channel, message, identifier string) (string, boo
return mr.Timestamp, err == nil return mr.Timestamp, err == nil
} }
func (s *Slack) ReplyToMessage(channel, message string, replyTo msg.Message) (string, bool) {
return s.ReplyToMessageIdentifier(channel, message, replyTo.AdditionalData["RAW_SLACK_TIMESTAMP"])
}
func (s *Slack) React(channel, reaction string, message msg.Message) bool { func (s *Slack) React(channel, reaction string, message msg.Message) bool {
log.Printf("Reacting in %s: %s", channel, reaction) log.Printf("Reacting in %s: %s", channel, reaction)
resp, err := http.PostForm("https://slack.com/api/reactions.add", resp, err := http.PostForm("https://slack.com/api/reactions.add",