Moved embeds into external file. Added check for the #suggestion channel instead of explicit naming

Author: Xarlos89

src/zorak/cogs/general/general_suggest.py

@@ -6,6 +6,10 @@
 import discord
 from discord.ext import commands
 
+from zorak.utilities.cog_helpers._embeds import (
+    embed_suggestion,
+    embed_suggestion_error# pylint: disable=E0401
+)
 
 logger = logging.getLogger(__name__)
 
@@ -27,25 +31,18 @@ async def suggest(self, ctx, question):
         logger.info("%s used the %s command."
                     , ctx.author.name
                     , ctx.command)
-        
-        '''
-        
-        '''
-        embed = discord.Embed(description= question)
-        embed.set_author(name= f"Suggestion by user {ctx.author.name}")
-        error_embed = discord.Embed(title= "**Oops...**", description= "Slow down, please only use /suggest in #📎suggestions!", color= discord.Color.red())
-
 
         '''
-        If the channel name/ID of the command matches with the current 
+        If the channel name/ID of the command matches with the current
         channel, the suggestion will be posted. If not, an error message will occur.
         '''
-        if ctx.channel.name == "📎suggestions" or ctx.channel_id == "962415552737996800":
-            msg = await ctx.respond(embed=embed)
+        suggest_channel = await self.bot.fetch_channel(self.bot.server_settings.normal_channel["suggestions_channel"])
+        if ctx.channel_id == suggest_channel.id:
+            msg = await ctx.respond(embed = embed_suggestion(ctx.author, question))
             await msg.add_reaction("👍")
             await msg.add_reaction("👎")
         else:
-            await ctx.respond(embed=error_embed)
+            await ctx.respond(embed=embed_suggestion_error(suggest_channel))
 
 
 def setup(bot):

src/zorak/utilities/cog_helpers/_embeds.py

@@ -91,7 +91,7 @@ def embed_message_delete(some_member, some_message):
     )
 
     embed.set_thumbnail(
-        url=some_member.avatar # the person who DELETED the message
+        url=some_member.avatar  # the person who DELETED the message
     )
     if len(some_message.content) > 1020:
         the_message = some_message.content[0:1020] + '...'
@@ -385,6 +385,7 @@ def embed_spammer(message_to_report):
     embed.add_field(name="Message:", value=message_to_report, inline=True)
     return embed
 
+
 def embed_spammer_warn(channel1, channel2):
     """
     Embedding warn for detected spam messages.
@@ -406,6 +407,32 @@ def embed_spammer_warn(channel1, channel2):
     return embed
 
 
+def embed_suggestions(author, question):
+    embed = discord.Embed(
+        title=f'Suggestion by user {author.name}'
+        , description=f'Please vote using reactions.'
+        , color=discord.Color.yellow()
+        , timestamp=datetime.utcnow()
+    )
+
+    embed.add_field(
+        name='Suggestion:'
+        , value=f'{question}'
+        , inline=True
+    )
+
+    return embed
+
+def embed_suggestion_error(channel):
+    embed = discord.Embed(
+        title='Oops!'
+        , description=f'Please only use the /suggest command in {channel.mention}'
+        , color=discord.Color.red()
+        , timestamp=datetime.utcnow()
+    )
+    return embed
+
+
 def embed_leaderboard(people_list, server_name, server_logo):
     """
         Embedding for the leaderboard command.
@@ -421,7 +448,7 @@ def embed_leaderboard(people_list, server_name, server_logo):
     )
     for place, person in enumerate(people_list):
         embed.add_field(
-            name=f"#{place+1}  -  {person[0].display_name}"
+            name=f"#{place + 1}  -  {person[0].display_name}"
             , value=f"Points: {person[1]}"
             , inline=False
         )