Remove greebles.

Author: nedtwigg

browser-extension/src/entrypoints/background.ts

@@ -1,4 +1,4 @@
-import type { BackgroundMessage, CommentDraft, CommentSpot } from '../lib/enhancer'
+import type { CommentDraft, CommentEvent, CommentSpot } from '../lib/enhancer'
 import { JsonMap } from '../lib/jsonmap'
 
 interface Tab {
@@ -15,29 +15,32 @@ interface CommentState {
   drafts: [number, CommentDraft][]
 }
 
-const _states = new JsonMap<TabAndSpot, CommentState>()
-
-browser.runtime.onMessage.addListener((message: BackgroundMessage, sender) => {
-  if (message.action === 'COMMENT_EVENT' && sender.tab?.id && sender.tab?.windowId) {
+const states = new JsonMap<TabAndSpot, CommentState>()
+browser.runtime.onMessage.addListener((message: CommentEvent, sender) => {
+  if (
+    (message.type === 'ENHANCED' || message.type === 'DESTROYED') &&
+    sender.tab?.id &&
+    sender.tab?.windowId
+  ) {
     const tab: Tab = {
       tabId: sender.tab.id,
       windowId: sender.tab.windowId,
     }
 
     const tabAndSpot: TabAndSpot = {
-      spot: message.event.spot,
+      spot: message.spot,
       tab,
     }
 
-    if (message.event.type === 'ENHANCED') {
+    if (message.type === 'ENHANCED') {
       const commentState: CommentState = {
         drafts: [],
-        spot: message.event.spot,
+        spot: message.spot,
         tab,
       }
-      _states.set(tabAndSpot, commentState)
-    } else if (message.event.type === 'DESTROYED') {
-      _states.delete(tabAndSpot)
+      states.set(tabAndSpot, commentState)
+    } else if (message.type === 'DESTROYED') {
+      states.delete(tabAndSpot)
     }
   }
 })

browser-extension/src/entrypoints/content.ts

@@ -1,5 +1,5 @@
 import { CONFIG, type ModeType } from '../lib/config'
-import type { BackgroundMessage, CommentSpot } from '../lib/enhancer'
+import type { CommentEvent, CommentSpot } from '../lib/enhancer'
 import { logger } from '../lib/logger'
 import { EnhancerRegistry, TextareaRegistry } from '../lib/registries'
 import { githubPrNewCommentContentScript } from '../playgrounds/github-playground'
@@ -8,9 +8,10 @@ const enhancers = new EnhancerRegistry()
 const enhancedTextareas = new TextareaRegistry()
 
 function sendEventToBackground(type: 'ENHANCED' | 'DESTROYED', spot: CommentSpot): void {
-  const message: BackgroundMessage = {
-    action: 'COMMENT_EVENT',
-    event: { spot, type },
+  const message: CommentEvent = {
+    draft: undefined,
+    spot,
+    type,
   }
   browser.runtime.sendMessage(message).catch((error) => {
     logger.debug('Failed to send event to background:', error)

browser-extension/src/lib/enhancer.ts

@@ -23,14 +23,6 @@ export interface CommentEvent {
   draft: CommentDraft | undefined
 }
 
-export interface BackgroundMessage {
-  action: 'COMMENT_EVENT'
-  event: {
-    type: Extract<CommentEventType, 'ENHANCED' | 'DESTROYED'>
-    spot: CommentSpot
-  }
-}
-
 /** Wraps the textareas of a given platform with Gitcasso's enhancements. */
 export interface CommentEnhancer<Spot extends CommentSpot = CommentSpot> {
   /** Guarantees to only return a type within this list. */