From 0edbe40e4a980ce1c92be1a8ba68e276dbcbd3f0 Mon Sep 17 00:00:00 2001 From: Chris Lovering Date: Sun, 21 Aug 2022 22:15:05 +0100 Subject: Move to async cog loading This is required as of Discord.py 2.0 --- arthur/exts/kubernetes/deployments.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arthur/exts/kubernetes/deployments.py') diff --git a/arthur/exts/kubernetes/deployments.py b/arthur/exts/kubernetes/deployments.py index ec4f846..a55dc5f 100644 --- a/arthur/exts/kubernetes/deployments.py +++ b/arthur/exts/kubernetes/deployments.py @@ -173,6 +173,6 @@ class Deployments(commands.Cog): ) -def setup(bot: KingArthur) -> None: +async def setup(bot: KingArthur) -> None: """Add the extension to the bot.""" - bot.add_cog(Deployments(bot)) + await bot.add_cog(Deployments(bot)) -- cgit v1.2.3 From 083ceebfadfbf88752fb1b50bf0c86feff94875e Mon Sep 17 00:00:00 2001 From: Chris Lovering Date: Sun, 21 Aug 2022 22:16:26 +0100 Subject: Update ordering of Interaction callbacks The order the args get passed to callbacks has been changed in Discord.py 2.0. --- arthur/exts/cloudflare/zones.py | 2 +- arthur/exts/kubernetes/deployments.py | 4 ++-- arthur/exts/kubernetes/jobs.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'arthur/exts/kubernetes/deployments.py') diff --git a/arthur/exts/cloudflare/zones.py b/arthur/exts/cloudflare/zones.py index f265651..657de71 100644 --- a/arthur/exts/cloudflare/zones.py +++ b/arthur/exts/cloudflare/zones.py @@ -31,7 +31,7 @@ class ZonesView(discord.ui.View): placeholder="Select a zone to purge...", ) async def select_zones( - self, dropdown: discord.ui.Select, interaction: discord.Interaction + self, interaction: discord.Interaction, dropdown: discord.ui.Select ) -> None: """Drop down menu contains the list of zones.""" zone_name = dropdown.values[0] diff --git a/arthur/exts/kubernetes/deployments.py b/arthur/exts/kubernetes/deployments.py index a55dc5f..7a69baf 100644 --- a/arthur/exts/kubernetes/deployments.py +++ b/arthur/exts/kubernetes/deployments.py @@ -36,7 +36,7 @@ class ConfirmDeployment(ui.View): return False @ui.button(label="Confirm", style=ButtonStyle.green, row=0) - async def confirm(self, _button: ui.Button, interaction: Interaction) -> None: + async def confirm(self, interaction: Interaction, _button: ui.Button) -> None: """Redeploy the specified service.""" try: await deployments.restart_deployment(self.deployment, self.namespace) @@ -66,7 +66,7 @@ class ConfirmDeployment(ui.View): self.stop() @ui.button(label="Cancel", style=ButtonStyle.grey, row=0) - async def cancel(self, _button: ui.Button, interaction: Interaction) -> None: + async def cancel(self, interaction: Interaction, _button: ui.Button) -> None: """Logic for if the deployment is not approved.""" await interaction.message.edit( content=":x: Redeployment aborted", diff --git a/arthur/exts/kubernetes/jobs.py b/arthur/exts/kubernetes/jobs.py index 2a0e147..6259f65 100644 --- a/arthur/exts/kubernetes/jobs.py +++ b/arthur/exts/kubernetes/jobs.py @@ -37,7 +37,7 @@ class CronJobView(discord.ui.View): placeholder="Select a CronJob to trigger...", ) async def select_job( - self, dropdown: discord.ui.Select, interaction: discord.Interaction + self, interaction: discord.Interaction, dropdown: discord.ui.Select ) -> None: """Drop down menu contains the list of cronjobsb.""" cronjob_namespace, cronjob_name = dropdown.values[0].split("/") -- cgit v1.2.3