From 67776c46d6d6c736a90e42d6fde4f75c6a2d4a82 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Mon, 27 Dec 2021 11:13:08 +0100
Subject: [PATCH 1/3] :bug: Fix NPE on email complains checking.

---
 backend/src/app/emails.clj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/app/emails.clj b/backend/src/app/emails.clj
index 43b6482740..6721c299ca 100644
--- a/backend/src/app/emails.clj
+++ b/backend/src/app/emails.clj
@@ -66,8 +66,8 @@
                               (:id profile)
                               (db/interval bounce-max-age)])]
 
-      (and (< complaints complaint-threshold)
-           (< bounces bounce-threshold)))))
+      (and (< (or complaints 0) complaint-threshold)
+           (< (or bounces 0) bounce-threshold)))))
 
 (defn has-complaint-reports?
   ([conn email] (has-complaint-reports? conn email nil))

From 220ab2211576b3e8bd2ca30632400648e6c0d48d Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Mon, 27 Dec 2021 11:30:22 +0100
Subject: [PATCH 2/3] :bug: Fix error reporting hook.

---
 backend/src/app/loggers/mattermost.clj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/src/app/loggers/mattermost.clj b/backend/src/app/loggers/mattermost.clj
index 340fd7bf1b..07da27aadc 100644
--- a/backend/src/app/loggers/mattermost.clj
+++ b/backend/src/app/loggers/mattermost.clj
@@ -62,7 +62,8 @@
   (when uri
     (l/info :msg "initializing mattermost error reporter" :uri uri)
     (let [output (a/chan (a/sliding-buffer 128)
-                         (filter #(= (:level %) "error")))]
+                         (filter (fn [event]
+                                   (= (:logger/level event) "error"))))]
       (receiver :sub output)
       (a/go-loop []
         (let [msg (a/<! output)]

From d8f417648762eb2d72c20038497813f2109f0782 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Mon, 27 Dec 2021 11:41:13 +0100
Subject: [PATCH 3/3] :paperclip: Minor fixes on versions.

---
 backend/deps.edn | 12 +++---------
 common/deps.edn  |  3 +--
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/backend/deps.edn b/backend/deps.edn
index c89f7bb28c..cebf952830 100644
--- a/backend/deps.edn
+++ b/backend/deps.edn
@@ -1,12 +1,6 @@
-{
- ;; :mvn/repos
- ;; {"central" {:url "https://repo1.maven.org/maven2/"}
- ;;  "clojars" {:url "https://clojars.org/repo"}
- ;;  "jcenter" {:url "https://jcenter.bintray.com/"}
- ;;  }
- :deps
- {penpot/common
-  {:local/root "../common"}
+{:deps
+ {penpot/common {:local/root "../common"}
+  org.clojure/core.async {:mvn/version "1.5.648"}
 
   ;; Logging
   org.zeromq/jeromq {:mvn/version "0.5.2"}
diff --git a/common/deps.edn b/common/deps.edn
index 853462e656..172c11c5e1 100644
--- a/common/deps.edn
+++ b/common/deps.edn
@@ -1,7 +1,6 @@
 {:deps
  {org.clojure/clojure {:mvn/version "1.10.3"}
   org.clojure/data.json {:mvn/version "2.3.1"}
-  org.clojure/core.async {:mvn/version "1.3.618"}
   org.clojure/tools.cli {:mvn/version "1.0.206"}
   metosin/jsonista {:mvn/version "0.3.3"}
   org.clojure/clojurescript {:mvn/version "1.10.844"}
@@ -34,7 +33,7 @@
 
   ;; exception printing
   fipp/fipp {:mvn/version "0.6.24"}
-  io.aviso/pretty {:mvn/version "0.1.37"}
+  io.aviso/pretty {:mvn/version "1.1.1"}
   environ/environ {:mvn/version "1.2.0"}}
  :paths ["src"]
  :aliases