Merge branch 'PokemonAutomation:main' into main

Author: PhobosLegacy

Common/Cpp/Options/CheckboxDropdownDatabase.h

@@ -32,36 +32,36 @@ struct FlagEnumEntry{
 
 template <typename FlagEnum>
 class CheckboxDropdownDatabase{
-    using FlagEnumEntry = FlagEnumEntry<FlagEnum>;
+    using Entry = FlagEnumEntry<FlagEnum>;
 
 public:
     CheckboxDropdownDatabase() = default;
-    CheckboxDropdownDatabase(std::initializer_list<FlagEnumEntry> list){
+    CheckboxDropdownDatabase(std::initializer_list<Entry> list){
         for (auto iter = list.begin(); iter != list.end(); ++iter){
             add(iter->value, std::move(iter->slug), std::move(iter->display));
         }
     }
 
     //  Warning, these functions do not have strong exception safety!
     //  If these throw, this class will be in a bad state.
-    void add(FlagEnumEntry entry){
-        FlagEnumEntry& e = m_list.emplace_back(std::move(entry));
+    void add(Entry entry){
+        Entry& e = m_list.emplace_back(std::move(entry));
 
         auto ret = m_slug_to_enum.emplace(e.slug, &e);
         if (!ret.second){
             throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Duplicate Enum Slug: " + e.slug);
         }
     }
     void add(FlagEnum value, std::string slug, std::string display){
-        add(FlagEnumEntry{value, std::move(slug), std::move(display)});
+        add(Entry{value, std::move(slug), std::move(display)});
     }
 
 
 public:
     size_t size() const{
         return m_list.size();
     }
-    const FlagEnumEntry& operator[](size_t index) const{
+    const Entry& operator[](size_t index) const{
         return m_list[index];
     }
     const FlagEnum* find_slug(const std::string& slug) const{
@@ -82,8 +82,8 @@ class CheckboxDropdownDatabase{
 
 
 private:
-    std::vector<FlagEnumEntry> m_list;
-    std::map<std::string, const FlagEnumEntry*> m_slug_to_enum;
+    std::vector<Entry> m_list;
+    std::map<std::string, const Entry*> m_slug_to_enum;
 };
 
 

Common/Cpp/Options/CheckboxDropdownOption.h

@@ -46,30 +46,30 @@ class CheckboxDropdownBase : public ConfigOption{
 
 template <typename FlagEnum>
 class CheckboxDropdownCell : public CheckboxDropdownBase{
-    using CheckboxDropdownDatabase = CheckboxDropdownDatabase<FlagEnum>;
+    using Database = CheckboxDropdownDatabase<FlagEnum>;
 
 public:
     CheckboxDropdownCell(
         std::string label,
-        const CheckboxDropdownDatabase& database,
+        const Database& database,
         LockMode lock_while_running,
         FlagEnum default_value
     );
     CheckboxDropdownCell(
         std::string label,
-        const CheckboxDropdownDatabase& database,
+        const Database& database,
         LockMode lock_while_running,
         FlagEnum default_value, FlagEnum current_value
     );
     CheckboxDropdownCell(
         std::string label,
-        CheckboxDropdownDatabase&& database,
+        Database&& database,
         LockMode lock_while_running,
         FlagEnum default_value
     ) = delete;
     CheckboxDropdownCell(
         std::string label,
-        CheckboxDropdownDatabase&& database,
+        Database&& database,
         LockMode lock_while_running,
         FlagEnum default_value, FlagEnum current_value
     ) = delete;
@@ -105,7 +105,7 @@ class CheckboxDropdownCell : public CheckboxDropdownBase{
 
 
 private:
-    const CheckboxDropdownDatabase& m_database;
+    const Database& m_database;
     const FlagEnum m_default;
 
     mutable SpinLock m_lock;

Common/Cpp/Options/CheckboxDropdownOption.tpp

@@ -20,7 +20,7 @@ namespace PokemonAutomation{
 template <typename FlagEnum>
 CheckboxDropdownCell<FlagEnum>::CheckboxDropdownCell(
     std::string label,
-    const CheckboxDropdownDatabase& database,
+    const Database& database,
     LockMode lock_while_running,
     FlagEnum default_value
 )
@@ -32,7 +32,7 @@ CheckboxDropdownCell<FlagEnum>::CheckboxDropdownCell(
 template <typename FlagEnum>
 CheckboxDropdownCell<FlagEnum>::CheckboxDropdownCell(
     std::string label,
-    const CheckboxDropdownDatabase& database,
+    const Database& database,
     LockMode lock_while_running,
     FlagEnum default_value, FlagEnum current_value
 )

SerialPrograms/Source/Integrations/DppIntegration/DppCommandHandler.cpp

@@ -26,7 +26,11 @@ void Handler::initialize(cluster& bot, commandhandler& handler){
         log_dpp(log.message, "Internal Log", log.severity);
     });
 
+#if DPP_VERSION_LONG >= 0x00100100 // (dpp version 10.1.0)
+    // Do nothing, owner will be set below in on_ready callback
+#else
     owner = bot.current_application_get_sync().owner;
+#endif
     auto cmd_type = GlobalSettings::instance().DISCORD->integration.command_type.get();
     std::string prefix = GlobalSettings::instance().DISCORD->integration.command_prefix;
 
@@ -37,14 +41,34 @@ void Handler::initialize(cluster& bot, commandhandler& handler){
     }
 
     bot.on_ready([&bot, &handler, this](const ready_t&){
+#if DPP_VERSION_LONG >= 0x00100100 // (dpp version 10.1.0)
+        log_dpp("Logged in as: " + bot.me.format_username() + ".", "Ready", ll_info);
+        Handler::create_unified_commands(handler);
+        bot.current_application_get([&](const dpp::confirmation_callback_t& cc){
+            if (cc.is_error()){
+                log_dpp("Error getting application details: " + cc.get_error().message, "Current App", ll_error);
+                return;
+            }
+            dpp::application app = cc.get<dpp::application>();
+            log_dpp("Application Name: " + app.name, "Current App", ll_info);
+            log_dpp("Application ID: " + std::to_string(app.id), "Current App", ll_info);
+            owner = app.owner;
+        });
+#else
         log_dpp("Logged in as: " + bot.current_user_get_sync().format_username() + ".", "Ready", ll_info);
         Handler::create_unified_commands(handler);
+#endif
     });
 
     bot.on_guild_create([&bot, this](const guild_create_t& event){
         try{
+#if DPP_VERSION_LONG >= 0x00100100 // (dpp version 10.1.0)
+            std::string id = std::to_string(event.created.id);
+            log_dpp("Loaded guild: " + event.created.name + " (" + id + ").", "Guild Create", ll_info);
+#else
             std::string id = std::to_string(event.created->id);
             log_dpp("Loaded guild: " + event.created->name + " (" + id + ").", "Guild Create", ll_info);
+#endif
             std::lock_guard<std::mutex> lg(m_count_lock);
             Utility::get_user_counts(bot, event);
         }catch (std::exception& e){
@@ -53,19 +77,35 @@ void Handler::initialize(cluster& bot, commandhandler& handler){
     });
 
     bot.on_guild_member_add([this](const guild_member_add_t& event){
+#if DPP_VERSION_LONG >= 0x00100100 // (dpp version 10.1.0)
+        std::string id = std::to_string(event.adding_guild.id);
+        if (!user_counts.empty() && user_counts.count(id)){
+            log_dpp("New member joined " + event.adding_guild.name + ". Incrementing member count.", "Guild Member Add", ll_info);
+            user_counts.at(id)++;
+        }
+#else
         std::string id = std::to_string(event.adding_guild->id);
         if (!user_counts.empty() && user_counts.count(id)){
             log_dpp("New member joined " + event.adding_guild->name + ". Incrementing member count.", "Guild Member Add", ll_info);
             user_counts.at(id)++;
         }
+#endif
     });
 
     bot.on_guild_member_remove([this](const guild_member_remove_t& event){
+#if DPP_VERSION_LONG >= 0x00100100 // (dpp version 10.1.0)
+        std::string id = std::to_string(event.removing_guild.id);
+        if (!user_counts.empty() && user_counts.count(id)){
+            log_dpp("Member left " + event.removing_guild.name + ". Decrementing member count.", "Guild Member Remove", ll_info);
+            user_counts.at(id)--;
+        }
+#else
         std::string id = std::to_string(event.removing_guild->id);
         if (!user_counts.empty() && user_counts.count(id)){
             log_dpp("Member left " + event.removing_guild->name + ". Decrementing member count.", "Guild Member Remove", ll_info);
             user_counts.at(id)--;
         }
+#endif
     });
 
     bot.on_message_create([&handler](const message_create_t& event){

SerialPrograms/Source/Integrations/DppIntegration/DppUtility.cpp

@@ -32,6 +32,17 @@ void Utility::log(const std::string& message, const std::string& identity, const
 
 void Utility::get_user_counts(cluster& bot, const guild_create_t& event){
     // Retrieve ID and exit early if we have already pulled members for this guild.
+#if DPP_VERSION_LONG >= 0x00100100 // (dpp version 10.1.0)
+    auto id = std::to_string(event.created.id);
+    if (!user_counts.empty() && user_counts.count(id)){
+        log("Users for " + event.created.name + " already initialized.", "get_user_counts()", ll_info);
+        return;
+    }
+
+    uint32_t count = event.created.member_count;
+    user_counts.emplace(id, count);
+    log("User count: " + std::to_string(count) + " (" + event.created.name + ")", "get_user_counts()", ll_info);
+#else
     auto id = std::to_string(event.created->id);
     if (!user_counts.empty() && user_counts.count(id)){
         log("Users for " + event.created->name + " already initialized.", "get_user_counts()", ll_info);
@@ -41,6 +52,7 @@ void Utility::get_user_counts(cluster& bot, const guild_create_t& event){
     uint32_t count = event.created->member_count;
     user_counts.emplace(id, count);
     log("User count: " + std::to_string(count) + " (" + event.created->name + ")", "get_user_counts()", ll_info);
+#endif
 }
 
 uint16_t Utility::get_button(const uint16_t& bt){