diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2020-06-08 19:30:36 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-06-08 19:30:36 +0300 |
| commit | 4e27cd52077b856d3dc02016cea642ac58f0bbfd (patch) | |
| tree | 61417916a29b3e62fbeecccefac05b827f46f64a /lib/pleroma/web/controllers/frontend/static_controller.ex | |
| parent | f4abecd661bff76651953d922e4bbe353d016719 (diff) | |
| parent | d1924926585a477682b8fcc3176521dacb0766dd (diff) | |
| download | pleroma-4e27cd52077b856d3dc02016cea642ac58f0bbfd.tar.gz | |
Merge branch 'develop' into refactor/fe-bundles
Diffstat (limited to 'lib/pleroma/web/controllers/frontend/static_controller.ex')
| -rw-r--r-- | lib/pleroma/web/controllers/frontend/static_controller.ex | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/pleroma/web/controllers/frontend/static_controller.ex b/lib/pleroma/web/controllers/frontend/static_controller.ex index 54eb40350..27d70d3da 100644 --- a/lib/pleroma/web/controllers/frontend/static_controller.ex +++ b/lib/pleroma/web/controllers/frontend/static_controller.ex @@ -63,8 +63,14 @@ defmodule Pleroma.Web.Frontend.StaticController do %User{} = user -> meta = Metadata.build_tags(%{user: user}) + params = + params + |> Map.take(@page_keys) + |> Map.new(fn {k, v} -> {String.to_existing_atom(k), v} end) + timeline = - ActivityPub.fetch_user_activities(user, nil, Map.take(params, @page_keys)) + user + |> ActivityPub.fetch_user_activities(nil, params) |> Enum.map(&represent/1) prev_page_id = |