From 898ff8abad700f96a74cd6cb3728c6772000c5a7 Mon Sep 17 00:00:00 2001 From: Zevaryx Date: Sun, 8 Aug 2021 10:50:18 -0600 Subject: [PATCH] Fix sort error in rolegiver, minor /status changes --- jarvis/__init__.py | 2 +- jarvis/cogs/rolegiver.py | 10 +++++----- jarvis/cogs/util.py | 6 +++++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/jarvis/__init__.py b/jarvis/__init__.py index 18b246d..9d9f265 100644 --- a/jarvis/__init__.py +++ b/jarvis/__init__.py @@ -44,7 +44,7 @@ jarvis = commands.Bot( slash = SlashCommand(jarvis, sync_commands=True, sync_on_cog_reload=True) jarvis_self = Process() -__version__ = "1.10.4" +__version__ = "1.10.5" @jarvis.event diff --git a/jarvis/cogs/rolegiver.py b/jarvis/cogs/rolegiver.py index 0548b3b..b27df6f 100644 --- a/jarvis/cogs/rolegiver.py +++ b/jarvis/cogs/rolegiver.py @@ -45,7 +45,7 @@ class RolegiverCog(commands.Cog): e_role = ctx.guild.get_role(role_id) roles.append(e_role) if roles: - roles.sort(lambda x: -x.position) + roles.sort(key=lambda x: -x.position) value = "\n".join([r.mention for r in roles]) if roles else "None" fields = [ @@ -103,7 +103,7 @@ class RolegiverCog(commands.Cog): roles.append(e_role) if roles: - roles.sort(lambda x: -x.position) + roles.sort(key=lambda x: -x.position) value = "\n".join([r.mention for r in roles]) if roles else "None" fields = [ @@ -144,7 +144,7 @@ class RolegiverCog(commands.Cog): roles.append(e_role) if roles: - roles.sort(lambda x: -x.position) + roles.sort(key=lambda x: -x.position) value = "\n".join([r.mention for r in roles]) if roles else "None" @@ -194,7 +194,7 @@ class RolegiverCog(commands.Cog): roles = ctx.author.roles if roles: - roles.sort(lambda x: -x.position) + roles.sort(key=lambda x: -x.position) _ = roles.pop(-1) value = "\n".join([r.mention for r in roles]) if roles else "None" @@ -249,7 +249,7 @@ class RolegiverCog(commands.Cog): roles = ctx.author.roles if roles: - roles.sort(lambda x: -x.position) + roles.sort(key=lambda x: -x.position) _ = roles.pop(-1) value = "\n".join([r.mention for r in roles]) if roles else "None" diff --git a/jarvis/cogs/util.py b/jarvis/cogs/util.py index 53e2bcd..66831a2 100644 --- a/jarvis/cogs/util.py +++ b/jarvis/cogs/util.py @@ -4,6 +4,8 @@ import secrets import string from io import BytesIO +import discord +import discord_slash from discord import File from discord import Guild from discord import Role @@ -59,8 +61,10 @@ class UtilCog(commands.Cog): ) ) fields.append(Field("PID", jarvis_self.pid)) + fields.append(Field("discord_slash", discord_slash.__version__)) + fields.append(Field("discord.py", discord.__version__)) fields.append(Field("Version", jarvis.__version__, False)) - fields.append(Field("Git Hash", get_repo_hash(), False)) + fields.append(Field("Git Hash", get_repo_hash()[:7], False)) embed = build_embed(title=title, description=desc, fields=fields, color=color) await ctx.send(embed=embed)