fix(mail): handle crew/polecat ambiguity in notification session lookup (#914)

When sending mail notifications, the canonical address format (rig/name)
doesn't distinguish between crew workers (session: gt-rig-crew-name) and
polecats (session: gt-rig-name). This caused notifications to fail for
crew workers in other rigs.

Solution: Try both possible session IDs when the address is ambiguous,
using the first one that has an active session.

Supersedes PR #896 which only handled slash-to-dash conversion.

Fixes: gt-h5btjg
This commit is contained in:
aleiby
2026-01-24 21:48:16 -08:00
committed by GitHub
parent 63d60f1dcd
commit db60489d0f
2 changed files with 104 additions and 21 deletions

View File

@@ -87,7 +87,52 @@ func TestIsTownLevelAddress(t *testing.T) {
}
}
func TestAddressToSessionIDs(t *testing.T) {
tests := []struct {
address string
want []string
}{
// Town-level addresses - single session
{"mayor", []string{"hq-mayor"}},
{"mayor/", []string{"hq-mayor"}},
{"deacon", []string{"hq-deacon"}},
// Rig singletons - single session (no crew/polecat ambiguity)
{"gastown/refinery", []string{"gt-gastown-refinery"}},
{"beads/witness", []string{"gt-beads-witness"}},
// Ambiguous addresses - try both crew and polecat variants
{"gastown/Toast", []string{"gt-gastown-crew-Toast", "gt-gastown-Toast"}},
{"beads/ruby", []string{"gt-beads-crew-ruby", "gt-beads-ruby"}},
// Explicit crew/polecat - single session
{"gastown/crew/max", []string{"gt-gastown-crew-max"}},
{"gastown/polecats/nux", []string{"gt-gastown-polecats-nux"}},
// Invalid addresses - empty result
{"gastown/", nil}, // Empty target
{"gastown", nil}, // No slash
{"", nil}, // Empty address
}
for _, tt := range tests {
t.Run(tt.address, func(t *testing.T) {
got := addressToSessionIDs(tt.address)
if len(got) != len(tt.want) {
t.Errorf("addressToSessionIDs(%q) = %v, want %v", tt.address, got, tt.want)
return
}
for i, v := range got {
if v != tt.want[i] {
t.Errorf("addressToSessionIDs(%q)[%d] = %q, want %q", tt.address, i, v, tt.want[i])
}
}
})
}
}
func TestAddressToSessionID(t *testing.T) {
// Deprecated wrapper - returns first candidate from addressToSessionIDs
tests := []struct {
address string
want string
@@ -96,7 +141,7 @@ func TestAddressToSessionID(t *testing.T) {
{"mayor/", "hq-mayor"},
{"deacon", "hq-deacon"},
{"gastown/refinery", "gt-gastown-refinery"},
{"gastown/Toast", "gt-gastown-Toast"},
{"gastown/Toast", "gt-gastown-crew-Toast"}, // First candidate is crew
{"beads/witness", "gt-beads-witness"},
{"gastown/", ""}, // Empty target
{"gastown", ""}, // No slash