X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Femails%2Fnew_users_digest_email.ex;h=7d16b807f60849d9ff33fa07b67c83d31d9cd91c;hb=a92c713d9c761563c72d0f660574878aa569249a;hp=21096a7446b4cd01168d5069269c2b5daec3320e;hpb=6875ccb6bfcc5ae62db26d38c3d5eac4c6f8706a;p=akkoma diff --git a/lib/pleroma/emails/new_users_digest_email.ex b/lib/pleroma/emails/new_users_digest_email.ex index 21096a744..7d16b807f 100644 --- a/lib/pleroma/emails/new_users_digest_email.ex +++ b/lib/pleroma/emails/new_users_digest_email.ex @@ -1,5 +1,5 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2019 Pleroma Authors +# Copyright © 2017-2020 Pleroma Authors # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Emails.NewUsersDigestEmail do @@ -12,14 +12,10 @@ defmodule Pleroma.Emails.NewUsersDigestEmail do def new_users(to, users_and_statuses) do instance_name = Pleroma.Config.get([:instance, :name]) styling = Pleroma.Config.get([Pleroma.Emails.UserEmail, :styling]) - logo = Pleroma.Config.get([Pleroma.Emails.UserEmail, :logo]) - logo_path = - if is_nil(logo) do - Path.join(:code.priv_dir(:pleroma), "static/static/logo.png") - else - Path.join(Pleroma.Config.get([:instance, :static_dir]), logo) - end + logo_url = + Pleroma.Web.Endpoint.url() <> + Pleroma.Config.get([:frontend_configurations, :pleroma_fe, :logo]) new() |> to({to.name, to.email}) @@ -29,8 +25,8 @@ defmodule Pleroma.Emails.NewUsersDigestEmail do title: "New Users", users_and_statuses: users_and_statuses, instance: instance_name, - styling: styling + styling: styling, + logo_url: logo_url }) - |> attachment(Swoosh.Attachment.new(logo_path, filename: "logo.png", type: :inline)) end end