Merge branch 'main' of https://github.com/zkemail/relayer-utils

zkemail · Oct 22, 2024 · 5b49b7c · 5b49b7c
2 parents 957b16f + 659b12c
commit 5b49b7c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "relayer-utils"
-version = "0.3.9"
+version = "0.4.1"
 authors = ["Sora Suegami", "Aditya Bisht"]
 license = "MIT"
 edition = "2018"

diff --git a/src/command_templates.rs b/src/command_templates.rs
@@ -94,6 +94,11 @@ pub fn extract_template_vals_from_command(
     input: &str,
     templates: Vec<String>,
 ) -> Result<Vec<TemplateValue>, anyhow::Error> {
+    // Skip to text/html part
+    let re = Regex::new(r"(?s)Content-Type:\s*text/html;.*?\r?\n\r?\n(.*?)(?:--\S+|$)").unwrap();
+    let caps = re.captures(input).unwrap();
+    let input = caps.get(1).unwrap().as_str();
+
     // Convert the template to a regex pattern, escaping necessary characters and replacing placeholders
     let pattern = templates
         .iter()