diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-26 09:43:58 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-26 09:43:58 +0300 |
| commit | 112101ca52a98b97749a56f2476a0f941a4aabdf (patch) | |
| tree | 7eeb145bbd4e024d558e0c5c6fa0855319106482 /lib/pleroma/web/controller_helper.ex | |
| parent | ff1baae7e95c00e341f0f86427c4dab207e3eddc (diff) | |
| parent | af820f8cf1c621dc8b57579c1cf8a740b6ba206a (diff) | |
| download | pleroma-112101ca52a98b97749a56f2476a0f941a4aabdf.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
# Conflicts:
# lib/pleroma/thread_mute.ex
Diffstat (limited to 'lib/pleroma/web/controller_helper.ex')
| -rw-r--r-- | lib/pleroma/web/controller_helper.ex | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/pleroma/web/controller_helper.ex b/lib/pleroma/web/controller_helper.ex index ad293cda9..b49523ec3 100644 --- a/lib/pleroma/web/controller_helper.ex +++ b/lib/pleroma/web/controller_helper.ex @@ -34,7 +34,12 @@ defmodule Pleroma.Web.ControllerHelper do defp param_to_integer(_, default), do: default - def add_link_headers(conn, activities, extra_params \\ %{}) do + def add_link_headers(conn, activities, extra_params \\ %{}) + + def add_link_headers(%{assigns: %{skip_link_headers: true}} = conn, _activities, _extra_params), + do: conn + + def add_link_headers(conn, activities, extra_params) do case List.last(activities) do %{id: max_id} -> params = |