Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Use safe email functions
Uku Taht4d975833314d
diff --git a/lib/plausible_web/controllers/invitation_controller.ex b/lib/plausible_web/controllers/invitation_controller.exindex 94cbef54dc..9e0d2c3740 100644--- a/lib/plausible_web/controllers/invitation_controller.ex+++ b/lib/plausible_web/controllers/invitation_controller.ex@@ -19,7 +19,7 @@ defmodule PlausibleWeb.InvitationController doif invitation.role == :owner doMulti.new()|> downgrade_previous_owner(invitation.site)- |> end_trial_of_new_owner(user)+ |> maybe_end_trial_of_new_owner(user)elseMulti.new()end@@ -64,6 +64,12 @@ defmodule PlausibleWeb.InvitationController doMulti.update_all(multi, :prev_owner, prev_owner, set: [role: :admin])end+ defp maybe_end_trial_of_new_owner(multi, new_owner) do+ if !Application.get_env(:plausible, :is_selfhost) do+ end_trial_of_new_owner(multi, new_owner)+ end+ end+defp end_trial_of_new_owner(multi, new_owner) doif Plausible.Billing.on_trial?(new_owner) || is_nil(new_owner.trial_expiry_date) doEcto.Multi.update(multi, :user, Plausible.Auth.User.end_trial(new_owner))@@ -87,22 +93,22 @@ defmodule PlausibleWeb.InvitationController dodefp notify_invitation_accepted(%Invitation{role: :owner} = invitation) doPlausibleWeb.Email.ownership_transfer_accepted(invitation)- |> Plausible.Mailer.send_email()+ |> Plausible.Mailer.send_email_safe()enddefp notify_invitation_accepted(invitation) doPlausibleWeb.Email.invitation_accepted(invitation)- |> Plausible.Mailer.send_email()+ |> Plausible.Mailer.send_email_safe()enddefp notify_invitation_rejected(%Invitation{role: :owner} = invitation) doPlausibleWeb.Email.ownership_transfer_rejected(invitation)- |> Plausible.Mailer.send_email()+ |> Plausible.Mailer.send_email_safe()enddefp notify_invitation_rejected(invitation) doPlausibleWeb.Email.invitation_rejected(invitation)- |> Plausible.Mailer.send_email()+ |> Plausible.Mailer.send_email_safe()enddef remove_invitation(conn, %{"invitation_id" => invitation_id}) dodiff --git a/lib/plausible_web/controllers/site/membership_controller.ex b/lib/plausible_web/controllers/site/membership_controller.exindex cbb46a6363..c05a592062 100644--- a/lib/plausible_web/controllers/site/membership_controller.ex+++ b/lib/plausible_web/controllers/site/membership_controller.ex@@ -93,7 +93,7 @@ defmodule PlausibleWeb.Site.MembershipController do|> Repo.preload([:site, :inviter])PlausibleWeb.Email.ownership_transfer_request(invitation, user)- |> Plausible.Mailer.send_email()+ |> Plausible.Mailer.send_email_safe()conn|> put_flash(:success, "Site transfer request has been sent to #{email}")diff --git a/lib/workers/notify_annual_renewal.ex b/lib/workers/notify_annual_renewal.exindex 233e5f49ed..3d081543f5 100644--- a/lib/workers/notify_annual_renewal.ex+++ b/lib/workers/notify_annual_renewal.ex@@ -40,11 +40,11 @@ defmodule Plausible.Workers.NotifyAnnualRenewal docase user.subscription.status do"active" ->template = PlausibleWeb.Email.yearly_renewal_notification(user)- Plausible.Mailer.send_email(template)+ Plausible.Mailer.send_email_safe(template)"deleted" ->template = PlausibleWeb.Email.yearly_expiration_notification(user)- Plausible.Mailer.send_email(template)+ Plausible.Mailer.send_email_safe(template)_ ->Sentry.capture_message("Invalid subscription for renewal", user: user)diff --git a/lib/workers/send_email_report.ex b/lib/workers/send_email_report.exindex f53ab48b1a..5438a10ae5 100644--- a/lib/workers/send_email_report.ex+++ b/lib/workers/send_email_report.ex@@ -79,10 +79,6 @@ defmodule Plausible.Workers.SendEmailReport doname: name)- try do- Plausible.Mailer.send_email(template)- rescue- _ -> nil- end+ Plausible.Mailer.send_email_safe(template)endenddiff --git a/lib/workers/send_site_setup_emails.ex b/lib/workers/send_site_setup_emails.exindex d4250aac41..fb365ee206 100644--- a/lib/workers/send_site_setup_emails.ex+++ b/lib/workers/send_site_setup_emails.ex@@ -76,7 +76,7 @@ defmodule Plausible.Workers.SendSiteSetupEmails dodefp send_create_site_email(user) doPlausibleWeb.Email.create_site_email(user)- |> Plausible.Mailer.send_email()+ |> Plausible.Mailer.send_email_safe()Repo.insert_all("create_site_emails", [%{@@ -88,7 +88,7 @@ defmodule Plausible.Workers.SendSiteSetupEmails dodefp send_setup_success_email(user, site) doPlausibleWeb.Email.site_setup_success(user, site)- |> Plausible.Mailer.send_email()+ |> Plausible.Mailer.send_email_safe()Repo.insert_all("setup_success_emails", [%{@@ -100,7 +100,7 @@ defmodule Plausible.Workers.SendSiteSetupEmails dodefp send_setup_help_email(user, site) doPlausibleWeb.Email.site_setup_help(user, site)- |> Plausible.Mailer.send_email()+ |> Plausible.Mailer.send_email_safe()Repo.insert_all("setup_help_emails", [%{diff --git a/lib/workers/send_trial_notifications.ex b/lib/workers/send_trial_notifications.exindex 8eb318ad81..36361eba87 100644--- a/lib/workers/send_trial_notifications.ex+++ b/lib/workers/send_trial_notifications.ex@@ -50,33 +50,25 @@ defmodule Plausible.Workers.SendTrialNotifications dodefp send_one_week_reminder(user) doPlausibleWeb.Email.trial_one_week_reminder(user)- |> send_email()+ |> Plausible.Mailer.send_email_safe()enddefp send_tomorrow_reminder(user) dousage = Plausible.Billing.usage_breakdown(user)PlausibleWeb.Email.trial_upgrade_email(user, "tomorrow", usage)- |> send_email()+ |> Plausible.Mailer.send_email_safe()enddefp send_today_reminder(user) dousage = Plausible.Billing.usage_breakdown(user)PlausibleWeb.Email.trial_upgrade_email(user, "today", usage)- |> send_email()+ |> Plausible.Mailer.send_email_safe()enddefp send_over_reminder(user) doPlausibleWeb.Email.trial_over_email(user)- |> send_email()- end-- defp send_email(email) do- try do- Plausible.Mailer.send_email(email)- rescue- _ -> nil- end+ |> Plausible.Mailer.send_email_safe()endenddiff --git a/lib/workers/spike_notifier.ex b/lib/workers/spike_notifier.exindex 4582536156..a336b34e5d 100644--- a/lib/workers/spike_notifier.ex+++ b/lib/workers/spike_notifier.ex@@ -58,10 +58,6 @@ defmodule Plausible.Workers.SpikeNotifier dodashboard_link)- try do- Plausible.Mailer.send_email(template)- rescue- _ -> nil- end+ Plausible.Mailer.send_email_safe(template)endend