jarvis/jarvis-bot
jarvis/jarvis-bot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix sort error in rolegiver, minor /status changes

Browse source
This commit is contained in:
Zeva Rose 2021-08-08 10:50:18 -06:00
parent 315d68b576
commit 898ff8abad
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
jarvis/__init__.py
View file

@ -44,7 +44,7 @@ jarvis = commands.Bot(
slash = SlashCommand(jarvis, sync_commands=True, sync_on_cog_reload=True) slash = SlashCommand(jarvis, sync_commands=True, sync_on_cog_reload=True)
jarvis_self = Process() jarvis_self = Process()
__version__ = "1.10.4" __version__ = "1.10.5"
@jarvis.event @jarvis.event

10
jarvis/cogs/rolegiver.py
View file

@ -45,7 +45,7 @@ class RolegiverCog(commands.Cog):
e_role = ctx.guild.get_role(role_id) e_role = ctx.guild.get_role(role_id)
roles.append(e_role) roles.append(e_role)
if roles: 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" value = "\n".join([r.mention for r in roles]) if roles else "None"
fields = [ fields = [
@ -103,7 +103,7 @@ class RolegiverCog(commands.Cog):
roles.append(e_role) roles.append(e_role)
if roles: 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" value = "\n".join([r.mention for r in roles]) if roles else "None"
fields = [ fields = [
@ -144,7 +144,7 @@ class RolegiverCog(commands.Cog):
roles.append(e_role) roles.append(e_role)
if roles: 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" 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 roles = ctx.author.roles
if roles: if roles:
roles.sort(lambda x: -x.position) roles.sort(key=lambda x: -x.position)
_ = roles.pop(-1) _ = roles.pop(-1)
value = "\n".join([r.mention for r in roles]) if roles else "None" 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 roles = ctx.author.roles
if roles: if roles:
roles.sort(lambda x: -x.position) roles.sort(key=lambda x: -x.position)
_ = roles.pop(-1) _ = roles.pop(-1)
value = "\n".join([r.mention for r in roles]) if roles else "None" value = "\n".join([r.mention for r in roles]) if roles else "None"

6
jarvis/cogs/util.py
View file

@ -4,6 +4,8 @@ import secrets
import string import string
from io import BytesIO from io import BytesIO
import discord
import discord_slash
from discord import File from discord import File
from discord import Guild from discord import Guild
from discord import Role from discord import Role
@ -59,8 +61,10 @@ class UtilCog(commands.Cog):
) )
) )
fields.append(Field("PID", jarvis_self.pid)) 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("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) embed = build_embed(title=title, description=desc, fields=fields, color=color)
await ctx.send(embed=embed) await ctx.send(embed=embed)