enhance code

Author: anbraten

web_src/js/features/comp/TextExpander.ts

@@ -1,8 +1,9 @@
 import {matchEmoji, matchMention, matchIssue} from '../../utils/match.ts';
 import {emojiString} from '../emoji.ts';
 import {svg} from '../../svg.ts';
+import {parseIssueHref} from '../../utils.ts';
 
-type Issue = {id: string; title: string; state: 'open' | 'closed'; pull_request?: {draft: boolean; merged: boolean}};
+type Issue = {id: number; title: string; state: 'open' | 'closed'; pull_request?: {draft: boolean; merged: boolean}};
 function getIssueIcon(issue: Issue) {
   if (issue.pull_request) {
     if (issue.state === 'open') {
@@ -84,8 +85,8 @@ export function initTextExpander(expander) {
       provide({matched: true, fragment: ul});
     } else if (key === '#') {
       provide(new Promise(async (resolve) => {
-        const url = window.location.href;
-        const matches = await matchIssue(url, text);
+        const {owner, repo, index} = parseIssueHref(window.location.href);
+        const matches = await matchIssue(owner, repo, index, text);
         if (!matches.length) return resolve({matched: false});
 
         const ul = document.createElement('ul');
@@ -102,7 +103,7 @@ export function initTextExpander(expander) {
 
           const id = document.createElement('span');
           id.classList.add('id');
-          id.textContent = issue.id;
+          id.textContent = issue.id.toString();
           li.append(id);
 
           const nameSpan = document.createElement('span');

web_src/js/utils/match.ts

@@ -1,5 +1,5 @@
 import emojis from '../../../assets/emoji.json';
-import { request } from '../modules/fetch.ts';
+import {request} from '../modules/fetch.ts';
 
 const maxMatches = 6;
 
@@ -45,19 +45,16 @@ export function matchMention(queryText: string): MentionSuggestion[] {
 }
 
 type Issue = {id: number; title: string; state: 'open' | 'closed'; pull_request?: {draft: boolean; merged: boolean}};
-export async function matchIssue(url: string, queryText: string): Promise<Issue[]> {
+export async function matchIssue(owner: string, repo: string, _issueIndex: string, queryText: string): Promise<Issue[]> {
   const query = queryText.toLowerCase();
 
-  // TODO: support sub-path
-  const repository = (new URL(url)).pathname.split('/').slice(1, 3).join('/');
-  const issuePullRequestId = parseInt(url.split('/').slice(-1)[0]);
-
-  const res = await request(`/api/v1/repos/${repository}/issues?q=${query}`, {
+  const res = await request(`/api/v1/repos/${owner}/${repo}/issues?q=${query}`, {
     method: 'GET',
   });
 
   const issues: Issue[] = await res.json();
+  const issueIndex = parseInt(_issueIndex);
 
   // filter issue with same id
-  return issues.filter((i) => i.id !== issuePullRequestId);
+  return issues.filter((i) => i.id !== issueIndex);
 }