Added components, and moved command names to common.hpp

languages/locale_en.hpp

@@ -1,19 +1,24 @@
 // Bot info
 #define BOT_NAME "The Bartender Bot"
-#define BOT_VERSION "v0.3-1"
-
+#define BOT_VERSION "v0.4"
 #define CURRENCY_NAME "Night Coin"
 
 // Buttons
 #define BUTTON_ACCEPT "Confirm"
 #define BUTTON_CANCEL "Cancel"
 
+// Misc
+#define REQUEST_CANCELLED "Your request has been cancelled. " RESPONSE_NO_CHARGE
+#define RESPONSE_NO_CHARGE "You were not charged for this request."
+
+///
+/// COMMANDS
+///
+
 // Command ping
-#define COMMAND_PING "ping"
 #define COMMAND_PING_DESCRIPTION "Ping-pong test"
 
 // Command generate_report
-#define COMMAND_GENERATE_REPORT "generate_report"
 #define COMMAND_GENERATE_REPORT_DESCRIPTION "Generate a fake news report"
 #define COMMAND_GENERATE_REPORT_ARGS_IMAGE_DESCRIPTION                         \
   "Upload a background image to use (Only supports PNG, JPEG, and WEBP files)"
@@ -21,16 +26,19 @@
   "What is the headline?"
 #define COMMAND_GENERATE_REPORT_FAIL_NOT_SUPPORTED(filetype)                   \
   "File type: " + filetype +                                                   \
-      " is not allowed. Only PNG, JPEG, and WEBP are allowed!"
+      " is not supported. Only PNG, JPEG, and WEBP are allowed!"
+#define COMMAND_GENERATE_REPORT_FAIL_IMAGE_DOWNLOAD                            \
+  "Failed to download the background image! Aborting." RESPONSE_NO_CHARGE
 #define COMMAND_GENERATE_REPORT_FAIL_IMAGE_LOAD                                \
-  "Failed to load the background image! Aborting. You were not changed for "   \
-  "this."
-#define COMMAND_GENERATE_REPORT_CONFIRMATION_QUESTION(price)                   \
+  "Failed to load the background image! Aborting." RESPONSE_NO_CHARGE
+#define COMMAND_GENERATE_REPORT_CONFIRMATION_QUESTION(price, imageURL,         \
+                                                      headline)                \
   "This image generation will cost you " + price +                             \
-      " " CURRENCY_NAME "(s).\nAre you sure you want to continue?"
+      " " CURRENCY_NAME                                                        \
+      "(s).\nAre you sure you want to continue?\nHeadline: " +                 \
+      headline + " [image](" + imageURL + ")"
 
 // Command get_pfp
-#define COMMAND_GET_PFP "get_pfp"
 #define COMMAND_GET_PFP_DESCRIPTION                                            \
   "Get someone elses profile picture as an image"
 #define COMMAND_GET_PFP_ARGS_USER                                              \
@@ -48,7 +56,6 @@
       ") and their [server profile picture](" + guildpfp + ")"
 
 // Command about
-#define COMMAND_ABOUT "about"
 #define COMMAND_ABOUT_DESCRIPTION "Info about the bot"
 #define COMMAND_ABOUT_RESPONSE                                                 \
   "## " BOT_NAME " " BOT_VERSION                                               \
@@ -57,8 +64,6 @@
   "[D++](<https://dpp.dev/>) and tears."
 
 // Command balance/bal
-#define COMMAND_BALANCE "balance"
-#define COMMAND_BALANCE_SHORT "bal"
 #define COMMAND_BALANCE_DESCRIPTION "See someone's balance of " CURRENCY_NAME
 #define COMMAND_BALANCE_USER_DESCRIPTION                                       \
   "Leave this blank if you want to see your own balance"
@@ -68,7 +73,6 @@
   "<@!" + person + "> currently has " + balance + " " CURRENCY_NAME "(s)"
 
 // Command pay
-#define COMMAND_PAY "pay"
 #define COMMAND_PAY_DESCRIPTION "Send someone some amount of " CURRENCY_NAME "s"
 #define COMMAND_PAY_ARGS_USER_DESCRIPTION "Who do you want to pay"
 #define COMMAND_PAY_ARGS_AMOUNT_DESCRIPTION "How much do you want to pay"
@@ -79,7 +83,6 @@
   "Successfully sent <@!" + recipient + "> " + amount + " " CURRENCY_NAME "(s)!"
 
 // Command print_money
-#define COMMAND_PRINT_MONEY "print_money"
 #define COMMAND_PRINT_DESCRIPTION "Allows the admin to print money on-demand"
 #define COMMAND_PRINT_ARGS_AMOUNT_DESCRIPTION "How much are we printing boss?"
 #define COMMAND_PRINT_FAIL_NO_PRIVILIEGE(recipient)                            \
@@ -89,7 +92,6 @@
       recipient + "> !"
 
 // Command burn_money
-#define COMMAND_BURN_MONEY "burn_money"
 #define COMMAND_BURN_DESCRIPTION                                               \
   "Allows the admin to burn money, burn baby burn!"
 #define COMMAND_BURN_ARGS_AMOUNT_DESCRIPTION "How much are we burning?"
@@ -102,7 +104,6 @@
       recipient + "> !"
 
 // Command money_leaderboard
-#define COMMAND_MONEY_LEADERBOARD "money_leaderboard"
 #define COMMAND_MONEY_LEADERBOARD_DESCRIPTION                                  \
   "See who are the wealthiest members of the server, and who are... less "     \
   "fortunate."