From 8cd06cbd4ab48674ef783cc5a003fb1abc74f58e Mon Sep 17 00:00:00 2001 From: Lukas Peters Date: Mon, 6 May 2024 16:51:43 -0400 Subject: [PATCH 1/2] error handling for invalid date format --- commands/slash/dquery.go | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/commands/slash/dquery.go b/commands/slash/dquery.go index dc6ba56..b0ea987 100644 --- a/commands/slash/dquery.go +++ b/commands/slash/dquery.go @@ -17,7 +17,7 @@ import ( func DQuery() (*discordgo.ApplicationCommand, func(s *discordgo.Session, i *discordgo.InteractionCreate)) { return &discordgo.ApplicationCommand{ Name: "dquery", - Description: "Query users by signins on specific date and outputs to CSV file", + Description: "Query usernames by signins on specific date and outputs to CSV file", DefaultMemberPermissions: &permission.IGLead, Options: []*discordgo.ApplicationCommandOption{ { @@ -142,8 +142,21 @@ func DQuery() (*discordgo.ApplicationCommand, func(s *discordgo.Session, i *disc // Parsing the date as time.Time dateToQuery, err := time.Parse("2006-01-02", dateRequested) + + //Inform user that the date format is incorrect and exit if err != nil { logging.Error(s, err.Error(), i.Member.User, span, logrus.Fields{"error": err}) + err = s.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseChannelMessageWithSource, + Data: &discordgo.InteractionResponseData{ + Flags: discordgo.MessageFlagsEphemeral, + Content: "Date format is invalid. It needs to be YYYY-MM-DD, e.g., 2003-05-12.", + }, + }) + if err != nil { + logging.Error(s, err.Error(), i.Member.User, span, logrus.Fields{"error": err}) + return + } return } @@ -157,7 +170,6 @@ func DQuery() (*discordgo.ApplicationCommand, func(s *discordgo.Session, i *disc return } - message := "" // Initial message err = s.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{ Type: discordgo.InteractionResponseChannelMessageWithSource, @@ -171,6 +183,7 @@ func DQuery() (*discordgo.ApplicationCommand, func(s *discordgo.Session, i *disc } // Processing + message := "" for x, signin := range signins { // Wait for 1 seconds after every 8 user's username is called From 74c6340633bfd4521f0fcede1af2e5acfcd7c4ba Mon Sep 17 00:00:00 2001 From: Lukas Peters Date: Mon, 6 May 2024 16:52:11 -0400 Subject: [PATCH 2/2] disabled goodfoodenjoyers for the summer RIP --- commands/enabled.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/enabled.go b/commands/enabled.go index a848b30..cb2a019 100644 --- a/commands/enabled.go +++ b/commands/enabled.go @@ -66,7 +66,7 @@ func populateScheduledEvents(ctx ddtrace.SpanContext) { defer span.Finish() // Populate the scheduled events - ScheduledEvents["goodfood"] = scheduled.GoodFood + // ScheduledEvents["goodfood"] = scheduled.GoodFood ScheduledEvents["heartbeat"] = scheduled.Heartbeat ScheduledEvents["status"] = scheduled.Status ScheduledEvents["update"] = scheduled.Update