From a68eeb5651314bbba89d7c8215f76660c4bbbe31 Mon Sep 17 00:00:00 2001 From: Kaveen Kumarasinghe Date: Mon, 2 Jan 2023 20:01:23 -0500 Subject: [PATCH] fix some merge issues --- cogs/gpt_3_commands_and_converser.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cogs/gpt_3_commands_and_converser.py b/cogs/gpt_3_commands_and_converser.py index c052de2..e7e9957 100644 --- a/cogs/gpt_3_commands_and_converser.py +++ b/cogs/gpt_3_commands_and_converser.py @@ -113,7 +113,7 @@ class GPT3ComCon(discord.Cog, name="GPT3ComCon"): checks=[Check.check_admin_roles()], ) - @commands.Cog.listener() + @discord.Cog.listener() async def on_member_join(self, member): if self.model.welcome_message_enabled: query = f"Please generate a welcome message for {member.name} who has just joined the server." @@ -138,7 +138,7 @@ class GPT3ComCon(discord.Cog, name="GPT3ComCon"): ) await member.send(content=None, embed=welcome_embed) - @commands.Cog.listener() + @discord.Cog.listener() async def on_member_remove(self, member): pass