From 9ed78946513af793fc995fededfcbfab128193cc Mon Sep 17 00:00:00 2001 From: Henesy Date: Fri, 20 May 2022 03:45:50 +0000 Subject: [PATCH] fix a weird crash in reminders - may have killed reminders --- x/mux/misc.go | 9 +++++++++ x/mux/oracle.go | 4 +++- x/mux/remind.go | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/x/mux/misc.go b/x/mux/misc.go index 304a87f2aedd4994c45f8a44d84f5481e24f9d20..a9ad9564b5f7073378f0866cea480dd452273277 100644 --- a/x/mux/misc.go +++ b/x/mux/misc.go @@ -6,6 +6,15 @@ import ( "strings" ) + +func min(a, b int) int { + if a <= b { + return a + } + return b +} + + // Chan for communicating to Glenda var GlendaChan chan string diff --git a/x/mux/oracle.go b/x/mux/oracle.go index f213fe8aef7171b830ddeee97c67c40470d7d015..7f0d15aa86cc0868e76a128204ca55fb9a7f4452 100644 --- a/x/mux/oracle.go +++ b/x/mux/oracle.go @@ -33,11 +33,13 @@ func (m *Mux) Oracle(ds *discordgo.Session, dm *discordgo.Message, ctx *Context) f = "faust" } else if strings.Contains(dm.Content, "fortunes") { f = "fortunes" + } else if strings.Contains(dm.Content, "commie") { + f = "commie" } // Linux solution var args []string - args = append(args, "-db", path + f, "-len", "30") + args = append(args, "-db", path + f, "-len", "20") args = append(args, prompt...) //fmt.Println(args) out, err := exec.Command("oracle", args...).Output() diff --git a/x/mux/remind.go b/x/mux/remind.go index 09d13de6a0552359554a0530b09391ec36cadd99..09309240b4d4e18438edd222d1444c151b6483d0 100644 --- a/x/mux/remind.go +++ b/x/mux/remind.go @@ -52,6 +52,7 @@ func Reminders() { Config.Reminders = []Reminder{Config.Reminders[0]} } default: + i = min(i, len(Config.Reminders) - 1) switch i { case len(Config.Reminders) - 1: // Last