nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "Add plaintext support for all emails except the digest"

Browse source 
This reverts commit 5df9f68392.
This commit is contained in:
Mark Felder 2021-02-08 16:39:55 -06:00
parent 593c0851d9
commit 4cacce4b42
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/pleroma/emails/user_email.ex
View file

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