diff --git a/jarvis/__init__.py b/jarvis/__init__.py index 26b6144..479d93f 100644 --- a/jarvis/__init__.py +++ b/jarvis/__init__.py @@ -41,7 +41,7 @@ jarvis = commands.Bot( slash = SlashCommand(jarvis, sync_commands=False, sync_on_cog_reload=True) jarvis_self = Process() -__version__ = "1.10.5" +__version__ = "1.10.6" @jarvis.event diff --git a/jarvis/cogs/remindme.py b/jarvis/cogs/remindme.py index c61ac39..f17748a 100644 --- a/jarvis/cogs/remindme.py +++ b/jarvis/cogs/remindme.py @@ -229,7 +229,7 @@ class RemindmeCog(CacheCog): for reminder in reminders: option = create_select_option( label=reminder.remind_at.strftime("%Y-%m-%d %H:%M UTC"), - value=str(reminder._id), + value=str(reminder.id), emoji="⏰", ) options.append(option) @@ -265,7 +265,7 @@ class RemindmeCog(CacheCog): component["disabled"] = True 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( Field( name=reminder.remind_at.strftime("%Y-%m-%d %H:%M UTC"), diff --git a/jarvis/cogs/rolegiver.py b/jarvis/cogs/rolegiver.py index b7e3be2..87ec2c4 100644 --- a/jarvis/cogs/rolegiver.py +++ b/jarvis/cogs/rolegiver.py @@ -43,9 +43,10 @@ class RolegiverCog(commands.Cog): for role_id in setting.value: e_role = ctx.guild.get_role(role_id) if not e_role: - setting.value.remove(role_id) - setting.save() - continue + e_role = await ctx.guild.fetch_role(role_id) + if not e_role: + setting.value.remove(role_id) + continue roles.append(e_role) if roles: roles.sort(key=lambda x: -x.position) @@ -98,20 +99,21 @@ class RolegiverCog(commands.Cog): return setting.value.remove(role.id) - setting.save() roles = [] for role_id in setting.value: e_role = ctx.guild.get_role(role_id) if not e_role: - setting.value.remove(role_id) - setting.save() - continue + e_role = await ctx.guild.fetch_role(role_id) + if not e_role: + setting.value.remove(role_id) + continue roles.append(e_role) if roles: roles.sort(key=lambda x: -x.position) + setting.save() value = "\n".join([r.mention for r in roles]) if roles else "None" fields = [ Field(name="Removed Role", value=f"{role.mention}"), @@ -149,9 +151,10 @@ class RolegiverCog(commands.Cog): for role_id in setting.value: e_role = ctx.guild.get_role(role_id) if not e_role: - setting.value.remove(role_id) - setting.save() - continue + e_role = await ctx.guild.fetch_role(role_id) + if not e_role: + setting.value.remove(role_id) + continue roles.append(e_role) if roles: @@ -174,6 +177,7 @@ class RolegiverCog(commands.Cog): embed.set_footer(text=f"{ctx.author.name}#{ctx.author.discriminator} | {ctx.author.id}") await ctx.send(embed=embed) + setting.save() @cog_ext.cog_subcommand( base="role",