projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
controllers
/
media_proxy_cache_controller.ex
diff --git
a/lib/pleroma/web/admin_api/controllers/media_proxy_cache_controller.ex
b/lib/pleroma/web/admin_api/controllers/media_proxy_cache_controller.ex
index e3fa0ac284651f50745fbe916abf9c6ba9a10e1e..e2759d59ffd0dc842eb882670d0b800433e24ba8 100644
(file)
--- a/
lib/pleroma/web/admin_api/controllers/media_proxy_cache_controller.ex
+++ b/
lib/pleroma/web/admin_api/controllers/media_proxy_cache_controller.ex
@@
-27,7
+27,7
@@
defmodule Pleroma.Web.AdminAPI.MediaProxyCacheController do
def index(%{assigns: %{user: _}} = conn, params) do
cursor =
def index(%{assigns: %{user: _}} = conn, params) do
cursor =
- :
delet
ed_urls_cache
+ :
bann
ed_urls_cache
|> :ets.table([{:traverse, {:select, Cachex.Query.create(true, :key)}}])
|> :qlc.cursor()
|> :ets.table([{:traverse, {:select, Cachex.Query.create(true, :key)}}])
|> :qlc.cursor()
@@
-47,7
+47,7
@@
defmodule Pleroma.Web.AdminAPI.MediaProxyCacheController do
end
def delete(%{assigns: %{user: _}, body_params: %{urls: urls}} = conn, _) do
end
def delete(%{assigns: %{user: _}, body_params: %{urls: urls}} = conn, _) do
- MediaProxy.remove_from_
delet
ed_urls(urls)
+ MediaProxy.remove_from_
bann
ed_urls(urls)
render(conn, "index.json", urls: urls)
end
render(conn, "index.json", urls: urls)
end
@@
-55,7
+55,7
@@
defmodule Pleroma.Web.AdminAPI.MediaProxyCacheController do
MediaProxy.Invalidation.purge(urls)
if ban do
MediaProxy.Invalidation.purge(urls)
if ban do
- MediaProxy.put_in_
delet
ed_urls(urls)
+ MediaProxy.put_in_
bann
ed_urls(urls)
end
render(conn, "index.json", urls: urls)
end
render(conn, "index.json", urls: urls)