improve app bot detection

Thomas Stromberg · Thomas Stromberg · commit 35ba2605d031 · 2025-10-23T20:00:18.000-04:00
diff --git a/pkg/prx/graphql_complete.go b/pkg/prx/graphql_complete.go
@@ -256,10 +256,14 @@ query($owner: String!, $repo: String!, $number: Int!, $prCursor: String, $review
 						id
 						createdAt
 						actor {
+							__typename
 							login
 							... on User {
 								id
 							}
+							... on Bot {
+								id
+							}
 						}
 						assignee {
 							... on User {
@@ -276,6 +280,7 @@ query($owner: String!, $repo: String!, $number: Int!, $prCursor: String, $review
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 						assignee {
@@ -292,6 +297,7 @@ query($owner: String!, $repo: String!, $number: Int!, $prCursor: String, $review
 							name
 						}
 						actor {
+							__typename
 							login
 						}
 					}
@@ -302,6 +308,7 @@ query($owner: String!, $repo: String!, $number: Int!, $prCursor: String, $review
 							name
 						}
 						actor {
+							__typename
 							login
 						}
 					}
@@ -310,6 +317,7 @@ query($owner: String!, $repo: String!, $number: Int!, $prCursor: String, $review
 						createdAt
 						milestoneTitle
 						actor {
+							__typename
 							login
 						}
 					}
@@ -318,13 +326,15 @@ query($owner: String!, $repo: String!, $number: Int!, $prCursor: String, $review
 						createdAt
 						milestoneTitle
 						actor {
+							__typename
 							login
 						}
 					}
 					... on ReviewRequestedEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 						requestedReviewer {
@@ -346,6 +356,7 @@ query($owner: String!, $repo: String!, $number: Int!, $prCursor: String, $review
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 						requestedReviewer {
@@ -361,62 +372,71 @@ query($owner: String!, $repo: String!, $number: Int!, $prCursor: String, $review
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on ReopenedEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on MergedEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on MentionedEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on ReadyForReviewEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on ConvertToDraftEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on AutoMergeEnabledEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on AutoMergeDisabledEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on ReviewDismissedEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 						dismissalMessage
@@ -425,13 +445,15 @@ query($owner: String!, $repo: String!, $number: Int!, $prCursor: String, $review
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on RenamedTitleEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 						previousTitle
@@ -441,153 +463,175 @@ query($owner: String!, $repo: String!, $number: Int!, $prCursor: String, $review
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on BaseRefForcePushedEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on HeadRefForcePushedEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on HeadRefRestoredEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on LockedEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on UnlockedEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on AddedToMergeQueueEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on RemovedFromMergeQueueEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on AutomaticBaseChangeSucceededEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on AutomaticBaseChangeFailedEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on ConnectedEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on DisconnectedEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on CrossReferencedEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on ReferencedEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on SubscribedEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on UnsubscribedEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on DeployedEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on DeploymentEnvironmentChangedEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on PinnedEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on UnpinnedEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on TransferredEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
 					... on UserBlockedEvent {
 						id
 						createdAt
 						actor {
+							__typename
 							login
 						}
 					}
@@ -917,13 +961,20 @@ type graphQLPullRequestComplete struct {
 type graphQLActor struct {
 	Login string `json:"login"`
 	ID    string `json:"id,omitempty"`
+	Type  string `json:"type,omitempty"`
 }
 
 // isBot determines if an actor is a bot.
 func isBot(actor graphQLActor) bool {
 	if actor.Login == "" {
 		return false
 	}
+
+	// Check the Type field first - most reliable signal from GitHub API
+	if actor.Type == "Bot" {
+		return true
+	}
+
 	// Check for bot patterns in login (case-insensitive for better detection)
 	login := actor.Login
 	lowerLogin := strings.ToLower(login)
@@ -1303,6 +1354,9 @@ func (*Client) parseGraphQLTimelineEvent(_ /* ctx */ context.Context, item map[s
 			if id, ok := actor["id"].(string); ok {
 				actorObj.ID = id
 			}
+			if typ, ok := actor["__typename"].(string); ok {
+				actorObj.Type = typ
+			}
 			return isBot(actorObj)
 		}
 		return false
diff --git a/pkg/prx/graphql_parity_test.go b/pkg/prx/graphql_parity_test.go
@@ -158,6 +158,21 @@ func TestGraphQLBotDetection(t *testing.T) {
 		actor    graphQLActor
 		expected bool
 	}{
+		{
+			name:     "bot type field",
+			actor:    graphQLActor{Login: "ready-to-review-beta", Type: "Bot"},
+			expected: true,
+		},
+		{
+			name:     "bot type with any login",
+			actor:    graphQLActor{Login: "some-app", Type: "Bot"},
+			expected: true,
+		},
+		{
+			name:     "user type field",
+			actor:    graphQLActor{Login: "octocat", Type: "User"},
+			expected: false,
+		},
 		{
 			name:     "bot suffix with brackets",
 			actor:    graphQLActor{Login: "dependabot[bot]"},

Original file line number	Diff line number	Diff line change
`@@ -256,10 +256,14 @@ query($owner: String!, $repo: String!, $number: Int!, $prCursor: String, $review`
`256`	`256`	`id`
`257`	`257`	`createdAt`
`258`	`258`	`actor {`
	`259`	`+ __typename`
`259`	`260`	`login`
`260`	`261`	`... on User {`
`261`	`262`	`id`
`262`	`263`	`}`
	`264`	`+ ... on Bot {`
	`265`	`+ id`
	`266`	`+ }`
`263`	`267`	`}`
`264`	`268`	`assignee {`
`265`	`269`	`... on User {`
`@@ -276,6 +280,7 @@ query($owner: String!, $repo: String!, $number: Int!, $prCursor: String, $review`
`276`	`280`	`id`
`277`	`281`	`createdAt`
`278`	`282`	`actor {`
	`283`	`+ __typename`
`279`	`284`	`login`
`280`	`285`	`}`
`281`	`286`	`assignee {`
`@@ -292,6 +297,7 @@ query($owner: String!, $repo: String!, $number: Int!, $prCursor: String, $review`
`292`	`297`	`name`
`293`	`298`	`}`
`294`	`299`	`actor {`
	`300`	`+ __typename`
`295`	`301`	`login`
`296`	`302`	`}`
`297`	`303`	`}`
`@@ -302,6 +308,7 @@ query($owner: String!, $repo: String!, $number: Int!, $prCursor: String, $review`
`302`	`308`	`name`
`303`	`309`	`}`
`304`	`310`	`actor {`
	`311`	`+ __typename`
`305`	`312`	`login`
`306`	`313`	`}`
`307`	`314`	`}`
`@@ -310,6 +317,7 @@ query($owner: String!, $repo: String!, $number: Int!, $prCursor: String, $review`
`310`	`317`	`createdAt`
`311`	`318`	`milestoneTitle`
`312`	`319`	`actor {`
	`320`	`+ __typename`
`313`	`321`	`login`
`314`	`322`	`}`
`315`	`323`	`}`
`@@ -318,13 +326,15 @@ query($owner: String!, $repo: String!, $number: Int!, $prCursor: String, $review`
`318`	`326`	`createdAt`
`319`	`327`	`milestoneTitle`
`320`	`328`	`actor {`
	`329`	`+ __typename`
`321`	`330`	`login`
`322`	`331`	`}`
`323`	`332`	`}`
`324`	`333`	`... on ReviewRequestedEvent {`
`325`	`334`	`id`
`326`	`335`	`createdAt`
`327`	`336`	`actor {`
	`337`	`+ __typename`
`328`	`338`	`login`
`329`	`339`	`}`
`330`	`340`	`requestedReviewer {`
`@@ -346,6 +356,7 @@ query($owner: String!, $repo: String!, $number: Int!, $prCursor: String, $review`
`346`	`356`	`id`
`347`	`357`	`createdAt`
`348`	`358`	`actor {`
	`359`	`+ __typename`
`349`	`360`	`login`
`350`	`361`	`}`
`351`	`362`	`requestedReviewer {`
`@@ -361,62 +372,71 @@ query($owner: String!, $repo: String!, $number: Int!, $prCursor: String, $review`
`361`	`372`	`id`
`362`	`373`	`createdAt`
`363`	`374`	`actor {`
	`375`	`+ __typename`
`364`	`376`	`login`
`365`	`377`	`}`
`366`	`378`	`}`
`367`	`379`	`... on ReopenedEvent {`
`368`	`380`	`id`
`369`	`381`	`createdAt`
`370`	`382`	`actor {`
	`383`	`+ __typename`
`371`	`384`	`login`
`372`	`385`	`}`
`373`	`386`	`}`
`374`	`387`	`... on MergedEvent {`
`375`	`388`	`id`
`376`	`389`	`createdAt`
`377`	`390`	`actor {`
	`391`	`+ __typename`
`378`	`392`	`login`
`379`	`393`	`}`
`380`	`394`	`}`
`381`	`395`	`... on MentionedEvent {`
`382`	`396`	`id`
`383`	`397`	`createdAt`
`384`	`398`	`actor {`
	`399`	`+ __typename`
`385`	`400`	`login`
`386`	`401`	`}`
`387`	`402`	`}`
`388`	`403`	`... on ReadyForReviewEvent {`
`389`	`404`	`id`
`390`	`405`	`createdAt`
`391`	`406`	`actor {`
	`407`	`+ __typename`
`392`	`408`	`login`
`393`	`409`	`}`
`394`	`410`	`}`
`395`	`411`	`... on ConvertToDraftEvent {`
`396`	`412`	`id`
`397`	`413`	`createdAt`
`398`	`414`	`actor {`
	`415`	`+ __typename`
`399`	`416`	`login`
`400`	`417`	`}`
`401`	`418`	`}`
`402`	`419`	`... on AutoMergeEnabledEvent {`
`403`	`420`	`id`
`404`	`421`	`createdAt`
`405`	`422`	`actor {`
	`423`	`+ __typename`
`406`	`424`	`login`
`407`	`425`	`}`
`408`	`426`	`}`
`409`	`427`	`... on AutoMergeDisabledEvent {`
`410`	`428`	`id`
`411`	`429`	`createdAt`
`412`	`430`	`actor {`
	`431`	`+ __typename`
`413`	`432`	`login`
`414`	`433`	`}`
`415`	`434`	`}`
`416`	`435`	`... on ReviewDismissedEvent {`
`417`	`436`	`id`
`418`	`437`	`createdAt`
`419`	`438`	`actor {`
	`439`	`+ __typename`
`420`	`440`	`login`
`421`	`441`	`}`
`422`	`442`	`dismissalMessage`
`@@ -425,13 +445,15 @@ query($owner: String!, $repo: String!, $number: Int!, $prCursor: String, $review`
`425`	`445`	`id`
`426`	`446`	`createdAt`
`427`	`447`	`actor {`
	`448`	`+ __typename`
`428`	`449`	`login`
`429`	`450`	`}`
`430`	`451`	`}`
`431`	`452`	`... on RenamedTitleEvent {`
`432`	`453`	`id`
`433`	`454`	`createdAt`
`434`	`455`	`actor {`
	`456`	`+ __typename`
`435`	`457`	`login`
`436`	`458`	`}`
`437`	`459`	`previousTitle`
`@@ -441,153 +463,175 @@ query($owner: String!, $repo: String!, $number: Int!, $prCursor: String, $review`
`441`	`463`	`id`
`442`	`464`	`createdAt`
`443`	`465`	`actor {`
	`466`	`+ __typename`
`444`	`467`	`login`
`445`	`468`	`}`
`446`	`469`	`}`
`447`	`470`	`... on BaseRefForcePushedEvent {`
`448`	`471`	`id`
`449`	`472`	`createdAt`
`450`	`473`	`actor {`
	`474`	`+ __typename`
`451`	`475`	`login`
`452`	`476`	`}`
`453`	`477`	`}`
`454`	`478`	`... on HeadRefForcePushedEvent {`
`455`	`479`	`id`
`456`	`480`	`createdAt`
`457`	`481`	`actor {`
	`482`	`+ __typename`
`458`	`483`	`login`
`459`	`484`	`}`
`460`	`485`	`}`
`461`	`486`	`... on HeadRefRestoredEvent {`
`462`	`487`	`id`
`463`	`488`	`createdAt`
`464`	`489`	`actor {`
	`490`	`+ __typename`
`465`	`491`	`login`
`466`	`492`	`}`
`467`	`493`	`}`
`468`	`494`	`... on LockedEvent {`
`469`	`495`	`id`
`470`	`496`	`createdAt`
`471`	`497`	`actor {`
	`498`	`+ __typename`
`472`	`499`	`login`
`473`	`500`	`}`
`474`	`501`	`}`
`475`	`502`	`... on UnlockedEvent {`
`476`	`503`	`id`
`477`	`504`	`createdAt`
`478`	`505`	`actor {`
	`506`	`+ __typename`
`479`	`507`	`login`
`480`	`508`	`}`
`481`	`509`	`}`
`482`	`510`	`... on AddedToMergeQueueEvent {`
`483`	`511`	`id`
`484`	`512`	`createdAt`
`485`	`513`	`actor {`
	`514`	`+ __typename`
`486`	`515`	`login`
`487`	`516`	`}`
`488`	`517`	`}`
`489`	`518`	`... on RemovedFromMergeQueueEvent {`
`490`	`519`	`id`
`491`	`520`	`createdAt`
`492`	`521`	`actor {`
	`522`	`+ __typename`
`493`	`523`	`login`
`494`	`524`	`}`
`495`	`525`	`}`
`496`	`526`	`... on AutomaticBaseChangeSucceededEvent {`
`497`	`527`	`id`
`498`	`528`	`createdAt`
`499`	`529`	`actor {`
	`530`	`+ __typename`
`500`	`531`	`login`
`501`	`532`	`}`
`502`	`533`	`}`
`503`	`534`	`... on AutomaticBaseChangeFailedEvent {`
`504`	`535`	`id`
`505`	`536`	`createdAt`
`506`	`537`	`actor {`
	`538`	`+ __typename`
`507`	`539`	`login`
`508`	`540`	`}`
`509`	`541`	`}`
`510`	`542`	`... on ConnectedEvent {`
`511`	`543`	`id`
`512`	`544`	`createdAt`
`513`	`545`	`actor {`
	`546`	`+ __typename`
`514`	`547`	`login`
`515`	`548`	`}`
`516`	`549`	`}`
`517`	`550`	`... on DisconnectedEvent {`
`518`	`551`	`id`
`519`	`552`	`createdAt`
`520`	`553`	`actor {`
	`554`	`+ __typename`
`521`	`555`	`login`
`522`	`556`	`}`
`523`	`557`	`}`
`524`	`558`	`... on CrossReferencedEvent {`
`525`	`559`	`id`
`526`	`560`	`createdAt`
`527`	`561`	`actor {`
	`562`	`+ __typename`
`528`	`563`	`login`
`529`	`564`	`}`
`530`	`565`	`}`
`531`	`566`	`... on ReferencedEvent {`
`532`	`567`	`id`
`533`	`568`	`createdAt`
`534`	`569`	`actor {`
	`570`	`+ __typename`
`535`	`571`	`login`
`536`	`572`	`}`
`537`	`573`	`}`
`538`	`574`	`... on SubscribedEvent {`
`539`	`575`	`id`
`540`	`576`	`createdAt`
`541`	`577`	`actor {`
	`578`	`+ __typename`
`542`	`579`	`login`
`543`	`580`	`}`
`544`	`581`	`}`
`545`	`582`	`... on UnsubscribedEvent {`
`546`	`583`	`id`
`547`	`584`	`createdAt`
`548`	`585`	`actor {`
	`586`	`+ __typename`
`549`	`587`	`login`
`550`	`588`	`}`
`551`	`589`	`}`
`552`	`590`	`... on DeployedEvent {`
`553`	`591`	`id`
`554`	`592`	`createdAt`
`555`	`593`	`actor {`
	`594`	`+ __typename`
`556`	`595`	`login`
`557`	`596`	`}`
`558`	`597`	`}`
`559`	`598`	`... on DeploymentEnvironmentChangedEvent {`
`560`	`599`	`id`
`561`	`600`	`createdAt`
`562`	`601`	`actor {`
	`602`	`+ __typename`
`563`	`603`	`login`
`564`	`604`	`}`
`565`	`605`	`}`
`566`	`606`	`... on PinnedEvent {`
`567`	`607`	`id`
`568`	`608`	`createdAt`
`569`	`609`	`actor {`
	`610`	`+ __typename`
`570`	`611`	`login`
`571`	`612`	`}`
`572`	`613`	`}`
`573`	`614`	`... on UnpinnedEvent {`
`574`	`615`	`id`
`575`	`616`	`createdAt`
`576`	`617`	`actor {`
	`618`	`+ __typename`
`577`	`619`	`login`
`578`	`620`	`}`
`579`	`621`	`}`
`580`	`622`	`... on TransferredEvent {`
`581`	`623`	`id`
`582`	`624`	`createdAt`
`583`	`625`	`actor {`
	`626`	`+ __typename`
`584`	`627`	`login`
`585`	`628`	`}`
`586`	`629`	`}`
`587`	`630`	`... on UserBlockedEvent {`
`588`	`631`	`id`
`589`	`632`	`createdAt`
`590`	`633`	`actor {`
	`634`	`+ __typename`
`591`	`635`	`login`
`592`	`636`	`}`
`593`	`637`	`}`
`@@ -917,13 +961,20 @@ type graphQLPullRequestComplete struct {`
`917`	`961`	`type graphQLActor struct {`
`918`	`962`	Login string `json:"login"`
`919`	`963`	ID string `json:"id,omitempty"`
	`964`	+ Type string `json:"type,omitempty"`
`920`	`965`	`}`
`921`	`966`
`922`	`967`	`// isBot determines if an actor is a bot.`
`923`	`968`	`func isBot(actor graphQLActor) bool {`
`924`	`969`	`if actor.Login == "" {`
`925`	`970`	`return false`
`926`	`971`	`}`
	`972`	`+`
	`973`	`+ // Check the Type field first - most reliable signal from GitHub API`
	`974`	`+ if actor.Type == "Bot" {`
	`975`	`+ return true`
	`976`	`+ }`
	`977`	`+`
`927`	`978`	`// Check for bot patterns in login (case-insensitive for better detection)`
`928`	`979`	`login := actor.Login`
`929`	`980`	`lowerLogin := strings.ToLower(login)`
`@@ -1303,6 +1354,9 @@ func (Client) parseGraphQLTimelineEvent(_ / ctx */ context.Context, item map[s`
`1303`	`1354`	`if id, ok := actor["id"].(string); ok {`
`1304`	`1355`	`actorObj.ID = id`
`1305`	`1356`	`}`
	`1357`	`+ if typ, ok := actor["__typename"].(string); ok {`
	`1358`	`+ actorObj.Type = typ`
	`1359`	`+ }`
`1306`	`1360`	`return isBot(actorObj)`
`1307`	`1361`	`}`
`1308`	`1362`	`return false`