hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ipfs: revert to String.replace for cid placeholder

Browse source 
ipfs: fix lint
This commit is contained in:
Claudio Maradonna 2022-04-16 09:38:49 +02:00
commit 44659ecd65
No known key found for this signature in database
GPG key ID: 0CBA58694C5680D9
5 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/upload.ex
View file

@ -235,8 +235,8 @@ defmodule Pleroma.Upload do
""
end
if String.contains?(base_url, "<%= cid %>") do
EEx.eval_string(base_url, cid: path)
if String.contains?(base_url, Pleroma.Uploaders.IPFS.placeholder()) do
String.replace(base_url, Pleroma.Uploaders.IPFS.placeholder(), path)
else
[base_url, path]
|> Path.join()

7
lib/pleroma/uploaders/ipfs.ex
View file

@ -9,12 +9,15 @@ defmodule Pleroma.Uploaders.IPFS do
alias Pleroma.Config
alias Tesla.Multipart
@placeholder "{CID}"
def placeholder, do: @placeholder
@impl true
def get_file(file) do
b_url = Pleroma.Upload.base_url()
if String.contains?(b_url, "<%= cid %>") do
{:ok, {:url, EEx.eval_string(b_url, cid: URI.decode(file))}}
if String.contains?(b_url, @placeholder) do
{:ok, {:url, String.replace(b_url, @placeholder, URI.decode(file))}}
else
{:error, "IPFS Get URL doesn't contain 'cid' placeholder"}
end