projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
admin_api_controller.ex
diff --git
a/lib/pleroma/web/admin_api/admin_api_controller.ex
b/lib/pleroma/web/admin_api/admin_api_controller.ex
index 03dfdca8299f8b253b4b446a0817c882a78cf4ae..498beb56a02df7c05d01466414b1778e7cb2ced1 100644
(file)
--- a/
lib/pleroma/web/admin_api/admin_api_controller.ex
+++ b/
lib/pleroma/web/admin_api/admin_api_controller.ex
@@
-377,18
+377,18
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
if Pleroma.Config.get([:instance, :dynamic_configuration]) do
updated =
Enum.map(configs, fn
if Pleroma.Config.get([:instance, :dynamic_configuration]) do
updated =
Enum.map(configs, fn
- %{"key" => key, "value" => value} ->
- {:ok, config} = Config.update_or_create(%{key: key, value: value})
+ %{"
group" => group, "
key" => key, "value" => value} ->
+ {:ok, config} = Config.update_or_create(%{
group: group,
key: key, value: value})
config
config
- %{"key" => key, "delete" => "true"} ->
- {:ok, _} = Config.delete(
key
)
+ %{"
group" => group, "
key" => key, "delete" => "true"} ->
+ {:ok, _} = Config.delete(
%{group: group, key: key}
)
nil
end)
|> Enum.reject(&is_nil(&1))
Pleroma.Config.TransferTask.load_and_update_env()
nil
end)
|> Enum.reject(&is_nil(&1))
Pleroma.Config.TransferTask.load_and_update_env()
- Mix.Tasks.Pleroma.Config.run(["migrate_from_db", Pleroma.Config.get(:env)])
+ Mix.Tasks.Pleroma.Config.run(["migrate_from_db", Pleroma.Config.get(:env)
, "false"
])
updated
else
[]
updated
else
[]