Merge branch 'develop' into feature/matstodon-statuses-by-name
authorMark Felder <feld@FreeBSD.org>
Mon, 15 Jul 2019 22:10:27 +0000 (17:10 -0500)
committerMark Felder <feld@FreeBSD.org>
Mon, 15 Jul 2019 22:10:27 +0000 (17:10 -0500)
1  2 
docs/api/differences_in_mastoapi_responses.md
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex

index bc75ab35a09f14ab47c76a0228ca4e5a31b88a77,f4aa576f73463482ccc35aea5c2bfa8acb9315c6..29b1391d360ebe7e5ec5826ca4e3a676983ad403
@@@ -330,7 -431,11 +431,11 @@@ defmodule Pleroma.Web.MastodonAPI.Masto
    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"])
        activities = ActivityPub.fetch_user_activities(user, reading_user, params)
  
        conn