logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: d6cc6aff9b617a50679fe99d1533d2b3d118b656
parent a0af6cba09f6c85f524d31f7d1a68948b77d9e53
Author: Mark Felder <feld@feld.me>
Date:   Thu,  8 Aug 2024 14:22:25 -0400

Unintended commit

Diffstat:

Mtest/support/factory.ex16++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/test/support/factory.ex b/test/support/factory.ex @@ -53,15 +53,6 @@ defmodule Pleroma.Factory do 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 = if attrs[:local] == false do base_domain = attrs[:domain] || Enum.random(["domain1.com", "domain2.com", "domain3.com"]) @@ -84,7 +75,12 @@ defmodule Pleroma.Factory do } end - Map.merge(user, urls) + attrs = Map.delete(attrs, :domain) + + user + |> Map.put(:raw_bio, user.bio) + |> Map.merge(urls) + |> merge_attributes(attrs) end def user_relationship_factory(attrs \\ %{}) do