Skip to content

fix: extend gitHub noreply matching to username-typed identities #4110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skwowet merged 3 commits into from
May 14, 2026
+8 −8
Merged

fix: extend gitHub noreply matching to username-typed identities #4110

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97e8688
fix: extend gitHub noreply matching to username-typed identities
skwowet May 13, 2026
dedb570
Merge branch 'main' into bugfix/gh-noreply-merge-suggestions
skwowet May 13, 2026
66f00e9
Merge branch 'main' into bugfix/gh-noreply-merge-suggestions
skwowet May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions services/apps/merge_suggestions_worker/src/activities/memberMergeSuggestions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ export async function getMemberMergeSuggestions(
targetLists.usernameEmail.push({ value })
}

// Noreply email -> platform username extraction
if (isEmail && verified) {
// No type check — git ingest stores noreply addresses as type=username, not type=email.
if (verified) {
const ghUsername = parseGitHubNoreplyEmail(value)
if (ghUsername) {
noreplyEmailUsernameMatches.push({ value: ghUsername, platform: PlatformType.GITHUB })
Expand Down
12 changes: 6 additions & 6 deletions services/apps/merge_suggestions_worker/src/memberSimilarityCalculator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,14 +213,14 @@ class MemberSimilarityCalculator {
}

/**
* Checks if a noreply email in one member matches a username in the other (e.g. GitHub noreply email -> GitHub username)
* Works bidirectionally: primary email -> similar username, and similar email -> primary username.
* Checks bidirectionally if a noreply address on one member resolves to a platform username on the other.
* No identity type filter — git ingest stores noreply addresses as type=username, not type=email.
*/
static hasMatchingUsernameFromNoreplyEmail(
primaryMember: IMemberWithAggregatesForMergeSuggestions,
similarMember: IMemberOpensearch,
): boolean {
// Primary member's noreply emails -> similar member's platform usernames
// Primary member's noreply -> similar member's platform usernames
const similarUsernamesByPlatform = {
[PlatformType.GITHUB]: new Set(
similarMember.nested_identities
Expand All @@ -234,15 +234,15 @@ class MemberSimilarityCalculator {
}

for (const identity of primaryMember.identities) {
if (!identity.verified || identity.type !== MemberIdentityType.EMAIL) continue
if (!identity.verified) continue

const ghUsername = parseGitHubNoreplyEmail(identity.value)
if (ghUsername && similarUsernamesByPlatform[PlatformType.GITHUB].has(ghUsername)) {
return true
}
}

// Similar member's noreply emails -> primary member's platform usernames
// Similar member's noreply -> primary member's platform usernames
const primaryUsernamesByPlatform = {
[PlatformType.GITHUB]: new Set(
primaryMember.identities
Expand All @@ -254,7 +254,7 @@ class MemberSimilarityCalculator {
}

for (const identity of similarMember.nested_identities) {
if (!identity.bool_verified || identity.keyword_type !== MemberIdentityType.EMAIL) continue
if (!identity.bool_verified) continue

const ghUsername = parseGitHubNoreplyEmail(identity.string_value)
if (ghUsername && primaryUsernamesByPlatform[PlatformType.GITHUB].has(ghUsername)) {
Expand Down
Loading