more edits to add discord_id to Person and avaialble through the static api

Signed-off-by: Nell Shamrell <[email protected]>

Author: nellshamrell

rust_team_data/src/v1.rs

@@ -82,6 +82,7 @@ pub struct Lists {
 pub struct Permission {
     pub github_users: Vec<String>,
     pub github_ids: Vec<usize>,
+    pub discord_ids: Vec<usize>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]

src/schema.rs

@@ -52,7 +52,7 @@ pub(crate) struct Person {
     irc: Option<String>,
     #[serde(default)]
     email: EmailField,
-    discord_id: Option<String>,
+    discord_id: Option<usize>,
     #[serde(default)]
     permissions: Permissions,
 }
@@ -92,8 +92,8 @@ impl Person {
         }
     }
 
-    pub(crate) fn discord_id(&self) -> Option<&str> {
-        self.discord_id.as_deref()
+    pub(crate) fn discord_id(&self) -> Option<usize> {
+        self.discord_id
     }
 
     pub(crate) fn permissions(&self) -> &Permissions {

src/static_api.rs

@@ -139,13 +139,21 @@ impl<'a> Generator<'a> {
                 .map(|p| p.github().to_string())
                 .collect::<Vec<_>>();
             let mut github_ids = allowed.iter().map(|p| p.github_id()).collect::<Vec<_>>();
+
+           let mut discord_ids = allowed
+                .iter()
+                .map(|p| p.discord_id().unwrap_or(0))
+                .collect::<Vec<_>>();
+  
             github_users.sort();
             github_ids.sort();
+            discord_ids.sort();
             self.add(
                 &format!("v1/permissions/{}.json", perm),
                 &v1::Permission {
                     github_users,
                     github_ids,
+                    discord_ids,
                 },
             )?;
         }

src/validate.rs

@@ -17,7 +17,6 @@ static CHECKS: &[fn(&Data, &mut Vec<String>)] = &[
     validate_list_extra_teams,
     validate_list_addresses,
     validate_people_addresses,
-    validate_discord_id,
     validate_duplicate_permissions,
     validate_permissions,
     validate_rfcbot_labels,
@@ -268,24 +267,6 @@ fn validate_people_addresses(data: &Data, errors: &mut Vec<String>) {
     });
 }
 
-/// Ensure the Discord id is formatted properly
-fn validate_discord_id(data: &Data, errors: &mut Vec<String>) {
-    // A Discord ID is 18 digits
-    let id_re = Regex::new(r"^[0-9]{18}$").unwrap();
-    wrapper(data.people(), errors, |person, _| {
-        if let Some(id) = person.discord_id() {
-            if !id_re.is_match(id) {
-                bail!(
-                    "user `{}` has an invalid discord id: {}",
-                    person.github(),
-                    id
-                );
-            }
-        }
-        Ok(())
-    })
-}
-
 /// Ensure members of teams with permissions don't explicitly have those permissions
 fn validate_duplicate_permissions(data: &Data, errors: &mut Vec<String>) {
     wrapper(data.teams(), errors, |team, errors| {