From: rinpatch <rinpatch@sdf.org>
Date: Thu, 16 Apr 2020 18:28:52 +0000 (+0300)
Subject: Merge branch 'develop' into features/remove-user-source_data
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=942d7467ca28c898f914539ae85ea3044c36ebbc;p=akkoma

Merge branch 'develop' into features/remove-user-source_data
---

942d7467ca28c898f914539ae85ea3044c36ebbc
diff --cc lib/pleroma/user.ex
index d05dfb480,d9410535b..896bab140
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@@ -344,14 -339,7 +344,14 @@@ defmodule Pleroma.User d
      end
    end
  
 +  defp fix_follower_address(%{follower_address: _, following_address: _} = params), do: params
 +
 +  defp fix_follower_address(%{nickname: nickname} = params),
 +    do: Map.put(params, :follower_address, ap_followers(%User{nickname: nickname}))
 +
 +  defp fix_follower_address(params), do: params
 +
-   def remote_user_creation(params) do
+   def remote_user_changeset(struct \\ %User{local: false}, params) do
      bio_limit = Pleroma.Config.get([:instance, :user_bio_length], 5000)
      name_limit = Pleroma.Config.get([:instance, :user_name_length], 100)
  
@@@ -360,47 -356,54 +368,48 @@@
        |> truncate_if_exists(:name, name_limit)
        |> truncate_if_exists(:bio, bio_limit)
        |> truncate_fields_param()
 +      |> fix_follower_address()
  
-     %User{local: false}
 -    changeset =
 -      struct
 -      |> cast(
 -        params,
 -        [
 -          :bio,
 -          :name,
 -          :ap_id,
 -          :nickname,
 -          :avatar,
 -          :ap_enabled,
 -          :source_data,
 -          :banner,
 -          :locked,
 -          :magic_key,
 -          :uri,
 -          :hide_followers,
 -          :hide_follows,
 -          :hide_followers_count,
 -          :hide_follows_count,
 -          :follower_count,
 -          :fields,
 -          :following_count,
 -          :discoverable,
 -          :invisible,
 -          :actor_type,
 -          :also_known_as,
 -          :last_refreshed_at
 -        ]
 -      )
 -      |> validate_required([:name, :ap_id])
 -      |> unique_constraint(:nickname)
 -      |> validate_format(:nickname, @email_regex)
 -      |> validate_length(:bio, max: bio_limit)
 -      |> validate_length(:name, max: name_limit)
 -      |> validate_fields(true)
 -
 -    case params[:source_data] do
 -      %{"followers" => followers, "following" => following} ->
 -        changeset
 -        |> put_change(:follower_address, followers)
 -        |> put_change(:following_address, following)
 -
 -      _ ->
 -        followers = ap_followers(%User{nickname: get_field(changeset, :nickname)})
 -        put_change(changeset, :follower_address, followers)
 -    end
++    struct
 +    |> cast(
 +      params,
 +      [
 +        :bio,
 +        :name,
 +        :emoji,
 +        :ap_id,
 +        :inbox,
 +        :shared_inbox,
 +        :nickname,
 +        :public_key,
 +        :avatar,
 +        :ap_enabled,
 +        :banner,
 +        :locked,
++        :last_refreshed_at,
 +        :magic_key,
 +        :uri,
 +        :follower_address,
 +        :following_address,
 +        :hide_followers,
 +        :hide_follows,
 +        :hide_followers_count,
 +        :hide_follows_count,
 +        :follower_count,
 +        :fields,
 +        :following_count,
 +        :discoverable,
 +        :invisible,
 +        :actor_type,
 +        :also_known_as
 +      ]
 +    )
 +    |> validate_required([:name, :ap_id])
 +    |> unique_constraint(:nickname)
 +    |> validate_format(:nickname, @email_regex)
 +    |> validate_length(:bio, max: bio_limit)
 +    |> validate_length(:name, max: name_limit)
 +    |> validate_fields(true)
    end
  
    def update_changeset(struct, params \\ %{}) do