luzifer/twitch-bot
1
0
Fork 0
Code Issues1 Pull requests Activity

Fix: Permit check was broken and required permit for all

Browse source 
Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
Knut Ahlers 2021-05-25 12:08:41 +02:00
parent 9c020099e1
commit 714834e184
Signed by: luzifer
GPG key ID: 0066F03ED215AD7D
1 changed files with 18 additions and 3 deletions

21
rule.go
View file

@ -144,7 +144,17 @@ func (r *rule) allowExecuteCooldown(logger *log.Entry, m *irc.Message, event *st
} }
func (r *rule) allowExecuteDisable(logger *log.Entry, m *irc.Message, event *string, badges badgeCollection) bool { func (r *rule) allowExecuteDisable(logger *log.Entry, m *irc.Message, event *string, badges badgeCollection) bool {
return r.Disable == nil || !*r.Disable if r.Disable == nil {
// No match criteria set, does not speak against matching
return true
}
if *r.Disable {
logger.Trace("Non-Match: Disable")
return false
}
return true
} }
func (r *rule) allowExecuteDisableOnOffline(logger *log.Entry, m *irc.Message, event *string, badges badgeCollection) bool { func (r *rule) allowExecuteDisableOnOffline(logger *log.Entry, m *irc.Message, event *string, badges badgeCollection) bool {
@ -167,7 +177,7 @@ func (r *rule) allowExecuteDisableOnOffline(logger *log.Entry, m *irc.Message, e
} }
func (r *rule) allowExecuteDisableOnPermit(logger *log.Entry, m *irc.Message, event *string, badges badgeCollection) bool { func (r *rule) allowExecuteDisableOnPermit(logger *log.Entry, m *irc.Message, event *string, badges badgeCollection) bool {
if r.DisableOnPermit == nil || (*r.DisableOnPermit && timerStore.HasPermit(m.Params[0], m.User)) { if r.DisableOnPermit != nil && *r.DisableOnPermit && timerStore.HasPermit(m.Params[0], m.User) {
logger.Trace("Non-Match: Permit") logger.Trace("Non-Match: Permit")
return false return false
} }
@ -188,7 +198,12 @@ func (r *rule) allowExecuteDisableOnTemplate(logger *log.Entry, m *irc.Message,
return false return false
} }
return res != "true" if res == "true" {
logger.Trace("Non-Match: Template")
return false
}
return true
} }
func (r *rule) allowExecuteEventWhitelist(logger *log.Entry, m *irc.Message, event *string, badges badgeCollection) bool { func (r *rule) allowExecuteEventWhitelist(logger *log.Entry, m *irc.Message, event *string, badges badgeCollection) bool {