diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-06-30 09:08:46 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-06-30 09:08:46 +0000 |
| commit | 66380d36d540751f59445c8a65e9747ce5475ee5 (patch) | |
| tree | 23229cd723f7a06de999db05d66482bb0debe2d4 /lib | |
| parent | e5df6487c8a8c1df45d4ff324ed04783d851dd5d (diff) | |
| parent | 1f76740e104e6b5f50fbb813b5d7b42499eb3466 (diff) | |
| download | pleroma-66380d36d540751f59445c8a65e9747ce5475ee5.tar.gz | |
Merge branch 'filter-user-statuses-by-hashtag' into 'develop'
Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)
Closes #974
See merge request pleroma/pleroma!1362
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index 7cdba4cc0..ceb88511b 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -356,6 +356,10 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do def user_statuses(%{assigns: %{user: reading_user}} = conn, params) do with %User{} = user <- User.get_cached_by_id(params["id"]) do + params = + params + |> Map.put("tag", params["tagged"]) + activities = ActivityPub.fetch_user_activities(user, reading_user, params) conn |