From 9baf9483e81d47a5fc6305da3c6ca85b8bffd09c Mon Sep 17 00:00:00 2001 From: Fadi Atamny Date: Sat, 25 Apr 2020 20:25:45 +0300 Subject: [PATCH 1/3] implemented message preview command --- welcomeCog/welcome.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/welcomeCog/welcome.py b/welcomeCog/welcome.py index 93720c5..6066106 100644 --- a/welcomeCog/welcome.py +++ b/welcomeCog/welcome.py @@ -43,6 +43,11 @@ class WelcomeCog(commands.Cog): super().__init__(*args, **kwargs) self.message = '' + @commands.command(name='welcomePreview', case_insensitive = False, description='Shows a preview of the welcome message') + async def preview(self, ctx): + message = formatMessage(self.message) + await ctx.send(content=None, embed=message) + @commands.Cog.listener() async def on_member_join(self, member: discord.Member): try: From 0bb76588f12c070d7532961a00edb6ef27245a86 Mon Sep 17 00:00:00 2001 From: Fadi Atamny Date: Sat, 25 Apr 2020 20:46:53 +0300 Subject: [PATCH 2/3] made sure to fetch message if not fetched --- welcomeCog/welcome.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/welcomeCog/welcome.py b/welcomeCog/welcome.py index 6066106..f855b06 100644 --- a/welcomeCog/welcome.py +++ b/welcomeCog/welcome.py @@ -45,6 +45,10 @@ class WelcomeCog(commands.Cog): @commands.command(name='welcomePreview', case_insensitive = False, description='Shows a preview of the welcome message') async def preview(self, ctx): + if ctx.guild.id not in allowed_guilds: + return + if self.message == '': + self.message = await fetchMessage() message = formatMessage(self.message) await ctx.send(content=None, embed=message) From a590d28ab6d450df194c6172764c3220dd5eec6f Mon Sep 17 00:00:00 2001 From: Fadi Atamny Date: Sun, 26 Apr 2020 00:29:23 +0300 Subject: [PATCH 3/3] formatted code and added test server --- welcomeCog/welcome.py | 45 +++++++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/welcomeCog/welcome.py b/welcomeCog/welcome.py index f855b06..7254537 100644 --- a/welcomeCog/welcome.py +++ b/welcomeCog/welcome.py @@ -7,8 +7,8 @@ from redbot.core import Config, checks, commands from redbot.core.utils.chat_formatting import box, humanize_list, pagify url = 'https://raw.githubusercontent.com/Kanium/KaniumCogs/master/welcomeCog/data/embedded_message.json' - -allowed_guilds = {274657393936302080, 693796372092289024} + +allowed_guilds = {274657393936302080, 693796372092289024, 508781789737648138} async def fetchMessage(): @@ -20,37 +20,47 @@ async def fetchMessage(): return x return await fetch() + def formatMessage(jsonFormat): try: - message=discord.Embed(title=str(jsonFormat['title']), description=''.join(map(str, jsonFormat['description'])), color=int(jsonFormat['color'],16)) + message = discord.Embed(title=str(jsonFormat['title']), description=''.join( + map(str, jsonFormat['description'])), color=int(jsonFormat['color'], 16)) message.set_thumbnail(url=jsonFormat['thumbnail']) for field in jsonFormat['fields']: - if(field['id']!='links'): - message.add_field(name=field['name'], value=field['value'], inline=field['inline']) + if(field['id'] != 'links'): + message.add_field( + name=field['name'], value=field['value'], inline=field['inline']) else: - message.add_field(name=field['name'], value=''.join(map(str,field['value'])), inline=field['inline']) + message.add_field(name=field['name'], value=''.join( + map(str, field['value'])), inline=field['inline']) - message.set_footer(text=jsonFormat['footer']['text'], icon_url=jsonFormat['footer']['icon_url']) + message.set_footer( + text=jsonFormat['footer']['text'], icon_url=jsonFormat['footer']['icon_url']) return message except: - message=discord.Embed(title="Kanium", description='', color=0x3399ff) - message.add_field(name="Welcome", value='Welcome To Kanium !', inline=True) + message = discord.Embed(title="Kanium", description='', color=0x3399ff) + message.add_field( + name="Welcome", value='Welcome To Kanium !', inline=True) return message + class WelcomeCog(commands.Cog): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.message = '' - @commands.command(name='welcomePreview', case_insensitive = False, description='Shows a preview of the welcome message') + @commands.command(name='welcomePreview', case_insensitive=False, description='Shows a preview of the welcome message') async def preview(self, ctx): - if ctx.guild.id not in allowed_guilds: - return - if self.message == '': - self.message = await fetchMessage() - message = formatMessage(self.message) - await ctx.send(content=None, embed=message) + try: + if ctx.guild.id not in allowed_guilds: + return + if self.message == '': + self.message = await fetchMessage() + message = formatMessage(self.message) + await ctx.send(content=None, embed=message) + except(): + print(f'Error Occured!') @commands.Cog.listener() async def on_member_join(self, member: discord.Member): @@ -62,4 +72,5 @@ class WelcomeCog(commands.Cog): message = formatMessage(self.message) await member.send(content=None, embed=message) except (discord.NotFound, discord.Forbidden): - print(f'Error Occured! sending a dm to {member.display_name} didnt work !') + print( + f'Error Occured! sending a dm to {member.display_name} didnt work !')