Page MenuHomePhorge
Files F85627907

No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/lib/pleroma/user/email_list.ex b/lib/pleroma/user/email_list.ex
index d2a24f6ab..3b5719805 100644
--- a/lib/pleroma/user/email_list.ex
+++ b/lib/pleroma/user/email_list.ex
@@ -1,53 +1,55 @@
# Pleroma: A lightweight social networking server
# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.User.EmailList do
@moduledoc """
Functions for generating email lists from local users.
"""
import Ecto.Query
alias Pleroma.Repo
alias Pleroma.User
- @header_row ["Email Address"]
+ @header_row ["Email Address", "Nickname"]
defp query(:subscribers) do
User.Query.build(%{
local: true,
active: true,
accepts_email_list: true
})
|> where([u], not is_nil(u.email))
end
defp query(:unsubscribers) do
User.Query.build(%{
local: true,
accepts_email_list: false
})
|> where([u], not is_nil(u.email))
end
def generate_csv(audience) when is_atom(audience) do
audience
|> query()
|> generate_csv()
end
def generate_csv(%Ecto.Query{} = query) do
query
|> Repo.all()
|> Enum.map(&build_row/1)
|> build_csv()
end
- defp build_row(%User{email: email}), do: [email]
+ defp build_row(%User{email: email, nickname: nickname}) do
+ [email, nickname]
+ end
defp build_csv(lines) do
[@header_row | lines]
|> CSV.encode()
|> Enum.join()
end
end
diff --git a/test/pleroma/user/email_list_test.exs b/test/pleroma/user/email_list_test.exs
index 3522bc4fb..ceb9aaa2e 100644
--- a/test/pleroma/user/email_list_test.exs
+++ b/test/pleroma/user/email_list_test.exs
@@ -1,42 +1,42 @@
# Pleroma: A lightweight social networking server
# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.User.EmailListTest do
alias Pleroma.User.EmailList
use Pleroma.DataCase
import Pleroma.Factory
test "generate_csv/1 with :subscribers" do
user1 = insert(:user, accepts_email_list: true)
user2 = insert(:user, accepts_email_list: true)
user3 = insert(:user, accepts_email_list: true)
insert(:user, accepts_email_list: false)
expected = """
- Email Address\r
- #{user1.email}\r
- #{user2.email}\r
- #{user3.email}\r
+ Email Address,Nickname\r
+ #{user1.email},#{user1.nickname}\r
+ #{user2.email},#{user2.nickname}\r
+ #{user3.email},#{user3.nickname}\r
"""
assert EmailList.generate_csv(:subscribers) == expected
end
test "generate_csv/1 with :unsubscribers" do
user1 = insert(:user, accepts_email_list: false)
user2 = insert(:user, accepts_email_list: false)
insert(:user, accepts_email_list: true)
insert(:user, accepts_email_list: true)
expected = """
- Email Address\r
- #{user1.email}\r
- #{user2.email}\r
+ Email Address,Nickname\r
+ #{user1.email},#{user1.nickname}\r
+ #{user2.email},#{user2.nickname}\r
"""
assert EmailList.generate_csv(:unsubscribers) == expected
end
end

File Metadata

Mime Type
text/x-diff
Expires
Sat, Aug 8, 6:39 AM (14 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1722964
Default Alt Text
(3 KB)

Event Timeline