diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2019-07-20 16:41:58 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2019-07-20 16:41:58 +0300 |
| commit | 8292331b35f088a19a4d14eff69b74a6d1ed4746 (patch) | |
| tree | 3a4f85b315f299b59c36cbdb3f8830a4923c11da /lib | |
| parent | ae4fc58589ac48a0853719e6f83b2559b6de44fb (diff) | |
| parent | fe548f322e834c7c81678a460c54c71f1198021c (diff) | |
| download | pleroma-8292331b35f088a19a4d14eff69b74a6d1ed4746.tar.gz | |
Merge branch 'develop' into feature/digest-email
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/user.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index cf6aee547..c0e418e2f 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -1212,7 +1212,7 @@ defmodule Pleroma.User do data |> Map.put(:name, blank?(data[:name]) || data[:nickname]) |> remote_user_creation() - |> Repo.insert(on_conflict: :replace_all, conflict_target: :nickname) + |> Repo.insert(on_conflict: :replace_all_except_primary_key, conflict_target: :nickname) |> set_cache() end diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index 877430a1d..e8b43e475 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -440,7 +440,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do end def user_statuses(%{assigns: %{user: reading_user}} = conn, params) do - with %User{} = user <- User.get_cached_by_id(params["id"]) do + with %User{} = user <- User.get_cached_by_nickname_or_id(params["id"]) do params = params |> Map.put("tag", params["tagged"]) |