From f9fc0a741e38beeefc90ae9dae7a4fdeedf729ce Mon Sep 17 00:00:00 2001 From: Robert Date: Thu, 10 Nov 2022 15:52:55 +0200 Subject: [PATCH] use EmailView function for greeting user and change layout email signature --- .../templates/layout/base_email.html.eex | 13 +++---------- lib/plausible_web/views/email_view.ex | 10 ++++------ 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/lib/plausible_web/templates/layout/base_email.html.eex b/lib/plausible_web/templates/layout/base_email.html.eex index c13e1a21b..5fd940ad9 100644 --- a/lib/plausible_web/templates/layout/base_email.html.eex +++ b/lib/plausible_web/templates/layout/base_email.html.eex @@ -1,18 +1,11 @@ -<%= case Map.get(assigns, :user) do - %{name: name} when is_binary(name) -> "Hey #{String.split(name) |> List.first()}," - _any -> "Hey," -end %> +<%= PlausibleWeb.EmailView.greet_recipient(assigns) %>

<%= @inner_content %>

-Thanks,
-<%= if Application.get_env(:plausible, :is_selfhost) do %> -Plausible -<% else %> -Uku and Marko -<% end %> +Regards,
+The Plausible Team 💌

-- diff --git a/lib/plausible_web/views/email_view.ex b/lib/plausible_web/views/email_view.ex index 5d43bd667..dddf17005 100644 --- a/lib/plausible_web/views/email_view.ex +++ b/lib/plausible_web/views/email_view.ex @@ -13,14 +13,12 @@ defmodule PlausibleWeb.EmailView do PlausibleWeb.Endpoint.host() end - def user_salutation(user) do - if user.name do - String.split(user.name) |> List.first() - else - "" - end + def greet_recipient(%{user: %{name: name}}) when is_binary(name) do + "Hey #{String.split(name) |> List.first()}," end + def greet_recipient(_), do: "Hey," + def date_format(date) do Timex.format!(date, "{D} {Mshort} {YYYY}") end