print dice expression (#3)

Reviewed-on: #3

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:])
+			response := fun(messageContent[1:])
-		}
+			_, err := s.ChannelMessageSendComplex(m.ChannelID, &discordgo.MessageSend{
-		_, err := s.ChannelMessageSendComplex(m.ChannelID, &discordgo.MessageSend{
+				Content:   response,
-			Content:   response,
+				Reference: m.Reference(),
-			Reference: m.Reference(),
+				AllowedMentions: &discordgo.MessageAllowedMentions{
-			AllowedMentions: &discordgo.MessageAllowedMentions{
+					RepliedUser: false,
-				RepliedUser: false,
+				},
-			},
+			})
-		})
+			if err != nil {
-		if err != nil {
+				log.Printf("Error sending message: %v", err)
-			log.Printf("Error sending message: %v", err)
+			}
 		}
 	})
 }

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)
 }

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: ""