From c94a45a10bac63eff1ce066707fe2df0b1243daa Mon Sep 17 00:00:00 2001
From: ToxicKidz <78174417+ToxicKidz@users.noreply.github.com>
Date: Thu, 8 Apr 2021 12:37:14 -0400
Subject: Use PRDraft emoji when the pr is a draft pr for the .issue|.pr
 command

---
 bot/exts/evergreen/issues.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'bot/exts/evergreen/issues.py')

diff --git a/bot/exts/evergreen/issues.py b/bot/exts/evergreen/issues.py
index 4a73d20b..e83f1a3e 100644
--- a/bot/exts/evergreen/issues.py
+++ b/bot/exts/evergreen/issues.py
@@ -100,7 +100,7 @@ class Issues(commands.Cog):
 
         for number in numbers:
             url = f"https://api.github.com/repos/{user}/{repository}/issues/{number}"
-            merge_url = f"https://api.github.com/repos/{user}/{repository}/pulls/{number}/merge"
+            pulls_url = f"https://api.github.com/repos/{user}/{repository}/pulls/{number}"
             log.trace(f"Querying GH issues API: {url}")
             async with self.bot.http_session.get(url, headers=REQUEST_HEADERS) as r:
                 json_data = await r.json()
@@ -123,12 +123,15 @@ class Issues(commands.Cog):
             # we know that a PR has been requested and a call to the pulls API endpoint is necessary
             # to get the desired information for the PR.
             else:
-                log.trace(f"PR provided, querying GH pulls API for additional information: {merge_url}")
-                async with self.bot.http_session.get(merge_url) as m:
-                    if json_data.get("state") == "open":
+                log.trace(f"PR provided, querying GH pulls API for additional information: {pulls_url}")
+                async with self.bot.http_session.get(pulls_url) as p:
+                    pull_data = await p.json()
+                    if pull_data["draft"]:
+                        icon_url = Emojis.pull_request_draft
+                    elif pull_data["state"] == "open":
                         icon_url = Emojis.pull_request
                     # When the status is 204 this means that the state of the PR is merged
-                    elif m.status == 204:
+                    elif pull_data["merged_at"] is not None:
                         icon_url = Emojis.merge
                     else:
                         icon_url = Emojis.pull_request_closed
-- 
cgit v1.2.3


From edb6ffab317499689d7b8f5d0b884a8d10a01a76 Mon Sep 17 00:00:00 2001
From: ToxicKidz <78174417+ToxicKidz@users.noreply.github.com>
Date: Fri, 9 Apr 2021 13:28:36 -0400
Subject: Update comment

---
 bot/exts/evergreen/issues.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bot/exts/evergreen/issues.py')

diff --git a/bot/exts/evergreen/issues.py b/bot/exts/evergreen/issues.py
index 7604c438..fa07b674 100644
--- a/bot/exts/evergreen/issues.py
+++ b/bot/exts/evergreen/issues.py
@@ -158,7 +158,7 @@ class Issues(commands.Cog):
                     emoji = Emojis.pull_request_draft
                 elif pull_data["state"] == "open":
                     emoji = Emojis.pull_request
-                # When the status is 204 this means that the state of the PR is merged
+                # When 'merged_at' is not None, this means that the state of the PR is merged
                 elif pull_data["merged_at"] is not None:
                     emoji = Emojis.merge
                 else:
-- 
cgit v1.2.3