@brunolemos/devhub-core 0.102.0 → 0.103.0

package/dist/types/github.d.ts

@@ -215,6 +215,7 @@ export interface GitHubPullRequest {
     url: string;
     repository_url: string;
 }
+export declare type GitHubEventPullRequest = Pick<GitHubPullRequest, 'id' | 'number' | 'head' | 'base' | 'url'> & Partial<Omit<GitHubPullRequest, 'id' | 'number' | 'head' | 'base' | 'url'>>;
 export interface GitHubRepo {
     id: number | string;
     name: string;
@@ -427,9 +428,9 @@ export interface GitHubPullRequestEvent {
     actor: GitHubUser;
     repo: GitHubRepo;
     payload: {
-        action: 'assigned' | 'unassigned' | 'labeled' | 'unlabeled' | 'opened' | 'edited' | 'closed' | 'reopened';
+        action: 'assigned' | 'unassigned' | 'labeled' | 'unlabeled' | 'opened' | 'edited' | 'closed' | 'merged' | 'reopened';
         number: number;
-        pull_request: GitHubPullRequest;
+        pull_request: GitHubEventPullRequest;
         sender: object;
     };
     public?: boolean;
@@ -445,7 +446,7 @@ export interface GitHubPullRequestReviewEvent {
     repo: GitHubRepo;
     payload: {
         action: 'submitted';
-        pull_request: GitHubPullRequest;
+        pull_request: GitHubEventPullRequest;
         review: object;
     };
     public?: boolean;
@@ -464,7 +465,7 @@ export interface GitHubPullRequestReviewCommentEvent {
     payload: {
         action: 'created' | 'edited' | 'deleted';
         changes?: object;
-        pull_request: GitHubPullRequest;
+        pull_request: GitHubEventPullRequest;
         comment: GitHubComment;
     };
     public?: boolean;
@@ -532,6 +533,7 @@ export declare type GitHubEventSubjectType = 'Branch' | 'Commit' | 'Issue' | 'Pu
 export declare type GitHubPrivacy = 'public' | 'private';
 export declare type GitHubStateType = 'open' | 'closed' | 'merged';
 export declare type GitHubIssueOrPullRequest = GitHubIssue | GitHubPullRequest;
+export declare type GitHubIssueOrPullRequestFromEvent = GitHubIssue | GitHubEventPullRequest;
 export declare type GitHubIssueOrPullRequestSubjectType = 'Issue' | 'PullRequest';
 export declare type GitHubItemSubjectType = GitHubEventSubjectType | GitHubNotificationSubjectType | GitHubIssueOrPullRequestSubjectType;
 export interface GitHubNotificationsOptions {

package/dist/utils/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":";;;AAEA,MAAM,GAAG,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA,CAAC,sBAAsB;AAEnD,QAAA,WAAW,GAAG,GAAG,GAAG,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAA;AAExE,MAAM,OAAO,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAA;AACrD,QAAA,QAAQ,GACnB,OAAO;IACP,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAA;AAEd,QAAA,OAAO,GAClB,mBAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAQ,IAAI,gBAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;AAE9D,QAAA,aAAa,GAAG,EAAE,CAAA;AAClB,QAAA,gBAAgB,GAAG,GAAG,CAAA;AACtB,QAAA,gBAAgB,GAAG,GAAG,CAAA;AAEtB,QAAA,kBAAkB,GAAG,KAAK,CAAA;AAC1B,QAAA,uBAAuB,GAAG,KAAK,CAAA;AAE/B,QAAA,kBAAkB,GAAc,WAAW,CAAA;AAC3C,QAAA,mBAAmB,GAAc,aAAa,CAAA;AAC9C,QAAA,kBAAkB,GAAc;IAC3C,EAAE,EAAE,MAAM;IACV,KAAK,EAAE,EAAE;CACV,CAAA;AAEY,QAAA,2BAA2B,GAAG,CAAC,eAAe,EAAE,YAAY,CAAC,CAAA;AAC7D,QAAA,+BAA+B,GAAG,mCAA2B,CAAC,QAAQ,CACjF,MAAM,CACP;IACC,CAAC,CAAC,mCAA2B;IAC7B,CAAC,CAAC,CAAC,GAAG,mCAA2B,EAAE,MAAM,CAAC,CAAA;AAE5C,kEAAkE;AAClE,mEAAmE;AACtD,QAAA,0BAA0B,GAAG,IAAI,CAAA;AAEjC,QAAA,2BAA2B,GAAG,IAAI,CAAA;AAClC,QAAA,yBAAyB,GAAG,IAAI,CAAA;AAChC,QAAA,2CAA2C,GAAG,IAAI,CAAA;AAElD,QAAA,gCAAgC,GAAG,IAAI,CAAA;AAEvC,QAAA,WAAW,GAAG,YAAY,CAAA;AAC1B,QAAA,aAAa,GAAG,eAAe,CAAA;AAE/B,QAAA,YAAY,GAAG,2BAA2B,CAAA;AAC1C,QAAA,eAAe,GAAG,4BAA4B,CAAA;AAC9C,QAAA,YAAY,GAAG,2BAA2B,CAAA;AAC1C,QAAA,gBAAgB,GAAG,GAAG,oBAAY,UAAU,CAAA;AAEzD,MAAM,gBAAgB,GAAG,uBAAuB,CAAA;AACnC,QAAA,YAAY,GAAG;IAC1B,iBAAiB,EAAE,gBAAgB;IACnC,YAAY,EAAE,GAAG,gBAAgB,UAAU;IAC3C,aAAa,EAAE,GAAG,gBAAgB,WAAW;IAC7C,YAAY,EAAE,GAAG,gBAAgB,UAAU;IAC3C,cAAc,EAAE,GAAG,gBAAgB,YAAY;IAC/C,gBAAgB,EAAE,6BAA6B;IAC/C,iBAAiB,EAAE,qCAAqC;IACxD,eAAe,EAAE,gCAAgC;CAClD,CAAA;AAEY,QAAA,oBAAoB,GAAG,QAAQ,CAAA;AAC/B,QAAA,kBAAkB,GAAG;IAChC,YAAY,EAAE,GAAG,4BAAoB,iBAAiB;IACtD,WAAW,EAAE,GAAG,4BAAoB,gBAAgB;IACpD,OAAO,EAAE,GAAG,4BAAoB,YAAY;IAC5C,KAAK,EAAE,GAAG,4BAAoB,UAAU;IACxC,SAAS,EAAE,GAAG,4BAAoB,aAAa;CAChD,CAAA;AAED,kBAAkB;AACL,QAAA,WAAW,GAAG,EAAE,CAAA;AAE7B,kBAAkB;AACL,QAAA,SAAS,GAAG,EAAE,CAAA"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":";;;AAEA,MAAM,GAAG,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA,CAAC,sBAAsB;AAEnD,QAAA,WAAW,GAAG,GAAG,GAAG,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAA;AAExE,MAAM,OAAO,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAA;AACrD,QAAA,QAAQ,GACnB,OAAO;IACP,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAA;AAEd,QAAA,OAAO,GAClB,mBAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAQ,IAAI,gBAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;AAE9D,QAAA,aAAa,GAAG,EAAE,CAAA;AAClB,QAAA,gBAAgB,GAAG,GAAG,CAAA;AACtB,QAAA,gBAAgB,GAAG,GAAG,CAAA;AAEtB,QAAA,kBAAkB,GAAG,KAAK,CAAA;AAC1B,QAAA,uBAAuB,GAAG,KAAK,CAAA;AAE/B,QAAA,kBAAkB,GAAc,WAAW,CAAA;AAC3C,QAAA,mBAAmB,GAAc,aAAa,CAAA;AAC9C,QAAA,kBAAkB,GAAc;IAC3C,EAAE,EAAE,MAAM;IACV,KAAK,EAAE,EAAE;CACV,CAAA;AAEY,QAAA,2BAA2B,GAAG,CAAC,eAAe,EAAE,YAAY,CAAC,CAAA;AAC7D,QAAA,+BAA+B,GAC1C,mCAA2B,CAAC,QAAQ,CAAC,MAAM,CAAC;IAC1C,CAAC,CAAC,mCAA2B;IAC7B,CAAC,CAAC,CAAC,GAAG,mCAA2B,EAAE,MAAM,CAAC,CAAA;AAE9C,kEAAkE;AAClE,mEAAmE;AACtD,QAAA,0BAA0B,GAAG,IAAI,CAAA;AAEjC,QAAA,2BAA2B,GAAG,IAAI,CAAA;AAClC,QAAA,yBAAyB,GAAG,IAAI,CAAA;AAChC,QAAA,2CAA2C,GAAG,IAAI,CAAA;AAElD,QAAA,gCAAgC,GAAG,IAAI,CAAA;AAEvC,QAAA,WAAW,GAAG,YAAY,CAAA;AAC1B,QAAA,aAAa,GAAG,eAAe,CAAA;AAE/B,QAAA,YAAY,GAAG,2BAA2B,CAAA;AAC1C,QAAA,eAAe,GAAG,4BAA4B,CAAA;AAC9C,QAAA,YAAY,GAAG,2BAA2B,CAAA;AAC1C,QAAA,gBAAgB,GAAG,GAAG,oBAAY,UAAU,CAAA;AAEzD,MAAM,gBAAgB,GAAG,uBAAuB,CAAA;AACnC,QAAA,YAAY,GAAG;IAC1B,iBAAiB,EAAE,gBAAgB;IACnC,YAAY,EAAE,GAAG,gBAAgB,UAAU;IAC3C,aAAa,EAAE,GAAG,gBAAgB,WAAW;IAC7C,YAAY,EAAE,GAAG,gBAAgB,UAAU;IAC3C,cAAc,EAAE,GAAG,gBAAgB,YAAY;IAC/C,gBAAgB,EAAE,6BAA6B;IAC/C,iBAAiB,EAAE,qCAAqC;IACxD,eAAe,EAAE,gCAAgC;CAClD,CAAA;AAEY,QAAA,oBAAoB,GAAG,QAAQ,CAAA;AAC/B,QAAA,kBAAkB,GAAG;IAChC,YAAY,EAAE,GAAG,4BAAoB,iBAAiB;IACtD,WAAW,EAAE,GAAG,4BAAoB,gBAAgB;IACpD,OAAO,EAAE,GAAG,4BAAoB,YAAY;IAC5C,KAAK,EAAE,GAAG,4BAAoB,UAAU;IACxC,SAAS,EAAE,GAAG,4BAAoB,aAAa;CAChD,CAAA;AAED,kBAAkB;AACL,QAAA,WAAW,GAAG,EAAE,CAAA;AAE7B,kBAAkB;AACL,QAAA,SAAS,GAAG,EAAE,CAAA"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@brunolemos/devhub-core",
-  "version": "0.102.0",
+  "version": "0.103.0",
   "private": false,
   "main": "dist/index.js",
   "scripts": {
     "clean": "shx rm -f *.tsbuildinfo && shx rm -rf dist && mkdirp dist",
     "compile": "tsc -b --incremental",
-    "format": "prettier --write '{.,src}/**.{js,jsx,ts,tsx}'",
+    "format": "prettier --write '{.,src}/**/*.{js,jsx,ts,tsx,json}'",
     "lint": "eslint src",
     "prepare": "cd .. && yarn patch-package",
     "prepublish": "yarn compile"
@@ -28,11 +28,11 @@
     "@types/lodash": "4.14.165",
     "@types/qs": "6.9.0",
     "mkdirp": "0.5.1",
-    "prettier": "2.2.1",
+    "prettier": "2.3.1",
     "shx": "0.3.3",
-    "typescript": "4.1.2"
+    "typescript": "4.3.4"
   },
   "peerDependencies": {
     "eslint": "*"
   }
-}
+}

package/src/helpers/filters.ts

@@ -62,7 +62,7 @@ export const filterRecordWithThisValueCount = (
 }
 
 export function itemPassesFilterRecord<
-  F extends Record<string, boolean | undefined>
+  F extends Record<string, boolean | undefined>,
 >(filtersRecord: F, value: keyof F, defaultValue: boolean) {
   if (!(filtersRecord && value)) return defaultValue
 

package/src/helpers/github/events.ts

@@ -1,9 +1,12 @@
+import axios from 'axios'
 import immer from 'immer'
 import _ from 'lodash'
 import moment from 'moment'
 
 import {
   EnhancedGitHubEvent,
+  EnhancementCache,
+  EventPayloadEnhancement,
   GenericIconProp,
   GitHubComment,
   GitHubCommitCommentEvent,
@@ -473,11 +476,14 @@ export function getEventMetadata(
               subjectType,
             }
 
+          case 'merged':
           case 'closed': {
-            const isMerged = !!(
-              event.payload.pull_request.merged ||
-              event.payload.pull_request.merged_at
-            )
+            const isMerged =
+              event.payload.action === 'merged' ||
+              !!(
+                event.payload.pull_request.merged ||
+                event.payload.pull_request.merged_at
+              )
 
             return {
               action: isMerged ? 'merged' : 'closed',
@@ -924,6 +930,8 @@ export function mergeEventPreservingEnhancement(
     any
   > = {
     enhanced: existingItem.enhanced,
+    enrichedPullRequest:
+      newItem.enrichedPullRequest || existingItem.enrichedPullRequest,
     last_read_at: _.max([existingItem.last_read_at, newItem.last_read_at]),
     last_saved_at: _.max([existingItem.last_saved_at, newItem.last_saved_at]),
     last_unread_at: _.max([
@@ -946,6 +954,144 @@ export function mergeEventPreservingEnhancement(
   })
 }
 
+export function createEventsCache(
+  events: EnhancedGitHubEvent[] | undefined,
+  _cache?: EnhancementCache | undefined,
+): EnhancementCache {
+  const cache = _cache || new Map()
+
+  if (!(events && events.length)) return cache
+
+  events.forEach((event) => {
+    if (event.enrichedPullRequest && event.enrichedPullRequest.url) {
+      if (!cache.has(event.enrichedPullRequest.url)) {
+        cache.set(event.enrichedPullRequest.url, {
+          data: event.enrichedPullRequest,
+          timestamp: new Date(event.created_at).valueOf(),
+        })
+      }
+    }
+  })
+
+  return cache
+}
+
+export async function getEventsEnhancementMap(
+  events: EnhancedGitHubEvent[],
+  {
+    cache = new Map(),
+    getGitHubPrivateTokenForRepo,
+    githubToken: _githubToken,
+  }: {
+    cache: EnhancementCache | undefined
+    getGitHubPrivateTokenForRepo: (
+      owner: string | undefined,
+      repo: string | undefined,
+    ) => string | undefined
+    githubToken: string
+  },
+): Promise<Record<string, EventPayloadEnhancement>> {
+  const promises = events.map(async (event) => {
+    if (event.enrichedPullRequest) return
+
+    const pr =
+      ('pull_request' in event.payload &&
+        (event.payload as any).pull_request) ||
+      undefined
+    if (!(pr && pr.url)) return
+
+    if (pr.html_url && pr.title) return
+
+    const repoFullName =
+      'repo' in event && event.repo ? getRepoFullNameFromObject(event.repo) : ''
+    const { owner, repo } = getOwnerAndRepo(repoFullName)
+
+    const privateToken = getGitHubPrivateTokenForRepo(owner, repo)
+    const githubToken = privateToken || _githubToken
+
+    const enhance: EventPayloadEnhancement = {}
+
+    const hasPRCache = cache.has(pr.url)
+    const prCache = cache.get(pr.url)
+
+    if (
+      !hasPRCache ||
+      (prCache &&
+        event.created_at &&
+        new Date(event.created_at).valueOf() > prCache.timestamp)
+    ) {
+      try {
+        const { data } = await axios.get(pr.url, {
+          headers: {
+            Authorization: githubToken && `token ${githubToken}`,
+          },
+        })
+        if (!(data && data.id)) throw new Error('Invalid response')
+
+        enhance.enrichedPullRequest = data
+        enhance.enhanced = true
+        cache.set(pr.url, { data, timestamp: Date.now() })
+      } catch (error) {
+        console.error('Failed to load pull request details', pr.url, error)
+        cache.set(pr.url, false)
+        if (!enhance.enhanced) enhance.enhanced = false
+        return
+      }
+    } else if (hasPRCache) {
+      if (prCache && prCache.data) {
+        enhance.enrichedPullRequest = prCache.data
+        enhance.enhanced = true
+      } else if (!enhance.enhanced) enhance.enhanced = false
+    }
+
+    if (!Object.keys(enhance).length) return
+
+    return { id: event.id, enhance }
+  })
+
+  const enhancements = await Promise.all(promises)
+
+  const enhancementMap: Record<string, EventPayloadEnhancement> =
+    enhancements.reduce(
+      (map, payload) =>
+        payload
+          ? {
+              ...map,
+              [payload.id]: payload.enhance,
+            }
+          : map,
+      {} as Record<string, EventPayloadEnhancement>,
+    )
+
+  return enhancementMap
+}
+
+export function enhanceEvents(
+  events: (GitHubEvent | EnhancedGitHubEvent)[],
+  enhancementMap: Record<string, EventPayloadEnhancement>,
+  currentEnhancedEvents: EnhancedGitHubEvent[] = [],
+) {
+  if (!(events && events.length)) return constants.EMPTY_ARRAY
+
+  return events.map((item) => {
+    const enhanced = currentEnhancedEvents.find((e) => e.id === item.id)
+
+    const enhance = enhancementMap[item.id]
+    if (!enhance) {
+      if (!enhanced) return item
+      return mergeEventPreservingEnhancement(
+        item as EnhancedGitHubEvent,
+        enhanced,
+      )
+    }
+
+    return {
+      ...mergeEventPreservingEnhancement(item as EnhancedGitHubEvent, enhanced),
+      ...enhance,
+    } as EnhancedGitHubEvent
+  })
+}
+
 export function getGitHubEventSubItems(
   event: EnhancedGitHubEvent,
   { plan }: { plan: UserPlan | null | undefined },
@@ -955,18 +1101,18 @@ export function getGitHubEventSubItems(
   const { repo: _repo } = event as GitHubEvent
   const { repos: _repos } = event as MultipleStarEvent
 
-  const comment:
-    | GitHubComment
-    | undefined = (payload as GitHubCommitCommentEvent['payload']).comment
+  const comment: GitHubComment | undefined = (
+    payload as GitHubCommitCommentEvent['payload']
+  ).comment
   const { commits: _commits } = payload as GitHubPushEvent['payload']
   const forkee: GitHubRepo | undefined = (payload as GitHubForkEvent['payload'])
     .forkee
   const { member: _member } = payload as GitHubMemberEvent['payload']
   const { release } = payload as GitHubReleaseEvent['payload']
   const { pages: _pages } = payload as GitHubGollumEvent['payload']
-  const {
-    pull_request: pullRequest,
-  } = payload as GitHubPullRequestEvent['payload']
+  const { pull_request: _payloadPullRequest } =
+    payload as GitHubPullRequestEvent['payload']
+  const pullRequest = event.enrichedPullRequest || _payloadPullRequest
   const { issue } = payload as GitHubIssuesEvent['payload']
   const { ref: branchOrTagRef } = payload as GitHubPushEvent['payload']
 

package/src/helpers/github/issues.ts

@@ -35,10 +35,8 @@ import {
   getRepoUrlFromOtherUrl,
 } from './url'
 
-export const issueOrPullRequestSubjectTypes: GitHubIssueOrPullRequestSubjectType[] = [
-  'Issue',
-  'PullRequest',
-]
+export const issueOrPullRequestSubjectTypes: GitHubIssueOrPullRequestSubjectType[] =
+  ['Issue', 'PullRequest']
 
 export function getIssueOrPullRequestIconAndColor(
   type: GitHubIssueOrPullRequestSubjectType,

package/src/helpers/github/notifications.ts

@@ -111,7 +111,7 @@ export function getNotificationIconAndColor(
 }
 
 export function getNotificationReasonMetadata<
-  T extends EnhancedGitHubNotification['reason']
+  T extends EnhancedGitHubNotification['reason'],
 >(
   reason: T,
 ): {
@@ -477,9 +477,10 @@ export async function getNotificationsEnhancementMap(
       enhance.pullRequest.requested_reviewers
     ) {
       if (!enhance.requestedMyReview) {
-        enhance.requestedMyReview = !!enhance.pullRequest.requested_reviewers.find(
-          (u) => githubLogin === `${u.login || ''}`.toLowerCase().trim(),
-        )
+        enhance.requestedMyReview =
+          !!enhance.pullRequest.requested_reviewers.find(
+            (u) => githubLogin === `${u.login || ''}`.toLowerCase().trim(),
+          )
       }
     }
 

package/src/helpers/github/shared.ts

@@ -16,6 +16,7 @@ import {
   GenericIconProp,
   GitHubAPIHeaders,
   GitHubComment,
+  GitHubEventPullRequest,
   GitHubIssueOrPullRequest,
   GitHubItemSubjectType,
   GitHubPrivacy,
@@ -311,6 +312,7 @@ export function getUserAvatarFromObject(
   { size }: { size?: number } = {},
   getPixelSizeForLayoutSizeFn: ((size: number) => number) | undefined,
 ) {
+  if (!user) return undefined
   if (!(user.avatar_url || user.id || user.login)) return undefined
 
   const baseURL =
@@ -337,9 +339,10 @@ export function getUserAvatarFromObject(
   )
 }
 
-export function tryGetIdAndUsernameFromGitHubEmail(
-  email?: string,
-): { id: string | undefined; username: string | undefined } {
+export function tryGetIdAndUsernameFromGitHubEmail(email?: string): {
+  id: string | undefined
+  username: string | undefined
+} {
   if (!email) return { id: undefined, username: undefined }
 
   const emailSplit = email.split('@')
@@ -399,9 +402,10 @@ export function isPullRequest(issue: {
   )
 }
 
-export function getOwnerAndRepo(
-  repoFullName: string | undefined,
-): { owner: string | undefined; repo: string | undefined } {
+export function getOwnerAndRepo(repoFullName: string | undefined): {
+  owner: string | undefined
+  repo: string | undefined
+} {
   if (!repoFullName) return { owner: '', repo: '' }
 
   const repoSplitedNames = (repoFullName || '')
@@ -769,10 +773,8 @@ export function getColumnHeaderDetails(
     case 'issue_or_pr': {
       const s = subscription as Partial<IssueOrPullRequestColumnSubscription>
 
-      const {
-        allIncludedOwners,
-        allIncludedRepos,
-      } = getOwnerAndRepoFormattedFilter(column.filters)
+      const { allIncludedOwners, allIncludedRepos } =
+        getOwnerAndRepoFormattedFilter(column.filters)
 
       const owner =
         allIncludedOwners.length === 1 ? allIncludedOwners[0] : undefined
@@ -782,13 +784,10 @@ export function getColumnHeaderDetails(
           ? getOwnerAndRepo(allIncludedRepos[0])
           : { owner: undefined, repo: undefined }
 
-      const {
-        includedUsernames,
-        excludedUsernames,
-        usedUsernameFilterKeys,
-      } = getUsernamesFromFilter('issue_or_pr', column.filters, {
-        blacklist: ['owner'],
-      })
+      const { includedUsernames, excludedUsernames, usedUsernameFilterKeys } =
+        getUsernamesFromFilter('issue_or_pr', column.filters, {
+          blacklist: ['owner'],
+        })
 
       const usernames =
         (includedUsernames && includedUsernames.length
@@ -925,7 +924,7 @@ export function getColumnHeaderDetails(
 }
 
 export function createSubscriptionObjectWithId<
-  S extends Pick<ColumnSubscription, 'type' | 'subtype' | 'params'>
+  S extends Pick<ColumnSubscription, 'type' | 'subtype' | 'params'>,
 >(subscription: S) {
   return {
     ...subscription,
@@ -934,7 +933,7 @@ export function createSubscriptionObjectWithId<
 }
 
 export function createSubscriptionObjectsWithId<
-  S extends Pick<ColumnSubscription, 'type' | 'subtype' | 'params'>[]
+  S extends Pick<ColumnSubscription, 'type' | 'subtype' | 'params'>[],
 >(subscriptions: S) {
   return subscriptions.map((subscription) => ({
     ...subscription,
@@ -1010,11 +1009,11 @@ export function getTagIconAndColor(): GenericIconProp & {
 }
 
 export function getPullRequestIconAndColor(pullRequest: {
-  draft: GitHubPullRequest['draft']
-  state: GitHubPullRequest['state']
-  merged: GitHubPullRequest['merged'] | undefined
-  merged_at: GitHubPullRequest['merged_at'] | undefined
-  mergeable_state: GitHubPullRequest['mergeable_state'] | undefined
+  draft?: GitHubPullRequest['draft']
+  state?: GitHubPullRequest['state']
+  merged?: GitHubPullRequest['merged']
+  merged_at?: GitHubPullRequest['merged_at']
+  mergeable_state?: GitHubPullRequest['mergeable_state']
 }): GenericIconProp & { color?: keyof ThemeColors; tooltip: string } {
   const draft = isDraft(pullRequest)
   const state = getIssueOrPullRequestState(pullRequest)
@@ -1097,7 +1096,7 @@ export function getStateTypeMetadata<T extends GitHubStateType>(
   label: string
   state: T
 } {
-  switch (state as GitHubStateType) {
+  switch (state) {
     case 'open': {
       return {
         color: 'green',
@@ -1139,7 +1138,7 @@ export function getSubjectTypeMetadata<T extends GitHubItemSubjectType>(
   label: string
   subjectType: T
 } {
-  switch (subjectType as GitHubItemSubjectType) {
+  switch (subjectType) {
     case 'PullRequestReview': {
       return {
         label: 'Pull Request Review',
@@ -1225,7 +1224,7 @@ export function getItemPrivacy(
 export function getItemIssueOrPullRequest(
   type: ColumnSubscription['type'],
   item: EnhancedItem | undefined,
-): GitHubIssueOrPullRequest | undefined {
+): GitHubIssueOrPullRequest | GitHubEventPullRequest | undefined {
   if (!item) return undefined
 
   switch (type) {
@@ -1624,9 +1623,8 @@ export function getItemsFilterMetadata(
 
     if (subscriptionReason) {
       if (!result.subscriptionReason[subscriptionReason])
-        result.subscriptionReason[
-          subscriptionReason
-        ] = getDefaultItemFilterCountMetadata()
+        result.subscriptionReason[subscriptionReason] =
+          getDefaultItemFilterCountMetadata()
       updateNestedCounter(result.subscriptionReason[subscriptionReason]!)
     }
 

package/src/helpers/oauth.ts

@@ -1,8 +1,9 @@
 import { GitHubTokenDetails, OAuthResponseData } from '../types'
 
-export function tryParseOAuthParams(
-  params: OAuthResponseData,
-): { appToken?: string; tokenDetails?: GitHubTokenDetails } {
+export function tryParseOAuthParams(params: OAuthResponseData): {
+  appToken?: string
+  tokenDetails?: GitHubTokenDetails
+} {
   try {
     if (!(params && params.app_token && params.github_token))
       throw new Error('No token received.')

package/src/helpers/shared.ts

@@ -224,7 +224,7 @@ export function deepMapper<T extends object, R = T>(
 
 const urlsToKeep = ['url', 'html_url', 'avatar_url', 'latest_comment_url']
 export function removeUselessURLsFromResponseItem<
-  T extends Record<string, any>
+  T extends Record<string, any>,
 >(item: T) {
   let hasChanged = false
   const result = deepMapper(item, (obj) => {
@@ -386,14 +386,12 @@ export function getSubscriptionOwnerOrOrg(
   if ('org' in subscription.params && subscription.params.org)
     return subscription.params.org
 
-  const {
-    allIncludedOwners,
-    allIncludedRepos,
-  } = getOwnerAndRepoFormattedFilter(
-    'owners' in subscription.params
-      ? { owners: subscription.params.owners }
-      : undefined,
-  )
+  const { allIncludedOwners, allIncludedRepos } =
+    getOwnerAndRepoFormattedFilter(
+      'owners' in subscription.params
+        ? { owners: subscription.params.owners }
+        : undefined,
+    )
 
   const _org = allIncludedOwners.length === 1 ? allIncludedOwners[0] : undefined
   const _ownerAndRepo =
@@ -799,10 +797,9 @@ export function getFilterFromSearchQuery(
 
           case 'pr': {
             filters.subjectTypes = filters.subjectTypes || {}
-            ;(filters.subjectTypes as Record<
-              GitHubItemSubjectType,
-              boolean
-            >).PullRequest = !isNegated
+            ;(
+              filters.subjectTypes as Record<GitHubItemSubjectType, boolean>
+            ).PullRequest = !isNegated
             break
           }
 
@@ -825,10 +822,12 @@ export function getFilterFromSearchQuery(
 
               validSubjectTypes.forEach((subjectType) => {
                 if (subjectType.toLowerCase() === value) {
-                  ;(filters.subjectTypes as Record<
-                    GitHubItemSubjectType,
-                    boolean
-                  >)[subjectType] = !isNegated
+                  ;(
+                    filters.subjectTypes as Record<
+                      GitHubItemSubjectType,
+                      boolean
+                    >
+                  )[subjectType] = !isNegated
                 }
               })
               break
@@ -859,9 +858,8 @@ export function getFilterFromSearchQuery(
         // invalid
         if (!eventActions.includes(action as GitHubEventAction)) return
 
-        activityFilters.activity.actions[
-          action as GitHubEventAction
-        ] = !isNegated
+        activityFilters.activity.actions[action as GitHubEventAction] =
+          !isNegated
         break
       }
 
@@ -916,9 +914,8 @@ export function getFilterFromSearchQuery(
         )
           return
 
-        reasonsFilter[
-          reason as EnhancedGitHubNotification['reason']
-        ] = !isNegated
+        reasonsFilter[reason as EnhancedGitHubNotification['reason']] =
+          !isNegated
         break
       }
 
@@ -961,7 +958,7 @@ export function getValuesFromQueryKeysFilter(
     }) || undefined
   const queryTerms = getSearchQueryTerms(filtersQuery)
 
-  const filteredQueryTerms = (_.sortBy(
+  const filteredQueryTerms = _.sortBy(
     queryTerms.filter(
       (queryTerm) =>
         queryTerm &&
@@ -969,7 +966,7 @@ export function getValuesFromQueryKeysFilter(
         queryKeys.includes(queryTerm[0] as any),
     ),
     ['0', '2'],
-  ) as any) as [string, string, boolean][]
+  ) as any as [string, string, boolean][]
   const usedQueryKeys = _.uniq(
     filteredQueryTerms.map((queryTerm) => queryTerm[0]),
   )
@@ -1049,12 +1046,8 @@ export function getUsernamesFromFilter(
 ) {
   const usernameFilterKeys = whitelist.filter((key) => !blacklist.includes(key))
 
-  const {
-    all,
-    excluded,
-    included,
-    usedQueryKeys,
-  } = getValuesFromQueryKeysFilter(type, usernameFilterKeys, filters)
+  const { all, excluded, included, usedQueryKeys } =
+    getValuesFromQueryKeysFilter(type, usernameFilterKeys, filters)
 
   return {
     allUsernames: all,
@@ -1111,7 +1104,9 @@ export function getItemsFromSubscriptions(
     return sortNotifications(result as EnhancedGitHubNotification[])
   }
 
-  console.error(`Unhandled subscription type: ${subscriptions[0]!.type}`)
+  console.error(
+    `Unhandled subscription type: ${((subscriptions[0] as any) || {}).type}`,
+  )
   return result
 }