Move custom URI encoding functions to Pleroma.Utils.URIEncoding
This commit is contained in:
parent
6487c93c47
commit
f290b15987
8 changed files with 146 additions and 140 deletions
|
|
@ -5,8 +5,8 @@
|
|||
defmodule Pleroma.Web.MediaProxy do
|
||||
alias Pleroma.Config
|
||||
alias Pleroma.Helpers.UriHelper
|
||||
alias Pleroma.HTTP
|
||||
alias Pleroma.Upload
|
||||
alias Pleroma.Utils.URIEncoding
|
||||
alias Pleroma.Web.Endpoint
|
||||
alias Pleroma.Web.MediaProxy.Invalidation
|
||||
|
||||
|
|
@ -107,14 +107,14 @@ defmodule Pleroma.Web.MediaProxy do
|
|||
# End result is a failing HEAD request in
|
||||
# Pleroma.Web.MediaProxy.MediaProxyController.handle_preview/2
|
||||
def encode_url(url) do
|
||||
url = HTTP.encode_url(url)
|
||||
url = URIEncoding.encode_url(url)
|
||||
{base64, sig64} = base64_sig64(url)
|
||||
|
||||
build_url(sig64, base64, filename(url))
|
||||
end
|
||||
|
||||
def encode_preview_url(url, preview_params \\ []) do
|
||||
url = HTTP.encode_url(url)
|
||||
url = URIEncoding.encode_url(url)
|
||||
{base64, sig64} = base64_sig64(url)
|
||||
|
||||
build_preview_url(sig64, base64, filename(url), preview_params)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue