rust-lang · pietroalbini · Apr 24, 2021 · Jan 4, 2021 · Jan 17, 2021 · Feb 17, 2021
diff --git a/people/GuillaumeGomez.toml b/people/GuillaumeGomez.toml
@@ -3,3 +3,4 @@ github = "GuillaumeGomez"
 github-id = 3050060
 irc = "imperio"
 email = "[email protected]"
+discord-id = 301677135293186049
diff --git a/people/Kixiron.toml b/people/Kixiron.toml
@@ -2,3 +2,4 @@ name = "Chase Wilson"
 github = "Kixiron"
 github-id = 25047011
 email = "[email protected]"
+discord-id = 341327659428741120
diff --git a/people/Manishearth.toml b/people/Manishearth.toml
@@ -3,6 +3,7 @@ github = "Manishearth"
 github-id = 1617736
 email = "[email protected]"
 zulip-id = 132040
+discord-id = 278623213448331265
 
 [permissions]
 bors.semverver.review = true
diff --git a/people/Mark-Simulacrum.toml b/people/Mark-Simulacrum.toml
@@ -4,6 +4,7 @@ github-id = 5047365
 zulip-id = 116122
 irc = "simulacrum"
 email = "[email protected]"
+discord-id = 442403469580566528
 
 [permissions]
 bors.cargo.review = true
diff --git a/people/Nemo157.toml b/people/Nemo157.toml
@@ -2,3 +2,4 @@ name = "Wim"
 github = "Nemo157"
 github-id = 81079
 email = "[email protected]"
+discord-id = 274907435972427778
diff --git a/people/aidanhs.toml b/people/aidanhs.toml
@@ -2,3 +2,4 @@ name = "Aidan Hobson Sayers"
 github = "aidanhs"
 github-id = 1050652
 email = "[email protected]"
+discord-id = 155372553181855745
diff --git a/people/badboy.toml b/people/badboy.toml
@@ -2,3 +2,4 @@ name = "Jan-Erik Rediger"
 github = "badboy"
 github-id = 2129
 email = "[email protected]"
+discord-id = 347670185806659585
diff --git a/people/cramertj.toml b/people/cramertj.toml
@@ -2,3 +2,4 @@ name = "Taylor Cramer"
 github = "cramertj"
 github-id = 5963049
 email = "[email protected]"
+discord-id = 446773566478745611
diff --git a/people/cuviper.toml b/people/cuviper.toml
@@ -3,3 +3,4 @@ github = "cuviper"
 github-id = 36186
 email = "[email protected]"
 irc = "jistone"
+discord-id = 443825361256448003
diff --git a/people/eddyb.toml b/people/eddyb.toml
@@ -2,3 +2,4 @@ name = "Eduard Burtescu"
 github = "eddyb"
 github-id = 77424
 email = "[email protected]"
+discord-id = 391665108490649601
diff --git a/people/estebank.toml b/people/estebank.toml
@@ -2,3 +2,4 @@ name = "Esteban Kuber"
 github = "estebank"
 github-id = 1606434
 email = "[email protected]"
+discord-id = 449245991216873475
diff --git a/people/flaki.toml b/people/flaki.toml
@@ -3,3 +3,4 @@ github = "flaki"
 github-id = 2089432
 irc = "flaki"
 email = "[email protected]"
+discord-id = 453958363152252928
diff --git a/people/fmoko.toml b/people/fmoko.toml
@@ -2,3 +2,4 @@ name = "Marisa"
 github = "fmoko"
 github-id = 6445316
 email = "[email protected]"
+discord-id = 780131913817129002
diff --git a/people/jyn514.toml b/people/jyn514.toml
@@ -3,3 +3,4 @@ github = 'jyn514'
 github-id = 23638587
 email = '[email protected]'
 zulip-id = 232545
+discord-id = 568772690438127647
diff --git a/people/kennytm.toml b/people/kennytm.toml
@@ -2,3 +2,4 @@ name = "kennytm"
 github = "kennytm"
 github-id = 103023
 email = "[email protected]"
+discord-id = 382886245069488129
diff --git a/people/khionu.toml b/people/khionu.toml
@@ -2,4 +2,5 @@ name = "Khionu Sybiern"
 github = "khionu"
 github-id = 11195266
 email = "[email protected]"
+discord-id = 96642168176807936
 
diff --git a/people/nagisa.toml b/people/nagisa.toml
@@ -3,3 +3,4 @@ github = "nagisa"
 github-id = 679122
 irc = "nagisa"
 email = "[email protected]"
+discord-id = 119181581033275392
diff --git a/people/nikomatsakis.toml b/people/nikomatsakis.toml
@@ -3,3 +3,4 @@ github = "nikomatsakis"
 github-id = 155238
 email = "[email protected]"
 zulip-id = 116009
+discord-id = 442067131769683974
diff --git a/people/oli-obk.toml b/people/oli-obk.toml
@@ -2,3 +2,4 @@ name = "Oliver Scherer"
 github = "oli-obk"
 github-id = 332036
 email = "[email protected]"
