1 files changed, 21 insertions, 0 deletions
diff --git a/src/system/types.rs b/src/system/types.rs
index bd1e40f..c4da066 100644
--- a/src/system/types.rs
+++ b/src/system/types.rs
@@ -1,13 +1,16 @@
 use regex::Regex;
 use twilight_http::Client;
 use twilight_gateway::Shard;
+use twilight_mention::ParseMention;
 use twilight_model::id::{marker::UserMarker, Id};
 use std::sync::Arc;
 use tokio::sync::Mutex;
 
 #[derive(Clone)]
 pub struct Member {
+    pub name: String,
     pub discord_token: String,
+    pub user_id: Arc<Mutex<Option<Id<UserMarker>>>>,
     pub message_pattern: Regex,
     pub shard: Arc<Mutex<Shard>>,
     pub client: Arc<Mutex<Client>>,
@@ -32,3 +35,21 @@ pub enum SystemThreadCommand {
     ShutdownSystem,
     ShutdownAll,
 }
+
+impl System {
+    pub async fn resolve_mention<'system>(&'system self, maybe_mention: Option<&str>) -> Option<&'system Member> {
+        if let Some(mention) = maybe_mention {
+            if let Ok(mention) = Id::<UserMarker>::parse(mention) {
+                for member in &self.members {
+                    let is_member = {member.user_id.lock().await.map(|id| id == mention).unwrap_or(false)};
+
+                    if is_member {
+                        return Some(&member)
+                    }
+                }
+            }
+        }
+
+        None
+    }
+}