Hotlink logo instead of attachment

5 files changed, 19 insertions, 21 deletions

diff --git a/config/config.exs b/config/config.exs
index 06ae2f262..e97443028 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -488,7 +488,7 @@ config :pleroma, Oban,
     {"0 * * * *", Pleroma.Workers.Cron.StatsWorker},
     {"* * * * *", Pleroma.Workers.Cron.PurgeExpiredActivitiesWorker},
     {"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker},
-    {"0 0 * * *", Pleroma.Workers.NewUsersDigestWorker}
+    {"0 0 * * *", Pleroma.Workers.Cron.NewUsersDigestWorker}
   ]
 
 config :pleroma, :workers,
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 <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # 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
diff --git a/lib/pleroma/web/templates/layout/email_styled.html.eex b/lib/pleroma/web/templates/layout/email_styled.html.eex
index eb5f59244..ca2caaf4d 100644
--- a/lib/pleroma/web/templates/layout/email_styled.html.eex
+++ b/lib/pleroma/web/templates/layout/email_styled.html.eex
@@ -128,7 +128,7 @@
 											<div align="center" class="img-container center"
 												style="padding-right: 0px;padding-left: 0px;">
 												<!--[if mso]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr style="line-height:0px"><td style="padding-right: 0px;padding-left: 0px;" align="center"><![endif]--><img
-													align="center" alt="Image" border="0" class="center" src="cid:logo.png"
+													align="center" alt="Image" border="0" class="center" src="<%= @logo_url %>"
 													style="text-decoration: none; -ms-interpolation-mode: bicubic; border: 0; height: 80px; width: auto; max-height: 80px; display: block;"
 													title="Image" height="80" />
 												<!--[if mso]></td></tr></table><![endif]-->
diff --git a/lib/pleroma/workers/new_users_digest_worker.ex b/lib/pleroma/workers/cron/new_users_digest_worker.ex
index 845eb4bf7..951c2c054 100644
--- a/lib/pleroma/workers/new_users_digest_worker.ex
+++ b/lib/pleroma/workers/cron/new_users_digest_worker.ex
@@ -1,8 +1,8 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
-defmodule Pleroma.Workers.NewUsersDigestWorker do
+defmodule Pleroma.Workers.Cron.NewUsersDigestWorker do
   alias Pleroma.Activity
   alias Pleroma.Repo
   alias Pleroma.User
@@ -48,11 +48,13 @@ defmodule Pleroma.Workers.NewUsersDigestWorker do
           {user, total_statuses, latest_status}
         end)
 
-      %{is_admin: true}
-      |> User.Query.build()
-      |> Repo.all()
-      |> Enum.map(&Pleroma.Emails.NewUsersDigestEmail.new_users(&1, users_and_statuses))
-      |> Enum.each(&Pleroma.Emails.Mailer.deliver/1)
+      if users_and_statuses != [] do
+        %{is_admin: true}
+        |> User.Query.build()
+        |> Repo.all()
+        |> Enum.map(&Pleroma.Emails.NewUsersDigestEmail.new_users(&1, users_and_statuses))
+        |> Enum.each(&Pleroma.Emails.Mailer.deliver/1)
+      end
     end
   end
 end
diff --git a/test/workers/cron/new_users_digest_worker_test.exs b/test/workers/cron/new_users_digest_worker_test.exs
index f735cb152..2f439c1fe 100644
--- a/test/workers/cron/new_users_digest_worker_test.exs
+++ b/test/workers/cron/new_users_digest_worker_test.exs
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Workers.Cron.NewUsersDigestWorkerTest do
@@ -8,7 +8,7 @@ defmodule Pleroma.Workers.Cron.NewUsersDigestWorkerTest do
 
   alias Pleroma.Tests.ObanHelpers
   alias Pleroma.Web.CommonAPI
-  alias Pleroma.Workers.NewUsersDigestWorker
+  alias Pleroma.Workers.Cron.NewUsersDigestWorker
 
   test "it sends new users digest emails" do
     yesterday = NaiveDateTime.utc_now() |> Timex.shift(days: -1)