converts discord field to discord-id field

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

Author: nellshamrell

src/schema.rs

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

src/validate.rs

@@ -17,7 +17,7 @@ static CHECKS: &[fn(&Data, &mut Vec<String>)] = &[
     validate_list_extra_teams,
     validate_list_addresses,
     validate_people_addresses,
-    validate_discord_name,
+    validate_discord_id,
     validate_duplicate_permissions,
     validate_permissions,
     validate_rfcbot_labels,
@@ -268,17 +268,17 @@ fn validate_people_addresses(data: &Data, errors: &mut Vec<String>) {
     });
 }
 
-/// Ensure the Discord name is formatted properly
-fn validate_discord_name(data: &Data, errors: &mut Vec<String>) {
-    // https://discordapp.com/developers/docs/resources/user#usernames-and-nicknames
-    let name_re = Regex::new(r"^[^@#:`]{2,32}#[0-9]{4}$").unwrap();
+/// 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(name) = person.discord() {
-            if !name_re.is_match(name) {
+        if let Some(id) = person.discord_id() {
+            if !id_re.is_match(id) {
                 bail!(
-                    "user `{}` has an invalid discord name: {}",
+                    "user `{}` has an invalid discord id: {}",
                     person.github(),
-                    name
+                    id
                 );
             }
         }