moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix search media proxy urls

This commit is contained in:
Maksim Pechnikov 2020-08-16 06:54:48 +03:00
parent 56470647de
commit f6da12f45d
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/pleroma/web/admin_api/controllers/media_proxy_cache_controller.ex
View File

@ -38,17 +38,19 @@ def index(%{assigns: %{user: _}} = conn, params) do
defp fetch_entries(params) do defp fetch_entries(params) do
MediaProxy.cache_table() MediaProxy.cache_table()
|> Cachex.export!() |> Cachex.stream!(Cachex.Query.create(true, :key))
|> filter_urls(params[:query]) |> filter_entries(params[:query])
end end
defp filter_urls(entries, query) when is_binary(query) do defp filter_entries(stream, query) when is_binary(query) do
for {_, url, _, _, _} <- entries, String.contains?(url, query), do: url regex = ~r/#{query}/i
stream
|> Enum.filter(fn url -> String.match?(url, regex) end)
|> Enum.to_list()
end end
defp filter_urls(entries, _) do defp filter_entries(stream, _), do: Enum.to_list(stream)
Enum.map(entries, fn {_, url, _, _, _} -> url end)
end
defp paginate_entries(entries, page, page_size) do defp paginate_entries(entries, page, page_size) do
offset = page_size * (page - 1) offset = page_size * (page - 1)

2
test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
View File

@ -89,7 +89,7 @@ test "search banned MediaProxy URLs", %{conn: conn} do
response = response =
conn conn
|> get("/api/pleroma/admin/media_proxy_caches?page_size=2&query=f44") |> get("/api/pleroma/admin/media_proxy_caches?page_size=2&query=F44")
|> json_response_and_validate_schema(200) |> json_response_and_validate_schema(200)
assert response["urls"] == [ assert response["urls"] == [