Merge pull request #308 from practical-python-org/JaffaCat---fix/sugges

fix: rework /suggest

Author: Xarlos89

Resources/ServerConfig/PracticalPython/channel_info.toml

@@ -27,6 +27,7 @@ python_help_1 = 903542455675260928
 python_help_2 = 903542494409674803
 challenges_channel = 1045104938071633994
 news_channel = 1071848336442794094
+suggestions_channel = 962415552737996800
 
 [channels.log_channel]
 server_change_log = 953545221260595280
@@ -83,4 +84,4 @@ employer = 1113020504148815944
 #############
 [rss_feeds.links]
 jetbrains = 'https: //blog.jetbrains.com/pycharm/feed/'
-Python_Software_foundation = 'https: //feeds.feedburner.com/PythonSoftwareFoundationNews'
+Python_Software_foundation = 'https: //feeds.feedburner.com/PythonSoftwareFoundationNews'

Resources/ServerConfig/Zorak-Dev/channel_info.toml

@@ -27,6 +27,8 @@ python_help_1 = 1062302503351365632
 python_help_2 = 12345
 challenges_channel = 1045104938071633994
 news_channel = 1071095960538718261
+suggestions_channel = 1179390629999026207
+
 
 [channels.log_channel]
 server_change_log = 1062269270047862884

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__)
 
@@ -28,11 +32,17 @@ async def suggest(self, ctx, question):
                     , ctx.author.name
                     , ctx.command)
 
-        embed = discord.Embed(description=question)
-        embed.set_author(name=f"Suggestion by {ctx.author.name}")
-        msg = await ctx.send(embed=embed)
-        await msg.add_reaction("👍")
-        await msg.add_reaction("👎")
+        '''
+        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.
+        '''
+        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=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
         )