+discord-id = 282164774379192320
diff --git a/people/onur.toml b/people/onur.toml
@@ -2,3 +2,4 @@ name = "Onur Aslan"
 github = "onur"
 github-id = 345828
 email = "[email protected]"
+discord-id = 265936699861762048
diff --git a/people/petrochenkov.toml b/people/petrochenkov.toml
@@ -4,3 +4,4 @@ github-id = 5751617
 zulip-id = 123856
 irc = "petrochenkov"
 email = "[email protected]"
+discord-id = 300421337103466496
diff --git a/people/pnkfelix.toml b/people/pnkfelix.toml
@@ -2,3 +2,4 @@ name = "Felix Klock"
 github = "pnkfelix"
 github-id = 173127
 email = "[email protected]"
+discord-id = 443061971114262528
diff --git a/people/scottmcm.toml b/people/scottmcm.toml
@@ -2,3 +2,4 @@ name = "Scott McMurray"
 github = "scottmcm"
 github-id = 18526288
 email = "[email protected]"
+discord-id = 446765297286774784
diff --git a/people/sebasmagri.toml b/people/sebasmagri.toml
@@ -2,3 +2,4 @@ name = "Sebastián Magrí"
 github = "sebasmagri"
 github-id = 11137
 email = "[email protected]"
+discord-id = 818556851112902657
diff --git a/people/shepmaster.toml b/people/shepmaster.toml
@@ -3,3 +3,4 @@ github = "shepmaster"
 github-id = 174509
 zulip-id = 116155
 email = "[email protected]"
+discord-id = 453980540824059918
diff --git a/people/skade.toml b/people/skade.toml
@@ -2,3 +2,4 @@ name = "Florian Gilcher"
 github = "skade"
 github-id = 47542
 email = "[email protected]"
+discord-id = 433394056073183253
diff --git a/people/syphar.toml b/people/syphar.toml
@@ -2,3 +2,4 @@ name = 'Denis Cornehl'
 github = 'syphar'
 github-id = 540890
 email = '[email protected]'
+discord-id = 635351653226381333
diff --git a/people/technetos.toml b/people/technetos.toml
@@ -2,3 +2,4 @@ name = "Joshua Gould"
 github = "technetos"
 github-id = 10949810
 email = "[email protected]"
+discord-id = 443810603417731092
diff --git a/people/wesleywiser.toml b/people/wesleywiser.toml
@@ -2,3 +2,4 @@ name = "Wesley Wiser"
 github = "wesleywiser"
 github-id = 831192
 email = "[email protected]"
