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

Added

This commit is contained in:
Chris Sexton 2012-08-26 16:35:13 -04:00
parent 281b910dd6
commit 24e8010efc
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/factoid.go
View File

@ -97,14 +97,21 @@ func (p *FactoidPlugin) findTrigger(message string) (bool, *factoid) {
} }
func (p *FactoidPlugin) trigger(message bot.Message) bool { func (p *FactoidPlugin) trigger(message bot.Message) bool {
if len(message.Body) > 4 { if len(message.Body) > 4 || message.Command {
if ok, fact := p.findTrigger(message.Body); ok { if ok, fact := p.findTrigger(message.Body); ok {
msg := p.Bot.Filter(message, fact.FullText) msg := p.Bot.Filter(message, fact.FullText)
for i, m := 0, strings.Split(msg, "$and"); i < len(m) && i < 4; i++ {
msg := strings.TrimSpace(m[i])
if len(msg) == 0 {
continue
}
if fact.Operator == "action" { if fact.Operator == "action" {
p.Bot.SendAction(message.Channel, msg) p.Bot.SendAction(message.Channel, msg)
} else { } else {
p.Bot.SendMessage(message.Channel, msg) p.Bot.SendMessage(message.Channel, msg)
} }
}
return true return true
} }
} }
@ -139,7 +146,12 @@ func (p *FactoidPlugin) Message(message bot.Message) bool {
if len(trigger) == 0 || len(fact) == 0 || len(action) == 0 { if len(trigger) == 0 || len(fact) == 0 || len(action) == 0 {
p.Bot.SendMessage(message.Channel, "I don't want to learn that.") p.Bot.SendMessage(message.Channel, "I don't want to learn that.")
return false return true
}
if len(strings.Split(fact, "$and")) > 4 {
p.Bot.SendMessage(message.Channel, "You can't use more than 4 $and operators.")
return true
} }
strippedaction := strings.Replace(strings.Replace(action, "<", "", 1), ">", "", 1) strippedaction := strings.Replace(strings.Replace(action, "<", "", 1), ">", "", 1)