chore: Update neuron id -> slack id mappings

dfinity · Aug 30, 2023 · 310cfed · 310cfed
1 parent 09de197
commit 310cfed
Show file tree

Hide file tree

Showing 2 changed files with 108 additions and 104 deletions.
diff --git a/rs/slack-notifications/conf/neurons-slack-mapping.yaml b/rs/slack-notifications/conf/neurons-slack-mapping.yaml
@@ -1,101 +1,105 @@
 # Based on https://www.notion.so/3a1856c603704d51a6fcd2a57c98f92f
-- id: U01GQD1A8JZ  # Thomas Locher
-  neuron: 21
-- id: U02AFLX8MAA  # Jean-Armand Figeac
-  neuron: 32
-- id: UKJUP3G3X    # Juliana Che
-  neuron: 33
-- id: UD5JPLYAH    # Andrea Cerulli
-  neuron: 34
-- id: USYLCFLCS    # Bartosz Przydatek
-  neuron: 35
-- id: UGN5F0F7B    # Max Murphy
-  neuron: 36
-- id: U039SDD8KFC  # Maksym Arutyunyan
-  neuron: 37
-- id: UMZST9NBY    # Björn Tackmann
-  neuron: 38
-- id: U0245CNF536  # Luka Skugor
-  neuron: 39
-- id: URT5Z7VDZ    # Sasa Tomic
-  neuron: 40
-- id: U014KGJDY56  # Samuel Burri
-  neuron: 41
-- id: U04H2KWTLBZ  # David de Kloet
-  neuron: 42
-- id: U01L52P04HW  # Paul Meeusen
-  neuron: 44
-- id: UJU6XENEQ    # Mamiko Inoue
-  neuron: 45
-- id: U03STJVBT2M  # Marin Gilles
-  neuron: 46
-- id: UM6JMDD1Q    # Luis Mompo Handen
-  neuron: 47
-- id: UCJCD32MQ    # Manu Drijvers
-  neuron: 48
-- id: UKLPH8QDV    # Dimitris Sarlis
-  neuron: 49
-- id: USJPEC5F0    # Islam El-Ashi
-  neuron: 50
-- id: U02RFGQHP47  # Daniel Wong
-  neuron: 51
-- id: U02PX4CKLPJ  # Maksims Strasinskis
-  neuron: 52
-- id: U01BDLCHSUD  # John Plevyak
-  neuron: 53
-- id: U02RZR7PDK4  # Björn Assmann
-  neuron: 54
-- id: U02UZQSG468  # Maximilian Summe
-  neuron: 55
-- id: UJHLZDMD4    # Khushboo
-  neuron: 56
-- id: U010G9RRJ4A  # Shuo Wang
-  neuron: 57
-- id: U047B65SPB3  # Nikola Milosavljevic
-  neuron: 58
-- id: U02TEQHKV35  # Llorenç Muntaner Perello
-  neuron: 59
-- id: U03JW41V810  # Andre Popovitch
-  neuron: 60
-- id: U04JSKAH6L8  # Manuel Amador
-  neuron: 61
-- id: U8ET9T067    # Paul Liu
-  neuron: 62
-- id: U03T4M2EQ6L  # Nikolas Haimerl
-  neuron: 63
-- id: U01806HR6MP  # Ian Blenke
-  neuron: 64
-- id: UGNMPG3LL    # Christian Müller
-  neuron: 65
-- id: U01EQQYUWRG  # Sam Howard
-  neuron: 66
-- id: UQSNEM4QH    # Alin Sinpalean
-  neuron: 67
-- id: U02L4JU6E6T  # David Dal Busco
-  neuron: 68
-- id: UK6PJFR9A    # Nicolas Mattia
-  neuron: 69
-- id: UL6RB18A0    # Roman Kashitsyn
-  neuron: 70
-- id: U01Q0ED6SDB  # Leon Tan
-  neuron: 71
-- id: U02MNAPVA8L  # Daniel Thurau
-  neuron: 72
-- id: U02LQR955Q9  # Frederik Rothenberger
-  neuron: 73
-- id: U03M9TVSQ6Q  # Léo Kazmierczak
-  neuron: 74
-- id: U02D55X2D50  # Mario Pastorelli
-  neuron: 75
-- id: U03NX058Y9L  # Stephanus Jacobus Fischer
-  neuron: 76
-- id: U04CMGD6XDH  # Pietro Di Marco
-  neuron: 77
-- id: U02EAPEDT3J  # Arshavir Ter-Gabrielyan
-  neuron: 78
-- id: U04CV3YLN2G  # Maciej Modelski
-  neuron: 79
-- id: UD5P5BP5K    # Maria Dubovitskaya https://dfinity.slack.com/archives/C02NJPNSLM6/p1674935817983889?thread_ts=1674934727.112299&cid=C02NJPNSLM6
-  neuron: 9014191754770650971
-- id: U03T4M2EQ6L  # Nikolas Haimerl
-  neuron: 9593925519518438069
+- neuron_id: 21
+  slack_id: U01GQD1A8JZ  # Thomas Locher
+- neuron_id: 32
+  slack_id: U02AFLX8MAA  # Jean-Armand Figeac
+- neuron_id: 33
+  slack_id: UKJUP3G3X    # Juliana Che
+- neuron_id: 34
+  slack_id: UD5JPLYAH    # Andrea Cerulli
+- neuron_id: 35
+  slack_id: USYLCFLCS    # Bartosz Przydatek
+- neuron_id: 36
+  slack_id: UGN5F0F7B    # Max Murphy
+- neuron_id: 37
+  slack_id: U039SDD8KFC  # Maksym Arutyunyan
+- neuron_id: 38
+  slack_id: UMZST9NBY    # Björn Tackmann
+- neuron_id: 39
+  slack_id: U0245CNF536  # Luka Skugor
+- neuron_id: 40
+  slack_id: URT5Z7VDZ    # Sasa Tomic
+- neuron_id: 41
+  slack_id: U014KGJDY56  # Samuel Burri
+- neuron_id: 42
+  slack_id: U04H2KWTLBZ  # David de Kloet
+- neuron_id: 43
+  slack_id: U01F2AZLZBL  # Ryan Croote
+- neuron_id: 44
+  slack_id: U01L52P04HW  # Paul Meeusen
+- neuron_id: 45
+  slack_id: UJU6XENEQ    # Mamiko Inoue
+- neuron_id: 46
+  slack_id: U03STJVBT2M  # Marin Gilles
+- neuron_id: 47
+  slack_id: UM6JMDD1Q    # Luis Mompo Handen
+- neuron_id: 48
+  slack_id: UCJCD32MQ    # Manu Drijvers
+- neuron_id: 49
+  slack_id: UKLPH8QDV    # Dimitris Sarlis
+- neuron_id: 50
+  slack_id: USJPEC5F0    # Islam El-Ashi
+- neuron_id: 51
+  slack_id: U02RFGQHP47  # Daniel Wong
+- neuron_id: 52
+  slack_id: U02PX4CKLPJ  # Maksims Strasinskis
+- neuron_id: 53
+  slack_id: U01GTFM9FUJ  # Alexandra Zapuc
+- neuron_id: 54
+  slack_id: U02RZR7PDK4  # Björn Assmann
+- neuron_id: 55
+  slack_id: U02UZQSG468  # Maximilian Summe
+- neuron_id: 56
+  slack_id: UJHLZDMD4    # Khushboo
+- neuron_id: 57
+  slack_id: U010G9RRJ4A  # Shuo Wang
+- neuron_id: 58
+  slack_id: U047B65SPB3  # Nikola Milosavljevic
+- neuron_id: 59
+  slack_id: U02TEQHKV35  # Llorenç Muntaner Perello
+- neuron_id: 60
+  slack_id: U03JW41V810  # Andre Popovitch
+- neuron_id: 61
+  slack_id: U04JSKAH6L8  # Manuel Amador
+- neuron_id: 62
+  slack_id: U8ET9T067    # Paul Liu
+- neuron_id: 63
+  slack_id: U03T4M2EQ6L  # Nikolas Haimerl
+- neuron_id: 64
+  slack_id: U01806HR6MP  # Ian Blenke
+- neuron_id: 65
+  slack_id: UGNMPG3LL    # Christian Müller
+- neuron_id: 66
+  slack_id: U01EQQYUWRG  # Sam Howard
+- neuron_id: 67
+  slack_id: UQSNEM4QH    # Alin Sinpalean
+- neuron_id: 68
+  slack_id: U02L4JU6E6T  # David Dal Busco
+- neuron_id: 69
+  slack_id: UK6PJFR9A    # Nicolas Mattia
+- neuron_id: 70
+  slack_id: UL6RB18A0    # Roman Kashitsyn
+- neuron_id: 71
+  slack_id: U01Q0ED6SDB  # Leon Tan
+- neuron_id: 72
+  slack_id: U02MNAPVA8L  # Daniel Thurau
+- neuron_id: 73
+  slack_id: U02LQR955Q9  # Frederik Rothenberger
+- neuron_id: 74
+  slack_id: U03M9TVSQ6Q  # Léo Kazmierczak
+- neuron_id: 75
+  slack_id: U02D55X2D50  # Mario Pastorelli
+- neuron_id: 76
+  slack_id: U03NX058Y9L  # Stephanus Jacobus Fischer
+- neuron_id: 77
+  slack_id: U04CMGD6XDH  # Pietro Di Marco
+- neuron_id: 78
+  slack_id: U02EAPEDT3J  # Arshavir Ter-Gabrielyan
+- neuron_id: 79
+  slack_id: U04CV3YLN2G  # Maciej Modelski
+- neuron_id: 9014191754770650971
+  slack_id: UD5P5BP5K    # Maria Dubovitskaya https://dfinity.slack.com/archives/C02NJPNSLM6/p1674935817983889?thread_ts=1674934727.112299&cid=C02NJPNSLM6
+- neuron_id: 9593925519518438069
+  slack_id: U03T4M2EQ6L  # Nikolas Haimerl
+- neuron_id: 17212304975669116357
+  slack_id: U03LSTP0YB1  # Grégory Demay 
diff --git a/rs/slack-notifications/src/slack.rs b/rs/slack-notifications/src/slack.rs
@@ -21,8 +21,8 @@ const SLACK_CHANNEL_ENV_EXTERNAL: &str = "SLACK_CHANNEL_PROPOSALS_EXTERNAL";
 
 #[derive(Debug, Serialize, Deserialize)]
 struct NeuronSlackMapping {
-    pub id: String,
-    pub neuron: u64,
+    pub neuron_id: u64,
+    pub slack_id: String,
 }
 
 pub struct SlackHook<T: IntoUrl> {
@@ -121,8 +121,8 @@ fn proposer_mention(proposer: NeuronId) -> Option<String> {
     if neurons_blacklist.contains(&proposer.id) {
         None
     } else {
-        match neurons.iter().find(|nm| nm.neuron == proposer.id) {
-            Some(nm) => Some(format!("<@{}>", nm.id)),
+        match neurons.iter().find(|nm| nm.neuron_id == proposer.id) {
+            Some(nm) => Some(format!("<@{}>", nm.slack_id)),
             None => Some(format!("Neuron {}", proposer.id)),
         }
     }