Automod rule listener overhaul

Author: benthetechguy

src/command_modules/moderation.cpp

@@ -16,7 +16,6 @@
 #include "../util.h"
 #include <map>
 
-// TODO: Fix thread creation
 dpp::task<> moderation::create_ticket(const dpp::slashcommand_t &event, const nlohmann::json &config) {
     // Send "thinking" response to allow time for Discord API
     dpp::async thinking = event.co_thinking(true);

src/listeners/automod_rules.cpp

@@ -16,7 +16,8 @@
 #include <dpp/dpp.h>
 
 namespace automod_rules {
+    void add_rule_description_fields(dpp::embed& embed, const dpp::automod_rule& rule);
     dpp::task<> on_automod_rule_add(const dpp::automod_rule_create_t &event, const nlohmann::json& config);
-    dpp::task<> on_automod_rule_remove(const dpp::automod_rule_delete_t &event, const nlohmann::json& config);
-    dpp::task<> on_automod_rule_edit(const dpp::automod_rule_update_t &event, const nlohmann::json& config);
+    void on_automod_rule_remove(const dpp::automod_rule_delete_t &event, const nlohmann::json& config);
+    void on_automod_rule_edit(const dpp::automod_rule_update_t &event, const nlohmann::json& config);
 }

src/listeners/automod_rules.h

@@ -42,6 +42,7 @@ void messages::add_message_content_fields(dpp::embed& embed, const dpp::message&
     }
 }
 
+// TODO: Detect when the same message is posted in multiple support channels
 void messages::on_message(const dpp::message_create_t& event, const nlohmann::json& config) {
     util::MESSAGE_CACHE.push(event.msg);
     if (event.msg.author == event.owner->me) {

src/listeners/messages.cpp

@@ -267,6 +267,15 @@ int main(int argc, char* argv[]) {
     });
 
     // Listeners
+    bot.on_automod_rule_create([&config](const dpp::automod_rule_create_t &event) -> dpp::task<> {
+        co_await automod_rules::on_automod_rule_add(event, config);
+    });
+    bot.on_automod_rule_delete([&config](const dpp::automod_rule_delete_t &event) {
+        automod_rules::on_automod_rule_remove(event, config);
+    });
+    bot.on_automod_rule_update([&config](const dpp::automod_rule_update_t &event) {
+        automod_rules::on_automod_rule_edit(event, config);
+    });
     bot.on_message_create([&config](const dpp::message_create_t &event) {
         messages::on_message(event, config);
     });
@@ -282,15 +291,9 @@ int main(int argc, char* argv[]) {
     bot.on_message_reaction_remove([&config](const dpp::message_reaction_remove_t &event) -> dpp::task<> {
         co_await messages::on_reaction_removed(event, config);
     });
-    bot.on_automod_rule_create([&config](const dpp::automod_rule_create_t &event) -> dpp::task<> {
-        co_await automod_rules::on_automod_rule_add(event, config);
-    });
-    bot.on_automod_rule_delete([&config](const dpp::automod_rule_delete_t &event) -> dpp::task<> {
-        co_await automod_rules::on_automod_rule_remove(event, config);
-    });
 
     // TODO: Autodetect bump timer on bot restart?
-    bot.on_ready([&config, &commands, &db, &db_text_commands, &db_embed_commands](const dpp::ready_t &event) {
+    bot.on_ready([&config, &commands, &db, &db_text_commands, &db_embed_commands](const dpp::ready_t &event) -> dpp::task<> {
         if (dpp::run_once<struct register_bot_commands>()) {
             std::vector<dpp::slashcommand> global_commands;
             std::vector<dpp::slashcommand> tsc_commands;
@@ -461,6 +464,14 @@ int main(int argc, char* argv[]) {
             util::log("INFO", log_message);
             util::handle_mute(event.owner, db, config, mute);
         }
+
+        // Add all automod rules to cache
+        dpp::confirmation_callback_t rule_conf = co_await event.owner->co_automod_rules_get(config["guild_id"]);
+        if (!rule_conf.is_error()) {
+            for (const dpp::automod_rule& rule : std::get<dpp::automod_rule_map>(rule_conf.value) | std::views::values) {
+                util::AUTOMOD_RULE_CACHE.push(rule);
+            }
+        }
     });
 
     bot.start(dpp::st_wait);

src/main.cpp

@@ -166,6 +166,11 @@ namespace util {
      */
     inline cache<dpp::message, 1000> MESSAGE_CACHE;
 
+    /**
+     * Global cache of all automod rules (max 9 per guild)
+     */
+    inline cache<dpp::automod_rule, 9> AUTOMOD_RULE_CACHE;
+
     /**
      * Possible result types for a slash command search
      */