Not all invites have a channel or known creator

Author: benthetechguy

src/command_modules/moderation.cpp

@@ -169,11 +169,15 @@ dpp::task<> moderation::inviteinfo(const dpp::slashcommand_t &event) {
                                    .set_title("Invite to " + invite.destination_guild.name)
                                    .add_field("Members total", std::to_string(invite.approximate_member_count), true)
                                    .add_field("Members online", std::to_string(invite.approximate_presence_count), true)
-                                   .add_field("Invite creator", invite.inviter.username, false)
-                                   .add_field("Server ID", invite.guild_id.str(), true)
-                                   .add_field("Channel name", invite.destination_channel.name, true)
-                                   .add_field("Invite uses", std::to_string(invite.uses), false)
+                                   .add_field("Server ID", invite.guild_id.str(), false)
+                                   .add_field("Invite uses", std::to_string(invite.uses), true)
                                    .set_timestamp(invite.created_at);
+    if (invite.channel_id != 0) {
+        embed.add_field("Channel name", invite.destination_channel.name, true);
+    }
+    if (invite.inviter_id != 0) {
+        embed.add_field("Invite creator", invite.inviter.username, false);
+    }
     if (invite.expires_at == 0) {
         embed.add_field("Expires", "Never", false);
     } else {

src/listeners/guild.cpp

@@ -17,13 +17,19 @@
 
 void guild::on_invite_created(const dpp::invite_create_t &event, const nlohmann::json& config, std::vector<dpp::invite>& invites) {
     invites.push_back(event.created_invite);
+    // Don't log invites without a known creator
+    if (event.created_invite.inviter_id == 0) {
+        return;
+    }
 
     dpp::embed embed = dpp::embed().set_color(util::color::GREEN).set_thumbnail(event.created_invite.inviter.get_avatar_url())
                                    .set_title("Invite Created")
                                    .add_field("Invite Creator", event.created_invite.inviter.username, true)
                                    .add_field("User ID", event.created_invite.inviter.id.str(), true)
-                                   .add_field("Invite Code", event.created_invite.code, false)
-                                   .add_field("Invite Channel", event.created_invite.destination_channel.get_mention(), true);
+                                   .add_field("Invite Code", event.created_invite.code, false);
+    if (event.created_invite.channel_id != 0) {
+        embed.add_field("Invite Channel", event.created_invite.destination_channel.get_mention(), true);
+    }
     if (event.created_invite.expires_at == 0) {
         embed.add_field("Expires", "Never", true);
     } else {
@@ -33,7 +39,6 @@ void guild::on_invite_created(const dpp::invite_create_t &event, const nlohmann:
 }
 
 void guild::on_invite_deleted(const dpp::invite_delete_t &event, const nlohmann::json& config, std::vector<dpp::invite>& invites) {
-
     dpp::embed embed = dpp::embed().set_color(util::color::RED).set_title("Invite Deleted");
     // Find invite in cache
     auto invite = invites.begin();
@@ -45,10 +50,15 @@ void guild::on_invite_deleted(const dpp::invite_delete_t &event, const nlohmann:
         embed.add_field("Invite Creator", invite->inviter.username, true)
              .add_field("User ID", invite->inviter.id.str(), true)
              .add_field("Invite Code", invite->code, false)
-             .add_field("Invite Channel", invite->destination_channel.get_mention(), true)
              .add_field("Uses", std::to_string(invite->uses), true);
+        if (invite->channel_id != 0) {
+            embed.add_field("Invite Channel", invite->destination_channel.get_mention(), true);
+        }
         // Delete invite from cache
         invites.erase(invite);
     }
-    event.owner->message_create(dpp::message(config["log_channel_ids"]["invites"], embed));
+    // Don't log invites without a known creator
+    if (!embed.fields[0].value.empty()) {
+        event.owner->message_create(dpp::message(config["log_channel_ids"]["invites"], embed));
+    }
 }

src/listeners/messages.cpp

@@ -82,6 +82,7 @@ void messages::on_message(const dpp::message_create_t& event, const nlohmann::js
     }
 }
 
+// TODO: cache images sent in deleted messages
 dpp::task<> messages::on_message_deleted(const dpp::message_delete_t& event, const nlohmann::json& config) {
     dpp::confirmation_callback_t msg_conf = co_await util::get_message_cached(event.owner, event.id, event.channel_id);
     dpp::embed embed = dpp::embed().set_color(util::color::RED).set_title("Message Deleted")
@@ -178,7 +179,7 @@ dpp::task<> messages::on_reaction(const dpp::message_reaction_add_t& event, cons
         std::string title = std::string("Ticket for ") + event.reacting_user.username;
         dpp::snowflake channel_id = config["log_channel_ids"]["tickets"];
         dpp::confirmation_callback_t confirmation = co_await event.owner->co_thread_create
-        (title, channel_id, 10080, dpp::CHANNEL_PRIVATE_THREAD, false, 0);
+        (title, channel_id, config["ticket_auto_archive_mins"], dpp::CHANNEL_PRIVATE_THREAD, false, 0);
         if (confirmation.is_error()) {
             event.owner->direct_message_create(event.reacting_user.id, dpp::message("Failed to create ticket channel."));
         }