Switch to Jason over Poison
This commit is contained in:
parent
b14a314ce7
commit
498bfdf403
|
@ -137,7 +137,7 @@ def run(["get-packs" | args]) do
|
||||||
])
|
])
|
||||||
)
|
)
|
||||||
|
|
||||||
files = Tesla.get!(client(), files_url).body |> Poison.decode!()
|
files = Tesla.get!(client(), files_url).body |> Jason.decode!()
|
||||||
|
|
||||||
IO.puts(IO.ANSI.format(["Unpacking ", :bright, pack_name]))
|
IO.puts(IO.ANSI.format(["Unpacking ", :bright, pack_name]))
|
||||||
|
|
||||||
|
@ -239,7 +239,7 @@ def run(["gen-pack", src]) do
|
||||||
|
|
||||||
emoji_map = Pleroma.Emoji.make_shortcode_to_file_map(tmp_pack_dir, exts)
|
emoji_map = Pleroma.Emoji.make_shortcode_to_file_map(tmp_pack_dir, exts)
|
||||||
|
|
||||||
File.write!(files_name, Poison.encode!(emoji_map, pretty: true))
|
File.write!(files_name, Jason.encode!(emoji_map, pretty: true))
|
||||||
|
|
||||||
IO.puts("""
|
IO.puts("""
|
||||||
|
|
||||||
|
@ -248,11 +248,11 @@ def run(["gen-pack", src]) do
|
||||||
""")
|
""")
|
||||||
|
|
||||||
if File.exists?("index.json") do
|
if File.exists?("index.json") do
|
||||||
existing_data = File.read!("index.json") |> Poison.decode!()
|
existing_data = File.read!("index.json") |> Jason.decode!()
|
||||||
|
|
||||||
File.write!(
|
File.write!(
|
||||||
"index.json",
|
"index.json",
|
||||||
Poison.encode!(
|
Jason.encode!(
|
||||||
Map.merge(
|
Map.merge(
|
||||||
existing_data,
|
existing_data,
|
||||||
pack_json
|
pack_json
|
||||||
|
@ -263,14 +263,14 @@ def run(["gen-pack", src]) do
|
||||||
|
|
||||||
IO.puts("index.json file has been update with the #{name} pack")
|
IO.puts("index.json file has been update with the #{name} pack")
|
||||||
else
|
else
|
||||||
File.write!("index.json", Poison.encode!(pack_json, pretty: true))
|
File.write!("index.json", Jason.encode!(pack_json, pretty: true))
|
||||||
|
|
||||||
IO.puts("index.json has been created with the #{name} pack")
|
IO.puts("index.json has been created with the #{name} pack")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
defp fetch_manifest(from) do
|
defp fetch_manifest(from) do
|
||||||
Poison.decode!(
|
Jason.decode!(
|
||||||
if String.starts_with?(from, "http") do
|
if String.starts_with?(from, "http") do
|
||||||
Tesla.get!(client(), from).body
|
Tesla.get!(client(), from).body
|
||||||
else
|
else
|
||||||
|
|
|
@ -15,7 +15,7 @@ def new do
|
||||||
%{error: "Kocaptcha service unavailable"}
|
%{error: "Kocaptcha service unavailable"}
|
||||||
|
|
||||||
{:ok, res} ->
|
{:ok, res} ->
|
||||||
json_resp = Poison.decode!(res.body)
|
json_resp = Jason.decode!(res.body)
|
||||||
|
|
||||||
%{
|
%{
|
||||||
type: :kocaptcha,
|
type: :kocaptcha,
|
||||||
|
|
|
@ -14,7 +14,7 @@ def process_url(url) do
|
||||||
|
|
||||||
def process_response_body(body) do
|
def process_response_body(body) do
|
||||||
body
|
body
|
||||||
|> Poison.decode!()
|
|> Jason.decode!()
|
||||||
end
|
end
|
||||||
|
|
||||||
def get_token do
|
def get_token do
|
||||||
|
@ -38,7 +38,7 @@ def get_token do
|
||||||
end
|
end
|
||||||
|
|
||||||
def make_auth_body(username, password, tenant) do
|
def make_auth_body(username, password, tenant) do
|
||||||
Poison.encode!(%{
|
Jason.encode!(%{
|
||||||
:auth => %{
|
:auth => %{
|
||||||
:passwordCredentials => %{
|
:passwordCredentials => %{
|
||||||
:username => username,
|
:username => username,
|
||||||
|
|
|
@ -682,7 +682,7 @@ def make_flag_data(params, additional) do
|
||||||
"""
|
"""
|
||||||
def fetch_ordered_collection(from, pages_left, acc \\ []) do
|
def fetch_ordered_collection(from, pages_left, acc \\ []) do
|
||||||
with {:ok, response} <- Tesla.get(from),
|
with {:ok, response} <- Tesla.get(from),
|
||||||
{:ok, collection} <- Poison.decode(response.body) do
|
{:ok, collection} <- Jason.decode(response.body) do
|
||||||
case collection["type"] do
|
case collection["type"] do
|
||||||
"OrderedCollection" ->
|
"OrderedCollection" ->
|
||||||
# If we've encountered the OrderedCollection and not the page,
|
# If we've encountered the OrderedCollection and not the page,
|
||||||
|
|
|
@ -117,7 +117,7 @@ def perform(:incoming_ap_doc, params) do
|
||||||
_e ->
|
_e ->
|
||||||
# Just drop those for now
|
# Just drop those for now
|
||||||
Logger.info("Unhandled activity")
|
Logger.info("Unhandled activity")
|
||||||
Logger.info(Poison.encode!(params, pretty: 2))
|
Logger.info(Jason.encode!(params, pretty: true))
|
||||||
:error
|
:error
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -274,7 +274,7 @@ def prepare_request(conn, %{"provider" => provider, "authorization" => auth_attr
|
||||||
auth_attrs
|
auth_attrs
|
||||||
|> Map.delete("scopes")
|
|> Map.delete("scopes")
|
||||||
|> Map.put("scope", scope)
|
|> Map.put("scope", scope)
|
||||||
|> Poison.encode!()
|
|> Jason.encode!()
|
||||||
|
|
||||||
params =
|
params =
|
||||||
auth_attrs
|
auth_attrs
|
||||||
|
@ -338,7 +338,7 @@ def callback(conn, params) do
|
||||||
end
|
end
|
||||||
|
|
||||||
defp callback_params(%{"state" => state} = params) do
|
defp callback_params(%{"state" => state} = params) do
|
||||||
Map.merge(params, Poison.decode!(state))
|
Map.merge(params, Jason.decode!(state))
|
||||||
end
|
end
|
||||||
|
|
||||||
def registration_details(conn, %{"authorization" => auth_attrs}) do
|
def registration_details(conn, %{"authorization" => auth_attrs}) do
|
||||||
|
|
Loading…
Reference in New Issue