Merge search behaviour change, and refactor elasticsearch #28

Merged
floatingghost merged 91 commits from elasticsearch-refactor into develop 2022-06-30 16:55:31 +00:00
Showing only changes of commit 932e5df19e - Show all commits

View file

@ -100,20 +100,19 @@ defp cache_resp(conn, opts) do
should_cache = not Map.get(conn.assigns, :skip_cache, false)
conn =
unless opts[:tracking_fun] do
if should_cache do
cond do
Map.get(conn.assigns, :skip_cache, false) ->
conn
!opts[:tracking_fun] ->
@cachex.put(:web_resp_cache, key, {content_type, body}, ttl: ttl)
end
conn
conn
else
tracking_fun_data = Map.get(conn.assigns, :tracking_fun_data, nil)
if should_cache do
true ->
tracking_fun_data = Map.get(conn.assigns, :tracking_fun_data, nil)
@cachex.put(:web_resp_cache, key, {content_type, body, tracking_fun_data}, ttl: ttl)
end
opts.tracking_fun.(conn, tracking_fun_data)
opts.tracking_fun.(conn, tracking_fun_data)
end
put_resp_header(conn, "x-cache", "MISS from Pleroma")