Skip to content

Fix zulip group zulip-id availability check #1977

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
merged 1 commit into from
Oct 2, 2025
Merged

Fix zulip group zulip-id availability check #1977

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 23 additions & 11 deletions src/validate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,18 +728,29 @@ fn validate_zulip_group_ids(data: &Data, errors: &mut Vec<String>) {
if groups.is_empty() || groups.iter().all(|g| !g.includes_team_members()) {
return Ok(());
}
wrapper(team.members(data)?.iter(), errors, |member, _| {
if let Some(member) = data.person(member) {
if member.zulip_id().is_none() {
bail!(
"person `{}` in '{}' is a member of a Zulip user group but has no Zulip id",
member.github(),
team.name()
);

for group in groups {
wrapper(group.members().iter(), errors, |member, _| {
match member {
ZulipMember::MemberWithId { .. } | ZulipMember::JustId(_) => {
// Okay, have zulip IDs.
}
ZulipMember::MemberWithoutId { github } => {
// Bad, only github handle, no zulip ID, even though included in zulip user
// group
bail!(
"person `{}` in '{}' is a member of a Zulip user group '{}' but has no \
Zulip id",
github,
team.name(),
group.name()
);
}
}
}
Ok(())
});
Ok(())
});
}

Ok(())
});
}
Expand All @@ -752,6 +763,7 @@ fn validate_zulip_stream_ids(data: &Data, errors: &mut Vec<String>) {
if streams.is_empty() || streams.iter().all(|s| !s.includes_team_members()) {
return Ok(());
}

wrapper(team.members(data)?.iter(), errors, |member, _| {
if let Some(member) = data.person(member) {
if member.zulip_id().is_none() {
Expand Down