projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
web
/
media_proxy.ex
diff --git
a/lib/pleroma/web/media_proxy.ex
b/lib/pleroma/web/media_proxy.ex
index 5c32078aadf89fe25244e045c0f75feb29c32345..0b232f14b583854e2e13990ea094f8d5dfba6192 100644
(file)
--- a/
lib/pleroma/web/media_proxy.ex
+++ b/
lib/pleroma/web/media_proxy.ex
@@
-127,7
+127,7
@@
defmodule Pleroma.Web.MediaProxy do
end
defp signed_url(url) do
end
defp signed_url(url) do
- :crypto.
hmac(
:sha, Config.get([Endpoint, :secret_key_base]), url)
+ :crypto.
mac(:hmac,
:sha, Config.get([Endpoint, :secret_key_base]), url)
end
def filename(url_or_path) do
end
def filename(url_or_path) do