Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Remove "priority" Postmark message stream from CE (#4990)

ruslandogad16f47809141
diff --git a/lib/plausible_web/email.ex b/lib/plausible_web/email.ex
index 260c5f23cc..6f76912091 100644
--- a/lib/plausible_web/email.ex
+++ b/lib/plausible_web/email.ex
@@ -500,8 +500,13 @@ defmodule PlausibleWeb.Email do
def priority_email(), do: priority_email(%{layout: "priority_email.html"})
def priority_email(%{layout: layout}) do
- base_email(%{layout: layout})
- |> put_param("MessageStream", "priority")
+ email = base_email(%{layout: layout})
+
+ if Plausible.ee?() do
+ put_param(email, "MessageStream", "priority")
+ else
+ email
+ end
end
def base_email(), do: base_email(%{layout: "base_email.html"})
diff --git a/test/plausible_web/email_test.exs b/test/plausible_web/email_test.exs
index 0df984601b..fe8b9f821c 100644
--- a/test/plausible_web/email_test.exs
+++ b/test/plausible_web/email_test.exs
@@ -63,7 +63,8 @@ defmodule PlausibleWeb.EmailTest do
end
describe "priority email layout" do
- test "uses the `priority` message stream in Postmark" do
+ @tag :ee_only
+ test "uses the `priority` message stream in Postmark in EE" do
email =
Email.priority_email()
|> Email.render("activation_email.html", %{
@@ -74,6 +75,18 @@ defmodule PlausibleWeb.EmailTest do
assert %{"MessageStream" => "priority"} = email.private[:message_params]
end
+ @tag :ce_build_only
+ test "doesn't use the `priority` message stream in Postmark in CE" do
+ email =
+ Email.priority_email()
+ |> Email.render("activation_email.html", %{
+ user: build(:user, name: "John Doe"),
+ code: "123"
+ })
+
+ refute email.private[:message_params]["MessageStream"]
+ end
+
test "greets user by first name if user in template assigns" do
email =
Email.priority_email()