3 files changed, 34 insertions, 3 deletions
diff --git a/lib/pleroma/user/mailing_list.ex b/lib/pleroma/user/mailing_list.ex
index 2cc223cc7..b60069023 100644
--- a/lib/pleroma/user/mailing_list.ex
+++ b/lib/pleroma/user/mailing_list.ex
@@ -11,6 +11,8 @@ defmodule Pleroma.User.MailingList do
   alias Pleroma.Repo
   alias Pleroma.User
 
+  @header_row ["Email Address"]
+
   defp subscribers_query do
     User.Query.build(%{
       local: true,
@@ -34,10 +36,11 @@ defmodule Pleroma.User.MailingList do
     |> build_csv()
   end
 
-  defp build_row(%User{email: email}), do: email
+  defp build_row(%User{email: email}), do: [email]
 
   defp build_csv(lines) do
-    ["Email Address" | lines]
-    |> Enum.join("\n")
+    [@header_row | lines]
+    |> CSV.encode()
+    |> Enum.join()
   end
 end
diff --git a/lib/pleroma/web/admin_api/controllers/email_list_controller.ex b/lib/pleroma/web/admin_api/controllers/email_list_controller.ex
new file mode 100644
index 000000000..dfe9009b8
--- /dev/null
+++ b/lib/pleroma/web/admin_api/controllers/email_list_controller.ex
@@ -0,0 +1,26 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.AdminAPI.EmailListController do
+  use Pleroma.Web, :controller
+
+  alias Pleroma.User.MailingList
+  alias Pleroma.Web.Plugs.OAuthScopesPlug
+
+  require Logger
+
+  plug(
+    OAuthScopesPlug,
+    %{scopes: ["admin:read:accounts"]} when action in [:subscribers]
+  )
+
+  def subscribers(conn, _params) do
+    csv = MailingList.generate_csv()
+
+    conn
+    |> put_resp_content_type("text/csv")
+    |> resp(200, csv)
+    |> send_resp()
+  end
+end
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 72ad14f05..f825fadcd 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -257,6 +257,8 @@ defmodule Pleroma.Web.Router do
     post("/frontends/install", FrontendController, :install)
 
     post("/backups", AdminAPIController, :create_backup)
+
+    get("/email_list/subscribers.csv", EmailListController, :subscribers)
   end
 
   scope "/api/v1/pleroma/emoji", Pleroma.Web.PleromaAPI do