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

Merge branch 'fix/851-emoji-redirect-follow' into 'develop'

Browse Source 
emoji dowload follow redirects

Closes #851

See merge request pleroma/pleroma!1126
This commit is contained in:
lambda 2019-05-08 13:13:59 +00:00
commit 289b8224ac
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/mix/tasks/pleroma/emoji.ex
View File

@ -109,7 +109,7 @@ defmodule Mix.Tasks.Pleroma.Emoji do
]) ])
) )
binary_archive = Tesla.get!(src_url).body binary_archive = Tesla.get!(client(), src_url).body
archive_sha = :crypto.hash(:sha256, binary_archive) |> Base.encode16() archive_sha = :crypto.hash(:sha256, binary_archive) |> Base.encode16()
sha_status_text = ["SHA256 of ", :bright, pack_name, :normal, " source file is ", :bright] sha_status_text = ["SHA256 of ", :bright, pack_name, :normal, " source file is ", :bright]
@ -137,7 +137,7 @@ defmodule Mix.Tasks.Pleroma.Emoji do
]) ])
) )
files = Tesla.get!(files_url).body |> Poison.decode!() files = Tesla.get!(client(), files_url).body |> Poison.decode!()
IO.puts(IO.ANSI.format(["Unpacking ", :bright, pack_name])) IO.puts(IO.ANSI.format(["Unpacking ", :bright, pack_name]))
@ -213,7 +213,7 @@ defmodule Mix.Tasks.Pleroma.Emoji do
IO.puts("Downloading the pack and generating SHA256") IO.puts("Downloading the pack and generating SHA256")
binary_archive = Tesla.get!(src).body binary_archive = Tesla.get!(client(), src).body
archive_sha = :crypto.hash(:sha256, binary_archive) |> Base.encode16() archive_sha = :crypto.hash(:sha256, binary_archive) |> Base.encode16()
IO.puts("SHA256 is #{archive_sha}") IO.puts("SHA256 is #{archive_sha}")
@ -272,7 +272,7 @@ defmodule Mix.Tasks.Pleroma.Emoji do
defp fetch_manifest(from) do defp fetch_manifest(from) do
Poison.decode!( Poison.decode!(
if String.starts_with?(from, "http") do if String.starts_with?(from, "http") do
Tesla.get!(from).body Tesla.get!(client(), from).body
else else
File.read!(from) File.read!(from)
end end
@ -290,4 +290,12 @@ defmodule Mix.Tasks.Pleroma.Emoji do
] ]
) )
end end
defp client do
middleware = [
{Tesla.Middleware.FollowRedirects, [max_redirects: 3]}
]
Tesla.client(middleware)
end
end end