hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/digest-email

Browse source
This commit is contained in:
Roman Chvanikov 2019-07-20 16:41:58 +03:00
commit 8292331b35
9 changed files with 81 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/user.ex
View file

@ -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

2
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View file

@ -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"])