+discord-id = 446730792933130242
diff --git a/rust_team_data/src/v1.rs b/rust_team_data/src/v1.rs
@@ -23,6 +23,7 @@ pub struct Team {
     pub alumni: Vec<TeamMember>,
     pub github: Option<TeamGitHub>,
     pub website_data: Option<TeamWebsite>,
+    pub discord: Vec<TeamDiscord>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -57,6 +58,13 @@ pub struct TeamWebsite {
     pub weight: i64,
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct TeamDiscord {
+    pub name: String,
+    pub members: Vec<usize>,
+    pub color: Option<String>,
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct DiscordInvite {
     pub channel: String,

diff --git a/src/schema.rs b/src/schema.rs
@@ -169,6 +169,7 @@ pub(crate) struct Team {
     website: Option<WebsiteData>,
     #[serde(default)]
     lists: Vec<TeamList>,
+    discord_roles: Option<Vec<DiscordRole>>,
 }
 
 impl Team {
@@ -196,6 +197,10 @@ impl Team {
         self.website.as_ref()
     }
 
+    pub(crate) fn discord_roles(&self) -> Option<&Vec<DiscordRole>> {
+        self.discord_roles.as_ref()
+    }
+
     pub(crate) fn members<'a>(&'a self, data: &'a Data) -> Result<HashSet<&'a str>, Error> {
         let mut members: HashSet<_> = self.people.members.iter().map(|s| s.as_str()).collect();
 
@@ -330,11 +335,42 @@ impl Team {
         Ok(result)
     }
 
+    pub(crate) fn discord_ids(&self, data: &Data) -> Result<Vec<usize>, Error> {
+        Ok(self
+            .members(data)?
+            .iter()
+            .flat_map(|name| data.person(name).map(|p| p.discord_id()))
+            .flatten()
+            .collect())
+    }
+
     pub(crate) fn is_alumni_team(&self) -> bool {
         self.people.include_all_alumni
     }
 }
 
+#[derive(serde_derive::Deserialize, Debug)]
+#[serde(rename_all = "kebab-case", deny_unknown_fields)]
+pub(crate) struct DiscordRole {
+    name: String,
+    color: Option<String>,
+}
+
+impl DiscordRole {
+    pub(crate) fn name(&self) -> &str {
+        &self.name
+    }
+
+    pub(crate) fn color(&self) -> Option<&str> {
+        self.color.as_ref().map(|s| &s[..])
+    }
+}
+
+#[derive(Eq, PartialEq, Debug)]
+pub(crate) struct DiscordTeam {
+    pub(crate) members: Vec<usize>,
+}
+
 #[derive(Eq, PartialEq)]
 pub(crate) struct GitHubTeam<'a> {
     pub(crate) org: &'a str,

diff --git a/src/static_api.rs b/src/static_api.rs
@@ -65,6 +65,8 @@ impl<'a> Generator<'a> {
             let mut github_teams = team.github_teams(&self.data)?;
             github_teams.sort();
 
+            let member_discord_ids = team.discord_ids(&self.data)?;
+
             let team_data = v1::Team {
                 name: team.name().into(),
                 kind: match team.kind() {
@@ -100,6 +102,19 @@ impl<'a> Generator<'a> {
                     zulip_stream: ws.zulip_stream().map(|s| s.into()),
                     weight: ws.weight(),
                 }),
+                discord: team
+                    .discord_roles()
+                    .map(|roles| {
+                        roles
+                            .iter()
+                            .map(|role| v1::TeamDiscord {
+                                name: role.name().into(),
+                                color: role.color().map(String::from),
+                                members: member_discord_ids.clone(),
+                            })
+                            .collect()
+                    })
+                    .unwrap_or_else(Vec::new),
             };
 
             self.add(&format!("v1/teams/{}.json", team.name()), &team_data)?;

diff --git a/src/validate.rs b/src/validate.rs
@@ -38,6 +38,7 @@ static CHECKS: &[Check<fn(&Data, &mut Vec<String>)>] = checks![
     validate_discord_permissions,
     validate_zulip_stream_name,
     validate_project_groups_have_parent_teams,
+    validate_discord_team_members_have_discord_ids,
 ];
 
 #[allow(clippy::type_complexity)]
@@ -520,6 +521,29 @@ fn validate_project_groups_have_parent_teams(data: &Data, errors: &mut Vec<Strin
     })
 }
 
+fn validate_discord_team_members_have_discord_ids(data: &Data, errors: &mut Vec<String>) {
+    wrapper(data.teams(), errors, |team, _| {
+        if team.discord_roles().is_some() && team.name() != "all" {
+            let team_members = team.members(&data)?;
+            if team_members.len() != team.discord_ids(&data)?.len() {
+                let members: String = team_members
+                    .into_iter()
+                    .filter(|name| data.person(name).map(|p| p.discord_id()) == Some(None))
+                    .map(|name| format!("{}, ", name))
+                    .collect();
+
+                bail!(
+                    "the following members of the \"{}\" team do not have discord_ids: {}",
+                    team.name(),
+                    &members[..members.len() - 2]
+                );
+            }
+        }
+
+        Ok(())
+    });
+}
+
 fn wrapper<T, I, F>(iter: I, errors: &mut Vec<String>, mut func: F)
 where
     I: Iterator<Item = T>,

diff --git a/teams/all.toml b/teams/all.toml
@@ -27,3 +27,6 @@ include-team-members = false
 extra-emails = [
     "[email protected]",
 ]
+
+[[discord-roles]]
+name = "WGs and Teams"
diff --git a/teams/community.toml b/teams/community.toml
@@ -82,3 +82,7 @@ extra-people = [
     "spastorino",
     "skade",
 ]
+
+[[discord-roles]]
+name = "community-team"
+color = "#c27c0e"
diff --git a/teams/core.toml b/teams/core.toml
@@ -81,3 +81,8 @@ extra-people = ["ashleygwilliams"]
 address = "[email protected]"
 include-team-members = false
 extra-people = ["pietroalbini"]
+
+[[discord-roles]]
+name = "core-team"
+color = "#3498db"
+
diff --git a/teams/docs-rs.toml b/teams/docs-rs.toml
@@ -34,3 +34,6 @@ address = "[email protected]"
 
 [[lists]]
 address = "[email protected]"
+
+[[discord-roles]]
+name = "docs-rs"
diff --git a/teams/infra.toml b/teams/infra.toml
@@ -46,3 +46,7 @@ address = "[email protected]"
 
 [[lists]]
 address = "[email protected]"
+
+[[discord-roles]]
+name = "infra-team"
+color = "#ff5454"
diff --git a/teams/lang.toml b/teams/lang.toml
@@ -42,3 +42,7 @@ address = "[email protected]"
 
 [[lists]]
 address = "[email protected]"
+
+[[discord-roles]]
+name = "lang-team"
+color = "#2ecc71"
diff --git a/teams/mods-discord.toml b/teams/mods-discord.toml
@@ -19,3 +19,7 @@ description = "Moderating the Discord server"
 
 [[lists]]
 address = "[email protected]"
+
+[[discord-roles]]
+name = "mods"
+color = "#e74c3c"
diff --git a/teams/wg-security-response.toml b/teams/wg-security-response.toml
@@ -22,3 +22,7 @@ repo = "https://github.com/rust-lang/wg-security-response"
 
 [[lists]]
 address = "[email protected]"
+
+[[discord-roles]]
+name = "security"
+color = "#e91e63"