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

Fix remindme, rolegiver

Browse source
This commit is contained in:
Zeva Rose 2021-09-02 11:14:12 -06:00
parent 2a964c4a68
commit f61abda4c0
3 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
jarvis/__init__.py
View file

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

4
jarvis/cogs/remindme.py
View file

@ -229,7 +229,7 @@ class RemindmeCog(CacheCog):
for reminder in reminders: for reminder in reminders:
option = create_select_option( option = create_select_option(
label=reminder.remind_at.strftime("%Y-%m-%d %H:%M UTC"), label=reminder.remind_at.strftime("%Y-%m-%d %H:%M UTC"),
value=str(reminder._id), value=str(reminder.id),
emoji="⏰", emoji="⏰",
) )
options.append(option) options.append(option)
@ -265,7 +265,7 @@ class RemindmeCog(CacheCog):
component["disabled"] = True component["disabled"] = True
fields = [] fields = []
for reminder in filter(lambda x: str(x._id) in context.selected_options, reminders): for reminder in filter(lambda x: str(x.id) in context.selected_options, reminders):
fields.append( fields.append(
Field( Field(
name=reminder.remind_at.strftime("%Y-%m-%d %H:%M UTC"), name=reminder.remind_at.strftime("%Y-%m-%d %H:%M UTC"),

24
jarvis/cogs/rolegiver.py
View file

@ -43,9 +43,10 @@ class RolegiverCog(commands.Cog):
for role_id in setting.value: for role_id in setting.value:
e_role = ctx.guild.get_role(role_id) e_role = ctx.guild.get_role(role_id)
if not e_role: if not e_role:
setting.value.remove(role_id) e_role = await ctx.guild.fetch_role(role_id)
setting.save() if not e_role:
continue setting.value.remove(role_id)
continue
roles.append(e_role) roles.append(e_role)
if roles: if roles:
roles.sort(key=lambda x: -x.position) roles.sort(key=lambda x: -x.position)
@ -98,20 +99,21 @@ class RolegiverCog(commands.Cog):
return return
setting.value.remove(role.id) setting.value.remove(role.id)
setting.save()
roles = [] roles = []
for role_id in setting.value: for role_id in setting.value:
e_role = ctx.guild.get_role(role_id) e_role = ctx.guild.get_role(role_id)
if not e_role: if not e_role:
setting.value.remove(role_id) e_role = await ctx.guild.fetch_role(role_id)
setting.save() if not e_role:
continue setting.value.remove(role_id)
continue
roles.append(e_role) roles.append(e_role)
if roles: if roles:
roles.sort(key=lambda x: -x.position) roles.sort(key=lambda x: -x.position)
setting.save()
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 = [
Field(name="Removed Role", value=f"{role.mention}"), Field(name="Removed Role", value=f"{role.mention}"),
@ -149,9 +151,10 @@ class RolegiverCog(commands.Cog):
for role_id in setting.value: for role_id in setting.value:
e_role = ctx.guild.get_role(role_id) e_role = ctx.guild.get_role(role_id)
if not e_role: if not e_role:
setting.value.remove(role_id) e_role = await ctx.guild.fetch_role(role_id)
setting.save() if not e_role:
continue setting.value.remove(role_id)
continue
roles.append(e_role) roles.append(e_role)
if roles: if roles:
@ -174,6 +177,7 @@ class RolegiverCog(commands.Cog):
embed.set_footer(text=f"{ctx.author.name}#{ctx.author.discriminator} | {ctx.author.id}") embed.set_footer(text=f"{ctx.author.name}#{ctx.author.discriminator} | {ctx.author.id}")
await ctx.send(embed=embed) await ctx.send(embed=embed)
setting.save()
@cog_ext.cog_subcommand( @cog_ext.cog_subcommand(
base="role", base="role",