simplify GitHubEnhancer down to GitHubAddCommentEnhancer

Author: nedtwigg

browser-extension/src/lib/enhancers/github.ts

@@ -2,11 +2,11 @@ import { OverType } from '../../overtype/mock-overtype'
 import type { CommentEnhancer, CommentSpot } from '../enhancer'
 
 const GITHUB_SPOT_TYPES = [
+  'GH_PR_ADD_COMMENT',
+  /* TODO
   'GH_ISSUE_NEW',
   'GH_PR_NEW',
   'GH_ISSUE_ADD_COMMENT',
-  'GH_PR_ADD_COMMENT',
-  /* TODO
   'GH_ISSUE_EDIT_COMMENT',
   'GH_PR_EDIT_COMMENT',
   'GH_PR_CODE_COMMENT',
@@ -15,95 +15,54 @@ const GITHUB_SPOT_TYPES = [
 
 export type GitHubSpotType = (typeof GITHUB_SPOT_TYPES)[number]
 
-export interface GitHubSpot extends CommentSpot {
+export interface GitHubAddCommentSpot extends CommentSpot {
   type: GitHubSpotType // Override to narrow from string to specific union
   domain: string
   slug: string // owner/repo
-  number?: number | undefined // issue/PR number, undefined for new issues and PRs
+  number: number // issue/PR number, undefined for new issues and PRs
 }
 
-export class GitHubEnhancer implements CommentEnhancer<GitHubSpot> {
+export class GitHubAddCommentEnhancer implements CommentEnhancer<GitHubAddCommentSpot> {
   forSpotTypes(): string[] {
     return [...GITHUB_SPOT_TYPES]
   }
 
-  tryToEnhance(textarea: HTMLTextAreaElement): [OverType, GitHubSpot] | null {
-    // Only handle GitHub domains
-    if (!window.location.hostname.includes('github')) {
+  tryToEnhance(textarea: HTMLTextAreaElement): [OverType, GitHubAddCommentSpot] | null {
+    // Only handle github.com domains TODO: identify GitHub Enterprise somehow
+    if (window.location.hostname !== 'github.com') {
       return null
     }
 
-    const pathname = window.location.pathname
-
     // Parse GitHub URL structure: /owner/repo/issues/123 or /owner/repo/pull/456
-    const match = pathname.match(/^\/([^/]+)\/([^/]+)(?:\/(issues|pull)\/(\d+))?/)
+    const match = window.location.pathname.match(/^\/([^/]+)\/([^/]+)(?:\/pull\/(\d+))/)
     if (!match) return null
-
-    const [, owner, repo, urlType, numberStr] = match
+    const [, owner, repo, numberStr] = match
     const slug = `${owner}/${repo}`
-    const number = numberStr ? parseInt(numberStr, 10) : undefined
-
-    // Determine comment type
-    let type: GitHubSpotType
+    const number = parseInt(numberStr!, 10)
 
-    if (pathname.includes('/issues/new')) {
-      type = 'GH_ISSUE_NEW'
-    } else if (pathname.includes('/compare/') || pathname.endsWith('/compare')) {
-      type = 'GH_PR_NEW'
-    } else if (urlType && number) {
-      if (urlType === 'issues') {
-        type = 'GH_ISSUE_ADD_COMMENT'
-      } else {
-        type = 'GH_PR_ADD_COMMENT'
-      }
-    } else {
-      return null
-    }
-
-    // Generate unique key based on context
-    let unique_key = `github:${slug}`
-    if (number) {
-      unique_key += `:${urlType}:${number}`
-    } else {
-      unique_key += ':new'
-    }
+    const unique_key = `github.com:${slug}:${number}`
 
-    const spot: GitHubSpot = {
-      domain: window.location.hostname,
+    const spot: GitHubAddCommentSpot = {
+      domain: 'github.com',
       number,
       slug,
-      type,
+      type: 'GH_PR_ADD_COMMENT',
       unique_key,
     }
     const overtype = new OverType(textarea)
     return [overtype, spot]
   }
 
-  tableTitle(spot: GitHubSpot): string {
+  tableTitle(spot: GitHubAddCommentSpot): string {
     const { slug, number } = spot
-    if (number) {
-      return `Comment on ${slug} #${number}`
-    }
-    return `New ${window.location.pathname.includes('/issues/') ? 'issue' : 'PR'} in ${slug}`
+    return `${slug} PR #${number}`
   }
 
-  tableIcon(spot: GitHubSpot): string {
-    switch (spot.type) {
-      case 'GH_ISSUE_NEW':
-      case 'GH_ISSUE_ADD_COMMENT':
-        return '🐛' // Issue icon
-      case 'GH_PR_NEW':
-      case 'GH_PR_ADD_COMMENT':
-        return '🔄' // PR icon
-    }
+  tableIcon(_: GitHubAddCommentSpot): string {
+    return '🔄' // PR icon TODO: icon urls in /public
   }
 
-  buildUrl(spot: GitHubSpot): string {
-    const baseUrl = `https://${spot.domain}/${spot.slug}`
-    if (spot.number) {
-      const type = spot.type.indexOf('ISSUE') ? 'issues' : 'pull'
-      return `${baseUrl}/${type}/${spot.number}`
-    }
-    return baseUrl
+  buildUrl(spot: GitHubAddCommentSpot): string {
+    return `https://${spot.domain}/${spot.slug}/pull/${spot.number}`
   }
 }

browser-extension/src/lib/registries.ts

@@ -1,6 +1,6 @@
 import type { OverType } from '../overtype/mock-overtype'
 import type { CommentEnhancer, CommentSpot } from './enhancer'
-import { GitHubEnhancer } from './enhancers/github'
+import { GitHubAddCommentEnhancer } from './enhancers/github'
 
 export interface EnhancedTextarea<T extends CommentSpot = CommentSpot> {
   textarea: HTMLTextAreaElement
@@ -14,7 +14,7 @@ export class EnhancerRegistry {
 
   constructor() {
     // Register all available handlers
-    this.register(new GitHubEnhancer())
+    this.register(new GitHubAddCommentEnhancer())
   }
 
   private register<T extends CommentSpot>(handler: CommentEnhancer<T>): void {