Additional review comment resolution

* Remove duplicate easter egg facts, fix punctuation
* Simplify egg fact JSON load
* Simplify egg fact embed generation
* Simplify issues command, remove redundant calls, and make some variables more explicit
* Truncate issue body if its length is greater than 1024 characters (embed field limitation)

Co-Authored-By: Mark <[email protected]>

1 files changed, 22 insertions, 13 deletions

diff --git a/bot/seasons/evergreen/issues.py b/bot/seasons/evergreen/issues.py
index c6dbe344..04531c54 100644
--- a/bot/seasons/evergreen/issues.py
+++ b/bot/seasons/evergreen/issues.py
@@ -16,23 +16,32 @@ class Issues(commands.Cog):
     async def issue(self, ctx, number: int, repository: str = "seasonalbot", user: str = "python-discord"):
         """Command to retrieve issues from a GitHub repository."""
         url = f"https://api.github.com/repos/{user}/{repository}/issues/{number}"
-        status = {"404": f"Issue #{str(number)} doesn't exist in the repository {user}/{repository}.",
-                  "403": f"Rate limit exceeded. Please wait a while before trying again!"}
+        failed_status = {
+            404: f"Issue #{number} doesn't exist in the repository {user}/{repository}.",
+            403: f"Rate limit exceeded. Please wait a while before trying again!"
+        }
 
         async with self.bot.http_session.get(url) as r:
             json_data = await r.json()
+            response_code = r.status
 
-        if str(r.status) in status:
-            return await ctx.send(status.get(str(r.status)))
-
-        valid = discord.Embed(colour=0x00ff37)
-        valid.add_field(name="Repository", value=f"{user}/{repository}", inline=False)
-        valid.add_field(name="Issue Number", value=f"#{number}", inline=False)
-        valid.add_field(name="Status", value=json_data["state"].title())
-        valid.add_field(name="Link", value=url, inline=False)
-        if len(json_data.get("body")) < 1024:
-            valid.add_field(name="Description", value=json_data.get("body"), inline=False)
-        await ctx.send(embed=valid)
+        if response_code in failed_status:
+            return await ctx.send(failed_status[response_code])
+
+        issue_embed = discord.Embed(colour=0x00ff37)
+        issue_embed.add_field(name="Repository", value=f"{user}/{repository}", inline=False)
+        issue_embed.add_field(name="Issue Number", value=f"#{number}", inline=False)
+        issue_embed.add_field(name="Status", value=json_data["state"].title())
+        issue_embed.add_field(name="Link", value=url, inline=False)
+
+        description = json_data["body"]
+        if len(description) > 1024:
+            truncation_message = "** ...\n\nContent truncated, please follow the link for more!**"
+            description = f"{description[:1024 - len(truncation_message)]}{truncation_message}"
+
+        issue_embed.add_field(name="Description", value=description, inline=False)
+
+        await ctx.send(embed=issue_embed)
 
 
 def setup(bot):