Skip to content

Commit 736acbc

Browse files
authored
Merge pull request #2084 from Kobzol/t-all-private
Create a private channel that contains all team members
2 parents 544f59b + e3c1ec7 commit 736acbc

File tree

2 files changed

+27
-9
lines changed

2 files changed

+27
-9
lines changed

src/validate.rs

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -759,16 +759,20 @@ fn validate_zulip_stream_ids(data: &Data, errors: &mut Vec<String>) {
759759
return Ok(());
760760
}
761761

762-
wrapper(team.members(data)?.iter(), errors, |member, _| {
763-
if let Some(member) = data.person(member) {
764-
if member.zulip_id().is_none() {
765-
bail!(
766-
"person `{}` in '{}' is a member of a Zulip stream but has no Zulip id",
767-
member.github(),
768-
team.name()
769-
);
762+
wrapper(streams.iter(), errors, |stream, errors| {
763+
wrapper(stream.members().iter(), errors, |member, _| {
764+
match member {
765+
ZulipMember::MemberWithId { .. } | ZulipMember::JustId(_) => {}
766+
ZulipMember::MemberWithoutId { github } => {
767+
bail!(
768+
"person `{github}` is a member of a Zulip stream `{}` defined in team `{}`, but has no Zulip id",
769+
stream.name(),
770+
team.name()
771+
);
772+
}
770773
}
771-
}
774+
Ok(())
775+
});
772776
Ok(())
773777
});
774778
Ok(())

teams/all.toml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,17 @@ excluded-people = [
4242
"celaus",
4343
"opeolluwa",
4444
]
45+
46+
# Private channel with all team members, so that we can have an easy way of reaching them.
47+
[[zulip-streams]]
48+
name = "all/private"
49+
# Exclude the following people from the Zulip stream for grandfathering purposes,
50+
# where previously we didn't require all project team members to have Zulip IDs.
51+
excluded-people = [
52+
"U007D",
53+
"andrewpollack",
54+
"arshiamufti",
55+
"bnchi",
56+
"celaus",
57+
"opeolluwa",
58+
]

0 commit comments

Comments
 (0)