Merge branch 'main' into main

Author: brandons209

levelup/commands/admin.py

@@ -333,11 +333,12 @@ def add_field(embed: discord.Embed, name: str, value: str):
                 value=_("Bonus for streaming: {}").format(f"`{conf.streambonus}`"),
                 inline=False,
             )
-        if conf.appbonus:
+
+        if conf.appbonus.voice:
             joined = "\n".join(
-                _("• {}: `{}`").format(app_name, xp_range) for app_name, xp_range in conf.appbonus.items()
+                _("• {}: `{}`").format(app_name, xp_range) for app_name, xp_range in conf.appbonus.voice.items()
             )
-            add_field(embed, _("Application XP Bonus"), joined)
+            add_field(embed, _("Voice Application XP Bonus"), joined)
         if conf.rolebonus.msg:
             joined = "\n".join(
                 _("• {}: `{}`").format(f"<@&{role_id}>", xp_range) for role_id, xp_range in conf.rolebonus.msg.items()
@@ -349,6 +350,11 @@ def add_field(embed: discord.Embed, name: str, value: str):
                 for channel_id, xp_range in conf.channelbonus.msg.items()
             )
             add_field(embed, _("Message XP Bonus Channels"), joined)
+        if conf.appbonus.msg:
+            joined = "\n".join(
+                _("• {}: `{}`").format(app_name, xp_range) for app_name, xp_range in conf.appbonus.msg.items()
+            )
+            add_field(embed, _("Message Application XP Bonus"), joined)
         if conf.allowedroles:
             joined = ", ".join([f"<@&{role_id}>" for role_id in conf.allowedroles if ctx.guild.get_role(role_id)])
             add_field(embed, _("Allowed Roles"), joined)

xtools/formatter.py

@@ -75,6 +75,7 @@ def profile(data):
         None,
         None,
         None,
+        None,
     )
     user = data["profile_users"][0]
     xuid = user["id"]

xtools/xtools.py

@@ -45,7 +45,7 @@ class XTools(commands.Cog):
     """
 
     __author__ = "[vertyco](https://github.com/vertyco/vrt-cogs)"
-    __version__ = "3.11.7"
+    __version__ = "3.11.8"
 
     def format_help_for_context(self, ctx: commands.Context):
         helpcmd = super().format_help_for_context(ctx)