Merge pull request #821 from allthingslinux/self_timeout

fix(afk): misc fixes for self-timeout

Author: electron271

tux/cogs/moderation/clearafk.py

@@ -47,9 +47,12 @@ async def clear_afk(
 
         await self.db.remove_afk(member.id)
 
-        if entry and entry.nickname:
-            with contextlib.suppress(discord.Forbidden):
-                await member.edit(nick=entry.nickname)  # Reset nickname to original
+        if entry:
+            if entry.nickname:
+                with contextlib.suppress(discord.Forbidden):
+                    await member.edit(nick=entry.nickname)  # Reset nickname to original
+            if entry.enforced:  # untimeout the user if  the afk status is a self-timeout
+                await member.timeout(None, reason="removing self-timeout")
 
         return await ctx.send(f"AFK status for {member.mention} has been cleared.", ephemeral=True)
 

tux/cogs/utility/afk.py

@@ -152,6 +152,11 @@ async def check_afk(self, message: discord.Message) -> None:
         if message.author.bot:
             return
 
+        # Check if the message is a self-timeout command.
+        # if it is, the member is probably trying to upgrade to a self-timeout, so AFK status should not be removed.
+        if message.content.startswith("$sto"):
+            return
+
         afks_mentioned: list[tuple[discord.Member, AFKModel]] = []
 
         for mentioned in message.mentions:

tux/cogs/utility/self_timeout.py

@@ -46,6 +46,10 @@ async def self_timeout(self, ctx: commands.Context[Tux], duration: str, *, reaso
         duration_seconds: int = convert_to_seconds(duration)
         duration_readable = seconds_to_human_readable(duration_seconds)
 
+        if duration_seconds == 0:
+            await ctx.reply("Error! Invalid time format", ephemeral=True)
+            return
+
         if duration_seconds > 604800:
             await ctx.reply("Error! duration cannot be longer than 7 days!", ephemeral=True)
             return