replace askama

Cargo.toml

@@ -79,7 +79,6 @@ members = [
 resolver = "2"
 
 [workspace.dependencies]
-askama = { version = "0.12.1", default-features = false }
 asynk-strim = "0.1.2"
 clap = { version = "4.5.21", features = ["derive", "wrap_help"] }
 diesel = { version = "2.2.5", default-features = false, features = [
@@ -116,6 +115,10 @@ iso8601-timestamp = "0.3.1"
 itertools = { version = "0.13.0", default-features = false }
 minijinja = { version = "2.5.0", features = ["loader"] }
 moka = { version = "=0.12.7", features = ["sync"] }
+sailfish = { version = "0.9.0", default-features = false, features = [
+    "derive",
+    "perf-inline",
+] }
 simdutf8 = { version = "0.1.5", features = ["aarch64_neon"] }
 sonic-rs = "=0.3.14"
 tokio = "1.41.1"

crates/kitsune-email/Cargo.toml

@@ -6,7 +6,6 @@ version.workspace = true
 license.workspace = true
 
 [dependencies]
-askama.workspace = true
 diesel.workspace = true
 diesel-async.workspace = true
 kitsune-db.workspace = true
@@ -26,6 +25,7 @@ mrml = { version = "4.0.1", default-features = false, features = [
     "parse",
     "render",
 ] }
+sailfish.workspace = true
 speedy-uuid.workspace = true
 triomphe.workspace = true
 typed-builder = "0.20.0"

crates/kitsune-email/src/mails/confirm_account.rs

@@ -1,11 +1,11 @@
 use crate::traits::{RenderableEmail, RenderedEmail};
-use askama::Template;
 use kitsune_error::Result;
 use mrml::{mjml::Mjml, prelude::render::RenderOptions};
+use sailfish::Template;
 use typed_builder::TypedBuilder;
 
 #[derive(Template, TypedBuilder)]
-#[template(escape = "html", path = "verify.mjml")]
+#[template(path = "verify.mjml")]
 pub struct ConfirmAccount<'a> {
     domain: &'a str,
     username: &'a str,

crates/kitsune-email/templates/verify.mjml

@@ -1,41 +1,40 @@
 <mjml>
   <mj-head>
-    <mj-title>Confirm your {{domain}} account</mj-title>
+    <mj-title>Confirm your <%= self.domain %> account</mj-title>
     <mj-attributes>
       <mj-all font-family="monospace" line-height="17px" />
     </mj-attributes>
   </mj-head>
   <mj-body>
     <mj-section>
       <mj-column>
-
-        <mj-text align="center" font-size="30px">
-          Kitsune
-        </mj-text>
+        <mj-text align="center" font-size="30px"> Kitsune </mj-text>
 
         <mj-divider></mj-divider>
 
-        <mj-text font-size="25px">
-          Confirm your account
-        </mj-text>
+        <mj-text font-size="25px"> Confirm your account </mj-text>
 
         <mj-text>
-          Congratulations to your new account on {{domain}}!
-          <p>Click the button below to unlock your account (@{{username}})!</p>
+          Congratulations to your new account on <%= self.domain %>!
+          <p>
+            Click the button below to unlock your account (@<%= self.username
+            %>)!
+          </p>
         </mj-text>
 
-        <mj-button href="{{verify_link}}">
-          Confirm my account!
-        </mj-button>
+        <mj-button href="{{verify_link}}"> Confirm my account! </mj-button>
 
         <mj-text>
           You didn't register an account? Feel free to just ignore this email!
         </mj-text>
 
         <mj-text align="center" font-size="10px">
-          {{domain}} powered by <a style="text-decoration:none;" href="https://joinkitsune.org">Kitsune</a>
+          <%= self.domain %> powered by
+          <a style="text-decoration: none" href="https://joinkitsune.org"
+            >Kitsune</a
+          >
         </mj-text>
       </mj-column>
     </mj-section>
   </mj-body>
-</mjml>
+</mjml>

crates/kitsune-language/Cargo.toml

@@ -14,7 +14,7 @@ isolang = { version = "2.4.0", features = [
     "list_languages",
     "serde",
 ] }
-rustc-hash = "2.0.0"
+rustc-hash = "2.1.0"
 whatlang = "0.16.4"
 whichlang = "0.1.0"
 

kitsune/src/template.rs

@@ -1,6 +1,6 @@
 use arc_swap::ArcSwapAny;
 use core::str;
-use notify_debouncer_full::notify;
+use notify_debouncer_full::{notify, DebounceEventResult};
 use rust_embed::RustEmbed;
 use std::{mem::ManuallyDrop, path::Path, sync::OnceLock, time::Duration};
 use triomphe::Arc;
@@ -33,7 +33,7 @@ fn spawn_watcher() {
     let watcher = notify_debouncer_full::new_debouncer(
         Duration::from_secs(1),
         None,
-        |events: notify_debouncer_full::DebounceEventResult| {
+        |events: DebounceEventResult| {
             let Ok(events) = events else {
                 return;
             };