Merge pull request #340 from nellshamrell/make-discord-changes

Author: Pietro Albini

people/17cupsofcoffee.toml

@@ -1,5 +1,4 @@
 name = "Joe Clay"
 github = "17cupsofcoffee"
 github-id = 784533
-email= "[email protected]"
-discord = "17cupsofcoffee#0419"
+email= "[email protected]"

people/AlexEne.toml

@@ -1,5 +1,4 @@
 name = "Alexandru Ene"
 github = "AlexEne"
 github-id = 5849037
-email = "[email protected]"
-discord = "Alex#9085"
+email = "[email protected]"

people/Lokathor.toml

@@ -1,5 +1,4 @@
 name = "Daniel Gee"
 github = "Lokathor"
 github-id = 5456384
-email = "[email protected]"
-discord = "Lokathor#2627"
+email = "[email protected]"

people/Wodann.toml

@@ -1,5 +1,4 @@
 name = "Remco"
 github = "Wodann"
 github-id = 6917585
-email= "[email protected]"
-discord = "Wodann#9645"
+email= "[email protected]"

people/jtgeibel.toml

@@ -2,3 +2,6 @@ name = "Justin Geibel"
 github = "jtgeibel"
 github-id = 22186
 email = "[email protected]"
+
+[permissions]
+crates-io-ops-bot.staging_crates_io = true

people/nellshamrell.toml

@@ -2,3 +2,7 @@ name = "Nell Shamrell-Harrington"
 github = "nellshamrell"
 github-id = 813007
 email = "[email protected]"
+discord-id = 244302461718757376
+
+[permissions]
+crates-io-ops-bot.staging_crates_io = true

people/pietroalbini.toml

@@ -2,4 +2,6 @@ name = "Pietro Albini"
 github = "pietroalbini"
 github-id = 2299951
 email = "[email protected]"
-discord = "pietro#3134"
+
+[permissions]
+crates-io-ops-bot.staging_crates_io = true

people/valgrimm.toml

@@ -1,6 +1,4 @@
 name = 'valgrimm'
 github = 'valgrimm'
 github-id = 56933147
-email = '[email protected]'
-discord = 'vgrimm#7551'
-
+email = '[email protected]'

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/permissions.rs

@@ -11,6 +11,9 @@ macro_rules! permissions {
         bors_repos {
             $($bors:ident,)*
         }
+        crates_io_ops_apps {
+            $($crates_io_ops_app:ident,)*
+        }
     ) => {
         #[derive(serde_derive::Deserialize, Debug)]
         #[serde(deny_unknown_fields)]
@@ -56,13 +59,16 @@ macro_rules! permissions {
             )*
             #[serde(default)]
             bors: BorsPermissions,
+            #[serde(default)]
+            crates_io_ops_bot: CratesIoOps,
         }
 
         impl Default for Permissions {
             fn default() -> Self {
                 Permissions {
                     $($boolean: false,)*
                     bors: BorsPermissions::default(),
+                    crates_io_ops_bot: CratesIoOps::default(),
                 }
             }
         }
@@ -72,6 +78,7 @@ macro_rules! permissions {
                 $(stringify!($boolean),)*
                 $(concat!("bors.", stringify!($bors), ".review"),)*
                 $(concat!("bors.", stringify!($bors), ".try"),)*
+                $(concat!("crates_io_ops_bot.", stringify!($crates_io_ops_app)),)*
             ];
 
             pub(crate) fn has(&self, permission: &str) -> bool {
@@ -92,6 +99,11 @@ macro_rules! permissions {
                         return self.bors.$bors.try_
                     }
                 )*
+                $(
+                    if permission == concat!("crates_io_ops_bot", stringify!($crates_io_ops_app)) {
+                        return self.crates_io_ops_bot.$crates_io_ops_app
+                    }
+                )*
                 false
             }
 
@@ -125,6 +137,23 @@ macro_rules! permissions {
                 Ok(())
             }
         }
+
+        #[derive(serde_derive::Deserialize, Debug)]
+        #[serde(deny_unknown_fields)]
+        pub(crate) struct CratesIoOps {
+            $(
+                #[serde(default)]
+                $crates_io_ops_app: bool,
+            )*
+        }
+
+        impl Default for CratesIoOps {
+            fn default() -> Self {
+                CratesIoOps {
+                    $($crates_io_ops_app: false,)*
+                }
+            }
+        }
     }
 }
 
@@ -150,6 +179,10 @@ permissions! {
         stdarch,
         team,
     }
+    crates_io_ops_apps {
+        crates_io,
+        staging_crates_io,
+    }
 }
 
 pub(crate) fn allowed_people<'a>(

src/schema.rs

@@ -52,7 +52,7 @@ pub(crate) struct Person {
     irc: Option<String>,
     #[serde(default)]
     email: EmailField,
-    discord: Option<String>,
+    discord_id: Option<usize>,
     #[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<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_name,
     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 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();
-    wrapper(data.people(), errors, |person, _| {
-        if let Some(name) = person.discord() {
-            if !name_re.is_match(name) {
-                bail!(
-                    "user `{}` has an invalid discord name: {}",
-                    person.github(),
-                    name
-                );
-            }
-        }
-        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| {