From 3cc1a366b0e13e5c8240bb932c27c35d95ff3cb0 Mon Sep 17 00:00:00 2001 From: Malachy Byrne Date: Sun, 5 Oct 2025 23:04:16 +0200 Subject: [PATCH] print dice expression (#3) Reviewed-on: https://git.malmal200.xyz/malmal200/treerazer/pulls/3 --- application/bot.go | 23 +++++++++++------------ application/commands.go | 6 +++++- docker-compose.yml | 8 ++++++++ 3 files changed, 24 insertions(+), 13 deletions(-) create mode 100644 docker-compose.yml diff --git a/application/bot.go b/application/bot.go index 54526b8..0abd3d8 100644 --- a/application/bot.go +++ b/application/bot.go @@ -37,19 +37,18 @@ func init() { return } messageContent[0] = messageContent[0][len(prefix):] - var response string if fun, ok := dotCommandHandlers[messageContent[0]]; ok { - response = fun(messageContent[1:]) - } - _, err := s.ChannelMessageSendComplex(m.ChannelID, &discordgo.MessageSend{ - Content: response, - Reference: m.Reference(), - AllowedMentions: &discordgo.MessageAllowedMentions{ - RepliedUser: false, - }, - }) - if err != nil { - log.Printf("Error sending message: %v", err) + response := fun(messageContent[1:]) + _, err := s.ChannelMessageSendComplex(m.ChannelID, &discordgo.MessageSend{ + Content: response, + Reference: m.Reference(), + AllowedMentions: &discordgo.MessageAllowedMentions{ + RepliedUser: false, + }, + }) + if err != nil { + log.Printf("Error sending message: %v", err) + } } }) } diff --git a/application/commands.go b/application/commands.go index 8099fdf..f543eb9 100644 --- a/application/commands.go +++ b/application/commands.go @@ -74,6 +74,10 @@ func roll(opts optionMap) string { return ret } var ret strings.Builder + _, err = fmt.Fprintf(&ret, "Dice expression: `%s`\n", exp) + if err != nil { + return fmt.Sprintf("Error rolling dice: %s", err) + } _, err = fmt.Fprint(&ret, "Rolled dice: `") if err != nil { return fmt.Sprintf("Error rolling dice: %s", err) @@ -100,5 +104,5 @@ func roll(opts optionMap) string { if ret.Len() < 2000 { return ret.String() } - return fmt.Sprintf("Too many dice to display. Omitting.\nTotal: %v", total) + return fmt.Sprintf("Too many dice to display. Omitting.\nExpression: %s\nTotal: %v", exp, total) } diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..3b81496 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,8 @@ +version: '3' + +services: + treerazer: + image: git.malmal200.xyz/malmal200/treerazer:test + environment: + COMMAND_PREFIX: "treereazer-test." + DISCORD_TOKEN: ""