From fe70ce1c4c5cf5dfa0534dffb8ae02f1ec9ae34e Mon Sep 17 00:00:00 2001
From: Federico <me@fregante.com>
Date: Thu, 4 Nov 2021 12:08:43 +0100
Subject: [PATCH] Merge logic

---
 source/github-issue-link-status.js | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/source/github-issue-link-status.js b/source/github-issue-link-status.js
index 146b9f0..785ddbe 100644
--- a/source/github-issue-link-status.js
+++ b/source/github-issue-link-status.js
@@ -19,8 +19,18 @@ const stateColorMap = {
 	},
 };
 
-function addOcticonClass(svgString) {
-	return svgString?.replace('<svg', '<svg class="octicon"');
+function getIcon(state, type, isDraft = false) {
+	const iconName = isDraft && state === 'open' ? 'draft' + type : state + type;
+	if (!(iconName in icons)) {
+		console.error('GitHub Issue Link Status: No icon named', iconName, 'found');
+		return '';
+	}
+
+	if (iconName === 'draftpullrequest') {
+		return icons.draftpullrequest.replace('<svg', '<svg class="octicon color-text-tertiary"');
+	}
+
+	return icons[iconName].replace('<svg', '<svg class="octicon"');
 }
 
 function esc(repo) {
@@ -100,7 +110,7 @@ async function apply() {
 	}
 
 	for (const {link, type} of links) {
-		link.insertAdjacentHTML('beforeEnd', addOcticonClass(icons['open' + type]));
+		link.insertAdjacentHTML('beforeEnd', getIcon('open', type));
 	}
 
 	const query = buildGQL(links);
@@ -126,12 +136,7 @@ async function apply() {
 
 			link.classList.add(...stateColorMap[type][state]);
 
-			const iconName = item.isDraft && state === 'open' ? 'draft' + type : state + type;
-			if (iconName in icons) {
-				link.querySelector('svg').outerHTML = addOcticonClass(icons[iconName]);
-			} else {
-				console.error('GitHub Issue Link Status: No icon named', iconName, 'found');
-			}
+			link.querySelector('svg').outerHTML = getIcon(state, type, item.isDraft);
 		} catch {/* Probably a redirect */}
 	}
 }