Add plaintext support for all emails except the digest
authorMark Felder <feld@feld.me>
Fri, 5 Feb 2021 15:13:17 +0000 (09:13 -0600)
committerMark Felder <feld@feld.me>
Fri, 5 Feb 2021 15:13:17 +0000 (09:13 -0600)
lib/pleroma/emails/user_email.ex

index a5233f373104015e49b8c0bb333cd578e5327258..74e3e6f410b9f7cf6b924e2b321d1f82f657eb5e 100644 (file)
@@ -8,6 +8,7 @@ defmodule Pleroma.Emails.UserEmail do
   use Phoenix.Swoosh, view: Pleroma.Web.EmailView, layout: {Pleroma.Web.LayoutView, :email}
 
   alias Pleroma.Config
+  alias Pleroma.HTML
   alias Pleroma.User
   alias Pleroma.Web.Endpoint
   alias Pleroma.Web.Router
@@ -43,6 +44,7 @@ defmodule Pleroma.Emails.UserEmail do
     |> from(sender())
     |> subject("Password reset")
     |> html_body(html_body)
+    |> text_body(HTML.strip_tags(html_body))
   end
 
   def user_invitation_email(
@@ -69,6 +71,7 @@ defmodule Pleroma.Emails.UserEmail do
     |> from(sender())
     |> subject("Invitation to #{instance_name()}")
     |> html_body(html_body)
+    |> text_body(HTML.strip_tags(html_body))
   end
 
   def account_confirmation_email(user) do
@@ -91,6 +94,7 @@ defmodule Pleroma.Emails.UserEmail do
     |> from(sender())
     |> subject("#{instance_name()} account confirmation")
     |> html_body(html_body)
+    |> text_body(HTML.strip_tags(html_body))
   end
 
   def approval_pending_email(user) do
@@ -104,6 +108,7 @@ defmodule Pleroma.Emails.UserEmail do
     |> from(sender())
     |> subject("Your account is awaiting approval")
     |> html_body(html_body)
+    |> text_body(HTML.strip_tags(html_body))
   end
 
   def successful_registration_email(user) do
@@ -118,6 +123,7 @@ defmodule Pleroma.Emails.UserEmail do
     |> from(sender())
     |> subject("Account registered on #{instance_name()}")
     |> html_body(html_body)
+    |> text_body(HTML.strip_tags(html_body))
   end
 
   @doc """
@@ -241,5 +247,6 @@ defmodule Pleroma.Emails.UserEmail do
     |> from(sender())
     |> subject("Your account archive is ready")
     |> html_body(html_body)
+    |> text_body(HTML.strip_tags(html_body))
   end
 end