sjw/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-23 14:55:03 +01:00
Code Issues Releases Wiki Activity

atom keys with leading :

Browse Source
This commit is contained in:
Alex S 2019-07-15 11:00:55 +03:00
parent 46ef8f0216
commit c66044b923
3 changed files with 47 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/mix/tasks/pleroma/config.ex
View File

@ -59,11 +59,11 @@ defmodule Mix.Tasks.Pleroma.Config do
do: ",",
else: ":"
key = String.trim_leading(config.key, ":")
IO.write(
file,
"config :#{config.group}, #{config.key}#{mark} #{
inspect(Config.from_binary(config.value))
}\r\n"
"config :#{config.group}, #{key}#{mark} #{inspect(Config.from_binary(config.value))}\r\n"
)
if delete? do

2
lib/pleroma/config/transfer_task.ex
View File

@ -35,7 +35,7 @@ defmodule Pleroma.Config.TransferTask do
if String.starts_with?(setting.key, "Pleroma.") do
"Elixir." <> setting.key
else
setting.key
String.trim_leading(setting.key, ":")
end
group = String.to_existing_atom(setting.group)

47
test/web/admin_api/admin_api_controller_test.exs
View File

@ -1720,7 +1720,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
configs: [
%{
"group" => "pleroma",
"key" => "key1",
"key" => ":key1",
"value" => [
%{"tuple" => [":key2", "some_val"]},
%{
@ -1750,7 +1750,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
"configs" => [
%{
"group" => "pleroma",
"key" => "key1",
"key" => ":key1",
"value" => [
%{"tuple" => [":key2", "some_val"]},
%{
@ -1782,7 +1782,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
configs: [
%{
"group" => "pleroma",
"key" => "key1",
"key" => ":key1",
"value" => %{"key" => "some_val"}
}
]
@ -1793,7 +1793,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
"configs" => [
%{
"group" => "pleroma",
"key" => "key1",
"key" => ":key1",
"value" => %{"key" => "some_val"}
}
]
@ -1862,6 +1862,45 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
]
}
end
test "queues key as atom", %{conn: conn} do
conn =
post(conn, "/api/pleroma/admin/config", %{
configs: [
%{
"group" => "pleroma_job_queue",
"key" => ":queues",
"value" => [
%{"tuple" => [":federator_incoming", 50]},
%{"tuple" => [":federator_outgoing", 50]},
%{"tuple" => [":web_push", 50]},
%{"tuple" => [":mailer", 10]},
%{"tuple" => [":transmogrifier", 20]},
%{"tuple" => [":scheduled_activities", 10]},
%{"tuple" => [":background", 5]}
]
}
]
})
assert json_response(conn, 200) == %{
"configs" => [
%{
"group" => "pleroma_job_queue",
"key" => ":queues",
"value" => [
%{"tuple" => [":federator_incoming", 50]},
%{"tuple" => [":federator_outgoing", 50]},
%{"tuple" => [":web_push", 50]},
%{"tuple" => [":mailer", 10]},
%{"tuple" => [":transmogrifier", 20]},
%{"tuple" => [":scheduled_activities", 10]},
%{"tuple" => [":background", 5]}
]
}
]
}
end
end
end