mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2025-01-03 13:58:41 +00:00
Code Issues Projects Releases Wiki Activity

Unintended commit

Browse source
This commit is contained in:
Mark Felder 2024-08-08 14:22:25 -04:00
parent a0af6cba09
commit d6cc6aff9b
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
test/support/factory.ex
View file

@ -53,15 +53,6 @@ defmodule Pleroma.Factory do
keys: pem keys: pem
} }
attrs = Map.delete(attrs, :domain)
user
|> Map.put(:raw_bio, user.bio)
|> merge_attributes(attrs)
|> user_urls(attrs)
end
defp user_urls(user, attrs) do
urls = urls =
if attrs[:local] == false do if attrs[:local] == false do
base_domain = attrs[:domain] || Enum.random(["domain1.com", "domain2.com", "domain3.com"]) base_domain = attrs[:domain] || Enum.random(["domain1.com", "domain2.com", "domain3.com"])
@ -84,7 +75,12 @@ defmodule Pleroma.Factory do
} }
end end
Map.merge(user, urls) attrs = Map.delete(attrs, :domain)
user
|> Map.put(:raw_bio, user.bio)
|> Map.merge(urls)
|> merge_attributes(attrs)
end end
def user_relationship_factory(attrs \\ %{}) do def user_relationship_factory(attrs \\ %{}) do