diff options
| author | feld <feld@feld.me> | 2019-07-19 21:59:18 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2019-07-19 21:59:18 +0000 |
| commit | 93df0796f05eff382301de91fb268bb4bc3c3379 (patch) | |
| tree | 64c841338c170703d8089684855175a913e374ca /lib | |
| parent | 33729bbb2834bfa1f223b11d47dc8e3230d47657 (diff) | |
| parent | 9169f331b6d481a0aa2b0bfe91500d695fb1b6d6 (diff) | |
| download | pleroma-93df0796f05eff382301de91fb268bb4bc3c3379.tar.gz | |
Merge branch 'feature/matstodon-statuses-by-name' into 'develop'
Feature/matstodon statuses by name
See merge request pleroma/pleroma!1211
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
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"]) |