diff options
| author | lambda <pleromagit@rogerbraun.net> | 2019-03-07 09:33:54 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2019-03-07 09:33:54 +0000 |
| commit | ed5a1bbdfcc8b85330c7d4c8f8e08b6c2599ffa5 (patch) | |
| tree | 1aefd007cb762909dae807f400c6477f8dee9508 /lib | |
| parent | 0fe715f3ba0f787154ab8e86c8745d7f09affdcb (diff) | |
| parent | 7342b5a45f8a31fe33dac21123d707071531aa95 (diff) | |
| download | pleroma-ed5a1bbdfcc8b85330c7d4c8f8e08b6c2599ffa5.tar.gz pleroma-ed5a1bbdfcc8b85330c7d4c8f8e08b6c2599ffa5.zip | |
Merge branch 'preserve-link-headers' into 'develop'
Preserves parameters in link headers
Closes #716
See merge request pleroma/pleroma!908
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 5 |
1 files changed, 5 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 4fe66f856..8c58f4545 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -190,6 +190,11 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do end defp add_link_headers(conn, method, activities, param \\ nil, params \\ %{}) do + params = + conn.params + |> Map.drop(["since_id", "max_id"]) + |> Map.merge(params) + last = List.last(activities) first = List.first(activities) |