aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-03-25 18:06:00 +0000
committerrinpatch <rinpatch@sdf.org>2020-03-25 18:06:00 +0000
commitaf820f8cf1c621dc8b57579c1cf8a740b6ba206a (patch)
tree8502c6872cb0bdc593592ef48f656bbfca9e7fe3 /lib
parentde62e633d3c5c939ac2dd3099005f0ecce609f9f (diff)
parentc8475cd5c63af18471864fe57504999ddd09e496 (diff)
downloadpleroma-af820f8cf1c621dc8b57579c1cf8a740b6ba206a.tar.gz
Merge branch 'benchmark_timeline' into 'develop'
Benchmarks: Add timeline benchmark See merge request pleroma/pleroma!2325
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/controller_helper.ex7
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 =