From bc762d4897ef62c5a5104d15346687c387e8dd9d Mon Sep 17 00:00:00 2001
From: Jeff <dev@jeffa.io>
Date: Tue, 2 Jul 2024 14:55:47 -0400
Subject: [PATCH] Disallow inviting banned players

---
 src/bot.rs | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/bot.rs b/src/bot.rs
index 1e6577f..77cb3a1 100644
--- a/src/bot.rs
+++ b/src/bot.rs
@@ -117,6 +117,10 @@ impl Bot {
             })
             .ok_or_else(|| format!("Failed to find info for uid {sender_uid}"))?;
 
+        if self.ban_list.contains(&sender_info.uuid) {
+            return Ok(());
+        }
+
         // Process commands with no arguments
 
         if content == "inv" {
@@ -259,12 +263,12 @@ impl Bot {
                 }
             }
             "inv" => {
-                if !self.ban_list.contains(&sender_info.uuid) {
-                    for word in words {
-                        info!("Inviting {word}");
+                for word in words {
+                    info!("Inviting {word}");
 
-                        let uid = self.find_uid(word)?;
+                    let (uid, uuid) = self.find_ids(word)?;
 
+                    if !self.ban_list.contains(&uuid) {
                         self.client.send_invite(uid, InviteKind::Group);
                     }
                 }
@@ -423,6 +427,20 @@ impl Bot {
             })
             .ok_or(format!("Failed to find uuid for player {}", name))
     }
+
+    fn find_ids(&self, name: &str) -> Result<(Uid, Uuid), String> {
+        self.client
+            .player_list()
+            .iter()
+            .find_map(|(uid, info)| {
+                if info.player_alias == name {
+                    Some((*uid, info.uuid))
+                } else {
+                    None
+                }
+            })
+            .ok_or(format!("Failed to find ids for player {}", name))
+    }
 }
 
 fn connect_to_veloren(username: &str, password: &str) -> Result<Client, String> {