From: Mark Felder <feld@FreeBSD.org>
Date: Mon, 15 Jul 2019 22:10:27 +0000 (-0500)
Subject: Merge branch 'develop' into feature/matstodon-statuses-by-name
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=ffb4eb9779ddd28ecee84c06e8dc58f4a4daaa38;p=akkoma

Merge branch 'develop' into feature/matstodon-statuses-by-name
---

ffb4eb9779ddd28ecee84c06e8dc58f4a4daaa38
diff --cc lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index bc75ab35a,f4aa576f7..29b1391d3
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@@ -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