make generic event matches fn

Author: Astavie

Cargo.lock

@@ -7,7 +7,6 @@ authors = [ "Astavie <astavie@pm.me>" ]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-derive_setters = "0.1.5"
 serde = { version = "1.0.126", features = ["derive"] }
 serde_json = "1.0.96"
 tokio = { version = "1.27.0", features = ["full"] }

Cargo.toml

@@ -19,10 +19,18 @@ impl Ingame {
     }
     pub fn create_read(&mut self, msg: &mut GameMessage, event: &Event) -> Option<Action> {
         if let PlayerKind::User(user) = self.czar {
-            if let Some(i) = event
-                .custom_id_number("#", user)
-                .filter(|&i| i < self.players.len() - 1)
-            {
+            if let Some(i) = event.matches(|i| {
+                if i.user.id != user {
+                    None
+                } else {
+                    let s = i.data.custom_id.strip_prefix('#')?;
+                    let c = s.chars().next()?;
+                    B64_TABLE
+                        .iter()
+                        .position(|&p| p == c)
+                        .filter(|&i| i < self.players.len() - 1)
+                }
+            }) {
                 return self.create_winner(msg, i);
             }
         }

src/cah/read.rs

@@ -59,7 +59,6 @@ impl Ingame {
                 if self.czar != PlayerKind::User(user) {
                     changed = msg.create_select_grid(
                         event,
-                        user,
                         self.cards,
                         &mut player.selected,
                         |selected| {

src/cah/write.rs

@@ -21,24 +21,11 @@ impl<'a> Event<'a> {
         }
     }
 
-    pub fn custom_id(&self) -> Option<&str> {
-        Some(&self.interaction?.data.custom_id)
-    }
-    pub fn custom_id_number(&self, prefix: &str, user: Snowflake<User>) -> Option<usize> {
-        if self.interaction?.user.id != user {
-            return None;
-        }
-
-        let id = &self.interaction?.data.custom_id;
-        let s = id.strip_prefix(prefix)?;
-        let c = s.chars().next()?;
-        B64_TABLE.iter().position(|&p| p == c)
-    }
-    pub fn values(&self, id: &str) -> Option<&Vec<String>> {
-        match self.interaction {
-            Some(i) if i.data.custom_id == id => Some(&i.data.values),
-            _ => None,
-        }
+    pub fn matches<T>(
+        &self,
+        f: impl FnOnce(&'a Interaction<MessageComponent>) -> Option<T>,
+    ) -> Option<T> {
+        f(self.interaction?)
     }
 
     pub fn button(
@@ -83,7 +70,13 @@ impl GameMessage {
         selected: &mut Vec<usize>,
     ) {
         // get selected values
-        let changed = match event.values(&name) {
+        let changed = match event.matches(|i| {
+            if i.data.custom_id == name {
+                Some(&i.data.values)
+            } else {
+                None
+            }
+        }) {
             Some(v) => {
                 *selected = v
                     .iter()
@@ -134,7 +127,7 @@ impl GameMessage {
         max: i32,
     ) {
         // get value
-        match event.custom_id().and_then(|s| s.strip_prefix(&name)) {
+        match event.matches(|i| i.data.custom_id.strip_prefix(&name)) {
             Some("__min") => *val = val.saturating_sub(1).max(min),
             Some("__max") => *val = val.saturating_add(1).min(max),
             _ => (),
@@ -199,17 +192,26 @@ impl GameMessage {
     pub fn create_select_grid(
         &mut self,
         event: &Event,
-        user: Snowflake<User>,
         count: usize,
         selected: &mut Vec<Option<usize>>,
         done: impl FnOnce(&Vec<Option<usize>>) -> bool,
     ) -> bool {
         // TODO: scrolling if too big
 
         let mut changed = false;
+
+        // for some reason rust-analyzer thinks this is unused
+        #[allow(unused_assignments)]
         let mut is_done = false;
 
-        if let Some(i) = event.custom_id_number("#", user).filter(|&i| i < count) {
+        if let Some(i) = event.matches(|i| {
+            let s = i.data.custom_id.strip_prefix('#')?;
+            let c = s.chars().next()?;
+            B64_TABLE
+                .iter()
+                .position(|&p| p == c)
+                .filter(|&i| i < count)
+        }) {
             if selected.contains(&Some(i)) {
                 // we are not done anymore
                 changed = done(selected);