LevelUp - Add presence and application bonus features for message and voice XP

Author: vertyco

levelup/commands/admin.py

@@ -955,7 +955,7 @@ async def msg_chan_bonus(
 
         This bonus applies to message xp
 
-        Set both min and max to 0 to remove the role bonus
+        Set both min and max to 0 to remove the channel bonus
         """
         if min_xp > max_xp:
             return await ctx.send(_("Min XP value cannot be greater than Max XP value"))
@@ -1016,9 +1016,9 @@ async def msg_role_bonus(
 
         Set both min and max to 0 to remove the role bonus
         """
-        conf = self.db.get_conf(ctx.guild)
         if min_xp > max_xp:
             return await ctx.send(_("Min XP value cannot be greater than Max XP value"))
+        conf = self.db.get_conf(ctx.guild)
         if role.id in conf.rolebonus.msg:
             if min_xp == 0 and max_xp == 0:
                 del conf.rolebonus.msg[role.id]
@@ -1027,6 +1027,9 @@ async def msg_role_bonus(
             conf.rolebonus.msg[role.id] = [min_xp, max_xp]
             self.save()
             return await ctx.send(_("Role bonus has been updated"))
+
+        if min_xp == 0 and max_xp == 0:
+            return await ctx.send(_("XP range cannot be 0"))
         conf.rolebonus.msg[role.id] = [min_xp, max_xp]
         self.save()
         await ctx.send(_("Role bonus has been set"))
@@ -1212,9 +1215,9 @@ async def voice_role_bonus(
 
         Set both min and max to 0 to remove the role bonus
         """
-        conf = self.db.get_conf(ctx.guild)
         if min_xp > max_xp:
             return await ctx.send(_("Min XP value cannot be greater than Max XP value"))
+        conf = self.db.get_conf(ctx.guild)
         if role.id in conf.rolebonus.voice:
             if min_xp == 0 and max_xp == 0:
                 del conf.rolebonus.voice[role.id]
@@ -1223,6 +1226,7 @@ async def voice_role_bonus(
             conf.rolebonus.voice[role.id] = [min_xp, max_xp]
             self.save()
             return await ctx.send(_("Role bonus has been updated"))
+
         if min_xp == 0 and max_xp == 0:
             return await ctx.send(_("XP range cannot be 0"))
         conf.rolebonus.voice[role.id] = [min_xp, max_xp]
@@ -1407,19 +1411,61 @@ async def voice_app_bonus(
 
         application_name = application_name.upper()  # Normalize application name
 
-        if application_name in conf.appbonus:
+        if application_name in conf.appbonus.voice:
+            if min_xp == 0 and max_xp == 0:
+                del conf.appbonus.voice[application_name]
+                self.save()
+                return await ctx.send(_("Application bonus for {} has been removed").format(application_name))
+            conf.appbonus.voice[application_name] = [min_xp, max_xp]
+            self.save()
+            return await ctx.send(_("Application bonus for {} has been updated").format(application_name))
+
+        if min_xp == 0 and max_xp == 0:
+            return await ctx.send(_("XP range cannot be 0"))
+
+        conf.appbonus.voice[application_name] = [min_xp, max_xp]
+        self.save()
+        await ctx.send(_("Application bonus for {} has been set").format(application_name))
+
+    @message_group.command(name="appbonus")
+    async def msg_app_bonus(
+        self,
+        ctx: commands.Context,
+        application_name: str,
+        min_xp: commands.positive_int,
+        max_xp: commands.positive_int,
+    ):
+        """
+        Add a range of bonus XP to users running a specific application/game
+
+        This bonus applies to message xp
+
+        Set both min and max to 0 to remove the application bonus
+
+        **Examples:**
+        • `[p]levelset messages appbonus VALORANT 5 10` - Users playing VALORANT get 5-10 bonus XP per message
+        • `[p]levelset messages appbonus "Visual Studio Code" 2 4` - Use quotes for names with spaces
+        • `[p]levelset messages appbonus VALORANT 0 0` - Remove the bonus for VALORANT
+        """
+        conf = self.db.get_conf(ctx.guild)
+        if min_xp > max_xp:
+            return await ctx.send(_("Min XP value cannot be greater than Max XP value"))
+
+        application_name = application_name.upper()  # Normalize application name
+
+        if application_name in conf.appbonus.msg:
             if min_xp == 0 and max_xp == 0:
-                del conf.appbonus[application_name]
+                del conf.appbonus.msg[application_name]
                 self.save()
                 return await ctx.send(_("Application bonus for {} has been removed").format(application_name))
-            conf.appbonus[application_name] = [min_xp, max_xp]
+            conf.appbonus.msg[application_name] = [min_xp, max_xp]
             self.save()
             return await ctx.send(_("Application bonus for {} has been updated").format(application_name))
 
         if min_xp == 0 and max_xp == 0:
             return await ctx.send(_("XP range cannot be 0"))
 
-        conf.appbonus[application_name] = [min_xp, max_xp]
+        conf.appbonus.msg[application_name] = [min_xp, max_xp]
         self.save()
         await ctx.send(_("Application bonus for {} has been set").format(application_name))
 
@@ -1460,3 +1506,115 @@ async def set_default_background(self, ctx: commands.Context, *, background: str
                         "Warning: I couldn't find a background with that name. Make sure it exists in the backgrounds folder."
                     )
                 )
+
+    @levelset.group(name="presencebonus", aliases=["statusbonus"])
+    async def presence_bonus_group(self, ctx: commands.Context):
+        """Presence status bonus settings"""
+        pass
+
+    @presence_bonus_group.command(name="message", aliases=["msg"])
+    async def presence_msg_bonus(
+        self,
+        ctx: commands.Context,
+        status: t.Literal["online", "idle", "dnd", "offline"],
+        min_xp: commands.positive_int,
+        max_xp: commands.positive_int,
+    ):
+        """
+        Add a range of bonus XP to users with a specific presence status
+
+        This bonus applies to message XP
+
+        Set both min and max to 0 to remove the status bonus
+
+        **Examples:**
+        • `[p]levelset presencebonus message online 2 5` - Users with online status get 2-5 bonus XP per message
+        • `[p]levelset presencebonus message idle 1 3` - Users with idle status get 1-3 bonus XP per message
+        • `[p]levelset presencebonus message dnd 0 0` - Remove the bonus for dnd status
+        """
+        conf = self.db.get_conf(ctx.guild)
+        if min_xp > max_xp:
+            return await ctx.send(_("Min XP value cannot be greater than Max XP value"))
+
+        if status in conf.presencebonus.msg:
+            if min_xp == 0 and max_xp == 0:
+                del conf.presencebonus.msg[status]
+                self.save()
+                return await ctx.send(_("Presence bonus for {} status has been removed for messages").format(status))
+            conf.presencebonus.msg[status] = [min_xp, max_xp]
+            self.save()
+            return await ctx.send(_("Presence bonus for {} status has been updated for messages").format(status))
+
+        if min_xp == 0 and max_xp == 0:
+            return await ctx.send(_("XP range cannot be 0"))
+
+        conf.presencebonus.msg[status] = [min_xp, max_xp]
+        self.save()
+        await ctx.send(_("Presence bonus for {} status has been set for messages").format(status))
+
+    @presence_bonus_group.command(name="voice")
+    async def presence_voice_bonus(
+        self,
+        ctx: commands.Context,
+        status: t.Literal["online", "idle", "dnd", "offline"],
+        min_xp: commands.positive_int,
+        max_xp: commands.positive_int,
+    ):
+        """
+        Add a range of bonus XP to users with a specific presence status
+
+        This bonus applies to voice time XP
+
+        Set both min and max to 0 to remove the status bonus
+
+        **Examples:**
+        • `[p]levelset presencebonus voice online 2 5` - Users with online status get 2-5 bonus XP per minute in voice
+        • `[p]levelset presencebonus voice idle 1 3` - Users with idle status get 1-3 bonus XP per minute in voice
+        • `[p]levelset presencebonus voice dnd 0 0` - Remove the bonus for dnd status
+        """
+        conf = self.db.get_conf(ctx.guild)
+        if min_xp > max_xp:
+            return await ctx.send(_("Min XP value cannot be greater than Max XP value"))
+
+        if status in conf.presencebonus.voice:
+            if min_xp == 0 and max_xp == 0:
+                del conf.presencebonus.voice[status]
+                self.save()
+                return await ctx.send(_("Presence bonus for {} status has been removed for voice").format(status))
+            conf.presencebonus.voice[status] = [min_xp, max_xp]
+            self.save()
+            return await ctx.send(_("Presence bonus for {} status has been updated for voice").format(status))
+
+        if min_xp == 0 and max_xp == 0:
+            return await ctx.send(_("XP range cannot be 0"))
+
+        conf.presencebonus.voice[status] = [min_xp, max_xp]
+        self.save()
+        await ctx.send(_("Presence bonus for {} status has been set for voice").format(status))
+
+    @presence_bonus_group.command(name="view")
+    async def view_presence_bonuses(self, ctx: commands.Context):
+        """View all presence status bonuses"""
+        conf = self.db.get_conf(ctx.guild)
+
+        if not conf.presencebonus.msg and not conf.presencebonus.voice:
+            return await ctx.send(_("No presence bonuses have been set."))
+
+        embed = discord.Embed(
+            title=_("Presence Status Bonuses"),
+            color=await self.bot.get_embed_color(ctx),
+        )
+
+        if conf.presencebonus.msg:
+            msg_bonuses = "\n".join(
+                _("• {}: `{}`").format(status, xp_range) for status, xp_range in conf.presencebonus.msg.items()
+            )
+            embed.add_field(name=_("Message XP Bonuses"), value=msg_bonuses, inline=False)
+
+        if conf.presencebonus.voice:
+            voice_bonuses = "\n".join(
+                _("• {}: `{}`").format(status, xp_range) for status, xp_range in conf.presencebonus.voice.items()
+            )
+            embed.add_field(name=_("Voice XP Bonuses"), value=voice_bonuses, inline=False)
+
+        await ctx.send(embed=embed)

levelup/common/models.py

@@ -219,6 +219,16 @@ class ChannelBonus(Base):
     voice: t.Dict[int, t.List[int]] = {}  # Channel_ID: [Min, Max]
 
 
+class PresenceBonus(Base):
+    msg: t.Dict[str, t.List[int]] = {}  # online: [Min, Max], dnd: [Min, Max], idle: [Min, Max], ect...
+    voice: t.Dict[str, t.List[int]] = {}  # online: [Min, Max], dnd: [Min, Max], idle: [Min, Max], ect...
+
+
+class AppBonus(Base):
+    msg: t.Dict[str, t.List[int]] = {}  # Application_Name: [Min, Max]
+    voice: t.Dict[str, t.List[int]] = {}  # Application_Name: [Min, Max]
+
+
 class Algorithm(Base):
     base: int = 100  # Base denominator for level algorithm, higher takes longer to level
     exp: float = 2.0  # Exponent for level algorithm, higher is a more exponential/steeper curve
@@ -291,9 +301,10 @@ class GuildSettings(Base):
 
     # Bonuses
     streambonus: t.List[int] = []  # Bonus voice XP for streaming in voice Example: [2, 5]
-    appbonus: t.Dict[str, t.List[int]] = {}  # Application_Name: [Min, Max] - Bonus for using specific applications
+    appbonus: AppBonus = AppBonus()  # Application bonuses for voice and messages
     rolebonus: RoleBonus = RoleBonus()
     channelbonus: ChannelBonus = ChannelBonus()
+    presencebonus: PresenceBonus = PresenceBonus()  # Bonus for presence status (online, dnd, idle, offline)
 
     # Allowed
     allowedchannels: t.List[int] = []  # Only channels that gain XP if not empty
@@ -419,9 +430,6 @@ def run_migrations(settings: t.Dict[str, t.Any]) -> DB:
             "base": conf.get("base", 100),
             "exp": conf.get("exp", 2.0),
         }
-
-        migrated += 1
-
     log.warning(f"Migrated {migrated} guilds to new schema")
     db: DB = DB.load(data)
     return db

levelup/listeners/messages.py

@@ -134,6 +134,23 @@ async def on_message(self, message: discord.Message):
         for role_id, (bonus_min, bonus_max) in conf.rolebonus.msg.items():
             if role_id in role_ids:
                 xp_to_add += random.randint(bonus_min, bonus_max)
+
+        # Add presence bonus if applicable
+        presence_status = str(message.author.status).lower()  # 'online', 'idle', 'dnd', 'offline'
+        if presence_status in conf.presencebonus.msg:
+            bonus_min, bonus_max = conf.presencebonus.msg[presence_status]
+            xp_to_add += random.randint(bonus_min, bonus_max)
+            log.debug(f"Adding {presence_status} presence bonus to {message.author.name} in {message.guild.name}")
+
+        # Add application bonus if the user is using a specific application
+        if hasattr(message.author, "activity") and message.author.activity:
+            activity_name = getattr(message.author.activity, "name", "").upper()
+            if activity_name and activity_name in conf.appbonus.msg:
+                app_bonus_min, app_bonus_max = conf.appbonus.msg[activity_name]
+                app_bonus = random.randint(app_bonus_min, app_bonus_max)
+                xp_to_add += app_bonus
+                log.debug(f"Adding {app_bonus} application bonus XP to {message.author.name} for using {activity_name}")
+
         # Add the xp to the role groups
         for role_id in role_ids:
             if role_id in conf.role_groups:

levelup/listeners/voice.py

@@ -195,14 +195,24 @@ async def _on_voice_state_update(
         # Add application bonus if the user was using a specific application
         if hasattr(member, "activity") and member.activity:
             activity_name = getattr(member.activity, "name", "").upper()
-            if activity_name and activity_name in conf.appbonus:
-                app_bonus_min, app_bonus_max = conf.appbonus[activity_name]
+            if activity_name and activity_name in conf.appbonus.voice:
+                app_bonus_min, app_bonus_max = conf.appbonus.voice[activity_name]
                 app_bonus = random.randint(app_bonus_min, app_bonus_max) * (effective_time / 60)
                 xp_to_add += app_bonus
                 log.debug(
                     f"Adding {round(app_bonus, 2)} application bonus XP to {member.name} for using {activity_name}"
                 )
 
+        # Add presence bonus if applicable
+        presence_status = str(member.status).lower()  # 'online', 'idle', 'dnd', 'offline'
+        if presence_status in conf.presencebonus.voice:
+            bonus_min, bonus_max = conf.presencebonus.voice[presence_status]
+            presence_bonus = random.randint(bonus_min, bonus_max) * (effective_time / 60)
+            xp_to_add += presence_bonus
+            log.debug(
+                f"Adding {round(presence_bonus, 2)} presence bonus XP to {member.name} for {presence_status} status"
+            )
+
         # Add the exp to the user
         if xp_to_add:
             log.debug(f"Adding {round(xp_to_add, 2)} Voice XP to {member.name} in {member.guild}")

levelup/main.py

@@ -77,7 +77,7 @@ class LevelUp(
     """
 
     __author__ = "[vertyco](https://github.com/vertyco/vrt-cogs)"
-    __version__ = "4.5.0"
+    __version__ = "4.6.0"
     __contributors__ = [
         "[aikaterna](https://github.com/aikaterna/aikaterna-cogs)",
         "[AAA3A](https://github.com/AAA3A-AAA3A/AAA3A-cogs)",