From 309faf712dff2bd8c164141d359abdafc76bc0c8 Mon Sep 17 00:00:00 2001
From: jakubmanczak <jakub@manczak.net>
Date: Tue, 29 Apr 2025 11:24:59 +0200
Subject: [PATCH] misc: shorten option getters

---
 src/discordbot/commands/kiss.rs | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/discordbot/commands/kiss.rs b/src/discordbot/commands/kiss.rs
index 8f1e5d0..7a0829e 100644
--- a/src/discordbot/commands/kiss.rs
+++ b/src/discordbot/commands/kiss.rs
@@ -26,29 +26,17 @@ pub async fn run(ctx: &Context, interaction: &CommandInteraction) -> Result<(),
 
     let target_user = options
         .iter()
-        .find_map(|opt| {
-            if opt.name == "target" {
-                match &opt.value {
-                    ResolvedValue::User(user, member) => Some((user, member.as_ref())),
-                    _ => None,
-                }
-            } else {
-                None
-            }
+        .find_map(|opt| match (opt.name, &opt.value) {
+            ("target", ResolvedValue::User(user, member)) => Some((user, member.as_ref())),
+            _ => None,
         })
-        .expect("Target user should be present");
+        .expect("Target user is a required field; should be present");
 
     let use_bigger = options
         .iter()
-        .find_map(|opt| {
-            if opt.name == "bigger" {
-                match &opt.value {
-                    ResolvedValue::Boolean(v) => Some(*v),
-                    _ => None,
-                }
-            } else {
-                None
-            }
+        .find_map(|opt| match (opt.name, &opt.value) {
+            ("target", ResolvedValue::Boolean(v)) => Some(*v),
+            _ => None,
         })
         .unwrap_or(false);