diff --git a/sizebot/cogs/help.py b/sizebot/cogs/help.py index 8e85548b..1d7cb28b 100644 --- a/sizebot/cogs/help.py +++ b/sizebot/cogs/help.py @@ -356,17 +356,13 @@ async def ping(self, ctx, subcommand: str = ""): await waitMsg.edit(content = response) @commands.command( - usage = [""], + usage = ["[type]"], category = "help", hidden = True ) @commands.cooldown(1, 5, commands.BucketType.user) async def pong(self, ctx, subcommand: str = ""): - """Pong! - - Check SizeBot's current latency. - - Check the bot's latency with `&ping`, or check the Discord API's latency with `&ping discord`.""" + """Ping!""" waitMsg = await ctx.send(emojis.loading) if subcommand.lower() in ["heartbeat", "discord"]: diff --git a/sizebot/lib/utils.py b/sizebot/lib/utils.py index 59958e3d..5c57bc36 100644 --- a/sizebot/lib/utils.py +++ b/sizebot/lib/utils.py @@ -58,6 +58,14 @@ def prettyTimeDelta(totalSeconds, millisecondAccuracy = False, roundeventually = s += f"{seconds:,d}.{milliseconds:03d} second{'' if seconds == 1 and milliseconds == 0 else 's'}" else: s += f"{seconds:,d} second{'s' if seconds != 1 else ''}" + elif inputms >= MILLISECONDS_PER_YEAR * 1_000_000: + if inputms >= MILLISECONDS_PER_YEAR: + s += f"{years:,d} year{'s' if years != 1 else ''}" + elif inputms >= MILLISECONDS_PER_YEAR * 1000: + if inputms >= MILLISECONDS_PER_YEAR: + s += f"{years:,d} year{'s' if years != 1 else ''}, " + if inputms >= MILLISECONDS_PER_DAY: + s += f"{days:,d} day{'s' if days != 1 else ''}" elif inputms >= MILLISECONDS_PER_YEAR: if inputms >= MILLISECONDS_PER_YEAR: s += f"{years:,d} year{'s' if years != 1 else ''}, "