diff --git a/lib/plausible_web/email.ex b/lib/plausible_web/email.ex
index 70041a0a7..6e84653ec 100644
--- a/lib/plausible_web/email.ex
+++ b/lib/plausible_web/email.ex
@@ -188,7 +188,7 @@ defmodule PlausibleWeb.Email do
|> to(user.email)
|> tag("cancelled-email")
|> subject("Your Plausible Analytics subscription has been canceled")
- |> render("cancellation_email.html", name: user.name)
+ |> render("cancellation_email.html", user: user)
end
def new_user_invitation(invitation) do
@@ -230,6 +230,7 @@ defmodule PlausibleWeb.Email do
"[Plausible Analytics] #{invitation.email} accepted your invitation to #{invitation.site.domain}"
)
|> render("invitation_accepted.html",
+ user: invitation.inviter,
invitation: invitation
)
end
@@ -242,6 +243,7 @@ defmodule PlausibleWeb.Email do
"[Plausible Analytics] #{invitation.email} rejected your invitation to #{invitation.site.domain}"
)
|> render("invitation_rejected.html",
+ user: invitation.inviter,
invitation: invitation
)
end
@@ -254,6 +256,7 @@ defmodule PlausibleWeb.Email do
"[Plausible Analytics] #{invitation.email} accepted the ownership transfer of #{invitation.site.domain}"
)
|> render("ownership_transfer_accepted.html",
+ user: invitation.inviter,
invitation: invitation
)
end
@@ -266,6 +269,7 @@ defmodule PlausibleWeb.Email do
"[Plausible Analytics] #{invitation.email} rejected the ownership transfer of #{invitation.site.domain}"
)
|> render("ownership_transfer_rejected.html",
+ user: invitation.inviter,
invitation: invitation
)
end
@@ -276,6 +280,7 @@ defmodule PlausibleWeb.Email do
|> tag("site-member-removed")
|> subject("[Plausible Analytics] Your access to #{membership.site.domain} has been revoked")
|> render("site_member_removed.html",
+ user: membership.user,
membership: membership
)
end
diff --git a/lib/plausible_web/templates/email/cancellation_email.html.eex b/lib/plausible_web/templates/email/cancellation_email.html.eex
index 119e46001..4575ed608 100644
--- a/lib/plausible_web/templates/email/cancellation_email.html.eex
+++ b/lib/plausible_web/templates/email/cancellation_email.html.eex
@@ -1,5 +1,3 @@
-Hi <%= @name %>,
-
Thanks for being a Plausible Analytics subscriber and I'm sorry to see you go.
I'd love to hear about your experience and how you think we can improve Plausible Analytics for our other subscribers (and for you if you decide to come back). Please reply back to this email with your feedback.
diff --git a/lib/plausible_web/templates/email/invitation_accepted.html.eex b/lib/plausible_web/templates/email/invitation_accepted.html.eex
index f437183d2..121afa379 100644
--- a/lib/plausible_web/templates/email/invitation_accepted.html.eex
+++ b/lib/plausible_web/templates/email/invitation_accepted.html.eex
@@ -1,5 +1,3 @@
-Hey <%= user_salutation(@invitation.inviter) %>,
-
<%= @invitation.email %> has accepted your invitation to <%= @invitation.site.domain %>.
<%= link("Click here", to: Routes.site_url(PlausibleWeb.Endpoint, :settings_general, @invitation.site.domain)) %> to view site settings.
diff --git a/lib/plausible_web/templates/email/invitation_rejected.html.eex b/lib/plausible_web/templates/email/invitation_rejected.html.eex
index ef40174ba..09e9641c4 100644
--- a/lib/plausible_web/templates/email/invitation_rejected.html.eex
+++ b/lib/plausible_web/templates/email/invitation_rejected.html.eex
@@ -1,5 +1,3 @@
-Hey <%= user_salutation(@invitation.inviter) %>,
-
<%= @invitation.email %> has rejected your invitation to <%= @invitation.site.domain %>.
<%= link("Click here", to: Routes.site_url(PlausibleWeb.Endpoint, :settings_general, @invitation.site.domain)) %> to view site settings.
diff --git a/lib/plausible_web/templates/email/ownership_transfer_accepted.html.eex b/lib/plausible_web/templates/email/ownership_transfer_accepted.html.eex
index 1d8dcf53c..36f0596fe 100644
--- a/lib/plausible_web/templates/email/ownership_transfer_accepted.html.eex
+++ b/lib/plausible_web/templates/email/ownership_transfer_accepted.html.eex
@@ -1,5 +1,3 @@
-Hey <%= user_salutation(@invitation.inviter) %>,
-
<%= @invitation.email %> has accepted the ownership transfer of <%= @invitation.site.domain %>. They will be responsible for billing of it going
forward and your role has been changed to admin.
<%= link("Click here", to: Routes.site_url(PlausibleWeb.Endpoint, :settings_general, @invitation.site.domain)) %> to view site settings.
diff --git a/lib/plausible_web/templates/email/ownership_transfer_rejected.html.eex b/lib/plausible_web/templates/email/ownership_transfer_rejected.html.eex
index b67ca63e0..497e3f1eb 100644
--- a/lib/plausible_web/templates/email/ownership_transfer_rejected.html.eex
+++ b/lib/plausible_web/templates/email/ownership_transfer_rejected.html.eex
@@ -1,5 +1,3 @@
-Hey <%= user_salutation(@invitation.inviter) %>,
-
<%= @invitation.email %> has rejected the ownership transfer of <%= @invitation.site.domain %>.
<%= link("Click here", to: Routes.site_url(PlausibleWeb.Endpoint, :settings_general, @invitation.site.domain)) %> to view site settings.
diff --git a/lib/plausible_web/templates/email/site_member_removed.html.eex b/lib/plausible_web/templates/email/site_member_removed.html.eex
index 1634b7dcf..35bffc2c0 100644
--- a/lib/plausible_web/templates/email/site_member_removed.html.eex
+++ b/lib/plausible_web/templates/email/site_member_removed.html.eex
@@ -1,5 +1,3 @@
-Hey <%= user_salutation(@membership.user) %>,
-
An administrator of <%= @membership.site.domain %> has removed you as a member. You won't be able to see the stats anymore.
<%= link("Click here", to: Routes.site_url(PlausibleWeb.Endpoint, :index)) %> to view your sites.