From 16fa0b0330e0a1481a60a8d2f9a57b128357a803 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Tue, 16 Apr 2024 17:24:33 +0200
Subject: [PATCH 1/2] :sparkles: Improve email clean mechanism

---
 backend/src/app/rpc/commands/profile.clj        | 4 ++++
 backend/test/backend_tests/rpc_profile_test.clj | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/backend/src/app/rpc/commands/profile.clj b/backend/src/app/rpc/commands/profile.clj
index 89a50b6ad..fe33da10d 100644
--- a/backend/src/app/rpc/commands/profile.clj
+++ b/backend/src/app/rpc/commands/profile.clj
@@ -46,6 +46,10 @@
   (let [email (str/lower email)
         email (if (str/starts-with? email "mailto:")
                 (subs email 7)
+                email)
+        email (if (or (str/starts-with? email "<")
+                      (str/ends-with? email ">"))
+                (str/trim email "<>")
                 email)]
     email))
 
diff --git a/backend/test/backend_tests/rpc_profile_test.clj b/backend/test/backend_tests/rpc_profile_test.clj
index cbaff6038..00d2f2ac0 100644
--- a/backend/test/backend_tests/rpc_profile_test.clj
+++ b/backend/test/backend_tests/rpc_profile_test.clj
@@ -27,6 +27,14 @@
 (t/use-fixtures :once th/state-init)
 (t/use-fixtures :each th/database-reset)
 
+
+(t/deftest clean-email
+  (t/is "foo@example.com" (profile/clean-email "mailto:foo@example.com"))
+  (t/is "foo@example.com" (profile/clean-email "mailto:<foo@example.com>"))
+  (t/is "foo@example.com" (profile/clean-email "<foo@example.com>"))
+  (t/is "foo@example.com" (profile/clean-email "foo@example.com>"))
+  (t/is "foo@example.com" (profile/clean-email "<foo@example.com")))
+
 ;; Test with wrong credentials
 (t/deftest profile-login-failed-1
   (let [profile (th/create-profile* 1)

From edd91f00af7a91975a6ba9094f9d8c1da69f37e8 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Tue, 16 Apr 2024 17:31:23 +0200
Subject: [PATCH 2/2] :sparkles: Add minor improvement to worker module logging

---
 backend/src/app/worker/runner.clj | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/src/app/worker/runner.clj b/backend/src/app/worker/runner.clj
index e68fa484d..be3663365 100644
--- a/backend/src/app/worker/runner.clj
+++ b/backend/src/app/worker/runner.clj
@@ -139,7 +139,7 @@
 
                 :else
                 (try
-                  (l/trc :hint "start"
+                  (l/dbg :hint "start"
                          :name (:name task)
                          :task-id (str task-id)
                          :queue queue
@@ -149,7 +149,7 @@
                         result  (handle-task task)
                         elapsed (dt/format-duration (tpoint))]
 
-                    (l/trc :hint "end"
+                    (l/dbg :hint "end"
                            :name (:name task)
                            :task-id (str task-id)
                            :queue queue
@@ -228,9 +228,9 @@
             (recur))))
 
       (catch InterruptedException _
-        (l/debug :hint "interrupted"
-                 :id id
-                 :queue queue))
+        (l/dbg :hint "interrupted"
+               :id id
+               :queue queue))
       (catch Throwable cause
         (l/err :hint "unexpected exception"
                :id id