improv: differentiate draft PRs

Author: chrisgrieser

scripts/my-github-issues.js

@@ -23,35 +23,35 @@ function run() {
 	const issues = JSON.parse(app.doShellScript(`curl -sL "${apiURL}"`)).items.map(
 		(/** @type {GithubIssue} */ item) => {
 			const issueAuthor = item.user.login;
-			const isPR = Boolean(item.pull_request);
-			const merged = Boolean(item.pull_request?.merged_at);
-			const title = item.title;
 			const repo = (item.repository_url.match(/[^/]+$/) || "")[0];
 			const comments = item.comments > 0 ? "💬 " + item.comments.toString() : "";
-			const open = item.state === "open";
-			const closed = item.state === "closed";
-			const reason = item.state_reason;
 			const labels = item.labels.map((label) => `[${label.name}]`).join(" ");
 
 			const subtitle = [`#${item.number}`, repo, comments.toString(), labels]
 				.filter(Boolean)
 				.join("   ");
 
-			// icon
+			// ICON
 			let icon = issueAuthor === username ? "✏️ " : "";
-			if (open && isPR) icon += "🟩 ";
-			else if (closed && isPR && merged) icon += "🟪 ";
-			else if (closed && isPR && !merged) icon += "🟥 ";
-			else if (open && !isPR) icon += "🟢 ";
-			else if (closed && reason === "not_planned") icon += "⚪ ";
-			else if (closed && reason === "completed") icon += "🟣 ";
+			if (item.pull_request) {
+				if (item.draft) icon += "⬜ ";
+				else if (item.state === "open") icon += "🟩 ";
+				else if (item.pull_request.merged_at) icon += "🟪 ";
+				else icon += "🟥 ";
+			} else {
+				// biome-ignore lint/style/useCollapsedElseIf: here it's more readable this way
+				if (item.state === "open") icon += "🟢 ";
+				else if (item.state_reason === "not_planned") icon += "⚪ ";
+				else if (item.state_reason === "completed") icon += "🟣 ";
+			}
 
 			let matcher = alfredMatcher(item.title) + " " + alfredMatcher(repo) + " " + item.state;
-			if (isPR) matcher += " pr";
+			if (item.pull_request) matcher += " pr";
 			else matcher += " issue";
+			if (item.draft) matcher += " draft";
 
 			return {
-				title: icon + title,
+				title: icon + item.title,
 				subtitle: subtitle,
 				match: matcher,
 				arg: item.html_url,

scripts/my-github-prs.js

@@ -16,7 +16,7 @@ function alfredMatcher(str) {
  * @return {string} relative date
  */
 function humanRelativeDate(isoDateStr) {
-	const deltaSecs = (+new Date() - +new Date(isoDateStr)) / 1000;
+	const deltaSecs = (Date.now() - +new Date(isoDateStr)) / 1000;
 	/** @type {"year"|"month"|"week"|"day"|"hour"|"minute"|"second"} */
 	let unit;
 	let delta;
@@ -51,16 +51,15 @@ function humanRelativeDate(isoDateStr) {
 
 // biome-ignore lint/correctness/noUnusedVariables: alfred_run
 function run() {
-	const numberOfPrs = 100; // 100 is the maximum of API
 	const username = $.getenv("github_username");
-	const apiURL = `https://api.github.com/search/issues?q=author:${username}+is:pr+is:open&per_page=${numberOfPrs}`;
+	const apiURL = `https://api.github.com/search/issues?q=author:${username}+is:pr+is:open&per_page=100`;
 
 	const openPrs = JSON.parse(app.doShellScript(`curl -sL "${apiURL}"`)).items.map(
 		(/** @type {GithubIssue} */ item) => {
-			const title = item.title;
 			const repo = (item.repository_url.match(/[^/]+$/) || "")[0];
 			const comments = item.comments > 0 ? "💬 " + item.comments.toString() : "";
-			const draftIcon = item.draft ? "📝 " : "";
+			const icon = item.draft ? "⬜" : "🟩 ";
+
 			const subtitle = [
 				`#${item.number}`,
 				repo,
@@ -71,9 +70,9 @@ function run() {
 				.join("   ");
 
 			return {
-				title: draftIcon + title,
+				title: icon + item.title,
 				subtitle: subtitle,
-				match: alfredMatcher(title) + alfredMatcher(repo),
+				match: alfredMatcher(item.title) + alfredMatcher(repo),
 				arg: item.html_url,
 				quicklookurl: item.html_url,
 			};