From 27d7107a127f3ff513b6281d94e22ce6ff781115 Mon Sep 17 00:00:00 2001
From: Ashelyn Rose <git@ashen.earth>
Date: Sun, 6 Oct 2024 17:53:31 -0600
Subject: Reproxy

---
 src/system/message_parser.rs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/system/message_parser.rs')

diff --git a/src/system/message_parser.rs b/src/system/message_parser.rs
index e769eed..5d14095 100644
--- a/src/system/message_parser.rs
+++ b/src/system/message_parser.rs
@@ -65,7 +65,7 @@ impl MessageParser {
             }
         }
 
-        if let Some(parse) = MessageParser::check_member_patterns(message, system_config) {
+        if let Some(parse) = MessageParser::check_member_patterns(message, secondary_message, system_config) {
             return parse
         }
 
@@ -150,13 +150,15 @@ impl MessageParser {
         None
     }
 
-    fn check_member_patterns(message: &FullMessage, system_config: &System) -> Option<ParsedMessage> {
+    fn check_member_patterns(message: &FullMessage, secondary_message: Option<&FullMessage>, system_config: &System) -> Option<ParsedMessage> {
         let matches_prefix = system_config.members.iter().enumerate().find_map(|(member_id, member)|
             Some((member_id, member.matches_proxy_prefix(&message)?))
         );
 
         if let Some((member_id, matched_content)) = matches_prefix {
-            if matched_content.trim() != "" {
+            if matched_content.trim() == "*" {
+                Some(ParsedMessage::Command(Command::Reproxy(member_id, secondary_message.unwrap().id)))
+            } else if matched_content.trim() != "" {
                 Some(ParsedMessage::ProxiedMessage {
                     member_id,
                     message_content: matched_content.to_string(),
@@ -192,7 +194,7 @@ impl MessageParser {
         None
     }
 
-    fn get_member_id_from_user_id(user_id: UserId, system_config: &System) -> Option<MemberId> {
+    pub fn get_member_id_from_user_id(user_id: UserId, system_config: &System) -> Option<MemberId> {
         system_config.members.iter().enumerate()
             .filter(|(_id, m)| m.user_id.is_some())
             .find(|(_id, m)| m.user_id.unwrap() == user_id)
-- 
cgit 1.4.1