Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'tesla-get-to-pleroma' into 'develop'

Browse Source 
Use Pleroma.HTTP instead of Tesla

Closes #2275

See merge request pleroma/pleroma!3113
This commit is contained in:
feld 2020-11-01 19:31:17 +00:00 committed by rinpatch
parent fb0e340363
commit fa6ad67397
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/captcha/kocaptcha.ex
View File

@ -10,7 +10,7 @@ defmodule Pleroma.Captcha.Kocaptcha do
def new do def new do
endpoint = Pleroma.Config.get!([__MODULE__, :endpoint]) endpoint = Pleroma.Config.get!([__MODULE__, :endpoint])
case Tesla.get(endpoint <> "/new") do case Pleroma.HTTP.get(endpoint <> "/new") do
{:error, _} -> {:error, _} ->
%{error: :kocaptcha_service_unavailable} %{error: :kocaptcha_service_unavailable}

4
lib/pleroma/emoji/pack.ex
View File

@ -594,7 +594,7 @@ defmodule Pleroma.Emoji.Pack do
end end
defp download_archive(url, sha) do defp download_archive(url, sha) do
with {:ok, %{body: archive}} <- Tesla.get(url) do with {:ok, %{body: archive}} <- Pleroma.HTTP.get(url) do
if Base.decode16!(sha) == :crypto.hash(:sha256, archive) do if Base.decode16!(sha) == :crypto.hash(:sha256, archive) do
{:ok, archive} {:ok, archive}
else else
@ -617,7 +617,7 @@ defmodule Pleroma.Emoji.Pack do
end end
defp update_sha_and_save_metadata(pack, data) do defp update_sha_and_save_metadata(pack, data) do
with {:ok, %{body: zip}} <- Tesla.get(data[:"fallback-src"]), with {:ok, %{body: zip}} <- Pleroma.HTTP.get(data[:"fallback-src"]),
:ok <- validate_has_all_files(pack, zip) do :ok <- validate_has_all_files(pack, zip) do
fallback_sha = :sha256 |> :crypto.hash(zip) |> Base.encode16() fallback_sha = :sha256 |> :crypto.hash(zip) |> Base.encode16()