Added components, and moved command names to common.hpp

languages/locale_en.hpp

@@ -1,22 +1,44 @@
 // 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"
 
-#define COMMAND_GENERATE_REPORT "generate_report"
+// Command 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)"
 #define COMMAND_GENERATE_REPORT_ARGS_HEADLINE_DESCRIPTION                      \
   "What is the headline?"
+#define COMMAND_GENERATE_REPORT_FAIL_NOT_SUPPORTED(filetype)                   \
+  "File type: " + filetype +                                                   \
+      " 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." 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?\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                                              \
@@ -34,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                                               \
@@ -43,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"
@@ -54,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"
@@ -65,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)                            \
@@ -75,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?"
@@ -88,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."

src/Base/Entry.cpp

@@ -3,6 +3,7 @@
 #include "../Databases.hpp"
 
 #include <cstdlib>
+#include <dpp/appcommand.h>
 #include <dpp/cluster.h>
 #include <dpp/dispatcher.h>
 #include <dpp/dpp.h>
@@ -32,6 +33,16 @@ int main(int argc, char **argv) {
     event.reply("Could not find that command :(");
   });
 
+  bot.on_button_click([&bot](const dpp::button_click_t &event) {
+    event.reply(dpp::ir_deferred_update_message, "processing");
+
+    auto component = Components.find(event.custom_id);
+    if (component != Components.end()) {
+      component->second(event, bot);
+      return;
+    }
+  });
+
   bot.on_ready([&bot](const dpp::ready_t &event) {
     if (dpp::run_once<struct register_bot_commands>()) {
       createCommands(event, bot);

src/CommandManagement.cpp

@@ -6,6 +6,8 @@
 
 extern std::unordered_map<std::string, std::function<void(COMMAND_ARGS)>>
     Commands;
+extern std::unordered_map<std::string, std::function<void(COMPONENT_ARGS)>>
+    Components;
 
 void deleteCommands(const dpp::ready_t &event, dpp::cluster &bot) {
   // bot.guild_bulk_command_delete(GUILD);

src/Commands.cpp

@@ -3,6 +3,9 @@
 #include "Commands/MoneyCommands.cpp"
 #include "Commands/OtherCommands.cpp"
 
+// Component Responses
+#include "Commands/Components/GenerativeComponents.cpp"
+
 // Registry
 std::unordered_map<std::string, std::function<void(COMMAND_ARGS)>> Commands{
     {COMMAND_PING, commandPing},
@@ -15,3 +18,6 @@ std::unordered_map<std::string, std::function<void(COMMAND_ARGS)>> Commands{
     {COMMAND_MONEY_LEADERBOARD, commandMoneyLeaderboard},
     {COMMAND_GET_PFP, commandGetPFP},
     {COMMAND_GENERATE_REPORT, commandGenerateReport}};
+
+std::unordered_map<std::string, std::function<void(COMPONENT_ARGS)>> Components{
+    {COMPONENT_COMMAND_CANCEL, componentCancel}};

src/Commands/Components/GenerativeComponents.cpp

@@ -0,0 +1,6 @@
+#include "../../Common.hpp"
+#include "../../Utility/CairoTools.hpp"
+#include <dpp/cluster.h>
+#include <dpp/dispatcher.h>
+
+void componentCancel(COMPONENT_ARGS) { event.edit_response(REQUEST_CANCELLED); }

src/Commands/GenerativeCommands.cpp

@@ -1,20 +1,12 @@
 #include "../Common.hpp"
 #include "../Utility/CairoTools.hpp"
 
-#include <algorithm>
-#include <cctype>
 #include <dpp/dispatcher.h>
 #include <dpp/dpp.h>
 #include <dpp/guild.h>
-#include <dpp/message.h>
-#include <dpp/misc-enum.h>
-#include <dpp/queues.h>
 #include <dpp/snowflake.h>
-#include <dpp/user.h>
 
-#include <functional>
 #include <string>
-#include <unordered_map>
 
 void commandGenerateReport(const dpp::slashcommand_t &event,
                            dpp::cluster &bot) {
@@ -23,37 +15,35 @@ void commandGenerateReport(const dpp::slashcommand_t &event,
       std::get<dpp::snowflake>(event.get_parameter("image"));
   dpp::attachment file = event.command.get_resolved_attachment(fileId);
   auto fileType = supportedImageFileTypes.find(file.content_type);
+
   if (fileType != supportedImageFileTypes.end()) {
-    bot.request(
+    // Don't forget that its only funny if it is all in upper case
-        file.url, dpp::http_method::m_get,
+    std::string headline =
-        [event, &bot, fileType](const dpp::http_request_completion_t &result) {
+        std::get<std::string>(event.get_parameter("headline"));
-          auto imageAsSurface = fileType->second(result.body);
+    // Never seen this method before but looks awesome
-          if (imageAsSurface == nullptr) {
+    std::transform(headline.begin(), headline.end(), headline.data(),
-            event.edit_response("Failed to load the background image :(");
+                   ::toupper);
-            return;
-          }
 
-          // Don't forget that its only funny if it is all in upper case
+    dpp::message confirmRequest(
-          std::string headline =
+        event.command.channel_id,
-              std::get<std::string>(event.get_parameter("headline"));
+        COMMAND_GENERATE_REPORT_CONFIRMATION_QUESTION(
+            std::to_string(COMMAND_GENERATE_REPORT_COST), file.url, headline));
 
-          // Never seen this method before but looks awesome
+    confirmRequest.add_component(
-          std::transform(headline.begin(), headline.end(), headline.data(),
+        dpp::component()
-                         ::toupper);
+            .add_component(dpp::component()
-
+                               .set_label(BUTTON_ACCEPT)
-          std::string responseData =
+                               .set_type(dpp::cot_button)
-              GenerateReportImage(imageAsSurface, headline);
+                               .set_style(dpp::component_style::cos_success)
-          dpp::message response(event.command.channel_id, "");
+                               .set_id(COMPONENT_GENERATE_REPORT_CONFIRM))
-          response.add_file("report.png", responseData);
+            .add_component(dpp::component()
-          event.edit_response(response);
+                               .set_label(BUTTON_CANCEL)
-        });
+                               .set_type(dpp::cot_button)
+                               .set_style(dpp::component_style::cos_danger)
+                               .set_id(COMPONENT_COMMAND_CANCEL)));
+    event.edit_response(confirmRequest);
   } else {
     event.edit_response(
-        "File type: " + file.content_type +
+        COMMAND_GENERATE_REPORT_FAIL_NOT_SUPPORTED(file.content_type));
-        " is not allowed. Only PNG, JPEG, and WEBP are allowed!");
   }
 }
-
-//
-// ACTUAL GENERATION STARTS HERE
-//

src/Common.hpp

@@ -1,6 +1,23 @@
 #include "../settings.hpp"
 
 #define COMMAND_ARGS const dpp::slashcommand_t &event, dpp::cluster &bot
+#define COMPONENT_ARGS const dpp::button_click_t &event, dpp::cluster &bot
 
 // Costs of commands
 #define COMMAND_GENERATE_REPORT_COST 2
+
+// Command names
+#define COMMAND_PING "ping"
+#define COMMAND_GENERATE_REPORT "generate_report"
+#define COMMAND_GET_PFP "get_pfp"
+#define COMMAND_ABOUT "about"
+#define COMMAND_BALANCE "balance"
+#define COMMAND_BALANCE_SHORT "bal"
+#define COMMAND_PAY "pay"
+#define COMMAND_PRINT_MONEY "print_money"
+#define COMMAND_BURN_MONEY "burn_money"
+#define COMMAND_MONEY_LEADERBOARD "money_leaderboard"
+
+// Component names
+#define COMPONENT_GENERATE_REPORT_CONFIRM "generate_report_confirm"
+#define COMPONENT_COMMAND_CANCEL "cancel"

src/Utility/CairoGenerate.cpp

@@ -1,4 +1,5 @@
 #include "CairoTools.hpp"
+#include <cairo/cairo.h>
 #include <cctype>
 
 std::string GenerateReportImage(cairo_surface_t *background,
@@ -7,14 +8,13 @@ std::string GenerateReportImage(cairo_surface_t *background,
       CAIRO_FORMAT_ARGB32, REPORT_WIDTH, REPORT_HEIGHT);
 
   cairo_t *ctx = cairo_create(surface);
-  cairo_set_source_rgb(ctx, 0, 0, 0);
+  cairo_set_source_rgb(ctx, CAIRO_BLACK);
   cairo_paint(ctx);
-  int imgW = 0, imgH = 0;
 
   // Background Image
   cairo_save(ctx);
-  imgW = cairo_image_surface_get_width(background);
+  int imgW = cairo_image_surface_get_width(background),
-  imgH = cairo_image_surface_get_height(background);
+      imgH = cairo_image_surface_get_height(background);
 
   cairo_scale(ctx, (double)REPORT_WIDTH / imgW,
               (double)(REPORT_HEIGHT - REPORT_HEIGHT_OFFSET) / imgH);
@@ -25,15 +25,15 @@ std::string GenerateReportImage(cairo_surface_t *background,
   // Gradient
   cairo_pattern_t *gradient =
       cairo_pattern_create_linear(0, 0, 0, REPORT_HEIGHT);
-  cairo_pattern_add_color_stop_rgba(gradient, 0.85, 0, 0, 0, 1);
+  cairo_pattern_add_color_stop_rgba(gradient, 0.85, CAIRO_BLACK, 1.0);
-  cairo_pattern_add_color_stop_rgba(gradient, 0, 0, 0, 0, 0);
+  cairo_pattern_add_color_stop_rgba(gradient, 0.0, CAIRO_BLACK, 0.0);
   cairo_rectangle(ctx, 0, 0, REPORT_WIDTH, REPORT_HEIGHT);
   cairo_set_source(ctx, gradient);
   cairo_fill(ctx);
 
   // Bumper
   cairo_save(ctx);
-  cairo_surface_t *bumper =
+  static cairo_surface_t *bumper =
       cairo_image_surface_create_from_png(REPORT_RESOURCE_BUMPER_PATH);
 
   imgW = cairo_image_surface_get_width(bumper);
@@ -71,11 +71,15 @@ std::string GenerateReportImage(cairo_surface_t *background,
     cairo_move_to(ctx, REPORT_TEXT_START_X,
                   REPORT_HEIGHT -
                       (REPORT_TEXT_JUMP_Y * (outputList.size() - lineCount++)));
-    cairo_set_source_rgb(ctx, CAIRO_TEXT_WHITE);
+    cairo_set_source_rgb(ctx, CAIRO_QUARTZ);
     cairo_show_text(ctx, line.c_str());
   }
 
   std::string data;
   cairo_surface_write_to_png_stream(surface, cairoOutputAsPNGStream, &data);
+
+  // Ugh cleanup
+  cairo_surface_destroy(surface);
+  cairo_destroy(ctx);
   return data;
 }

src/Utility/CairoTools.hpp

@@ -10,7 +10,8 @@
 #define REPORT_TEXT_FONT_SIZE 120.0
 #define REPORT_TEXT_LENGTH 26
 #define REPORT_RESOURCE_BUMPER_PATH "./assets/report_bumper.png"
-#define CAIRO_TEXT_WHITE 0.87, 0.87, 0.87
+#define CAIRO_QUARTZ 0.87, 0.87, 0.87
+#define CAIRO_BLACK 0.0, 0.0, 0.0
 
 std::string GenerateReportImage(cairo_surface_t *background,
                                 std::string headline);