Instance rules: Use render_many
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
parent
432599311d
commit
384f8bfa78
|
@ -14,8 +14,6 @@ defmodule Pleroma.Web.AdminAPI.RuleController do
|
|||
json_response: 3
|
||||
]
|
||||
|
||||
require Logger
|
||||
|
||||
plug(Pleroma.Web.ApiSpec.CastAndValidate)
|
||||
|
||||
plug(
|
||||
|
|
|
@ -40,7 +40,7 @@ def render("show.json", _) do
|
|||
background_image: Pleroma.Web.Endpoint.url() <> Keyword.get(instance, :background_image),
|
||||
shout_limit: Config.get([:shout, :limit]),
|
||||
description_limit: Keyword.get(instance, :description_limit),
|
||||
rules: rules(),
|
||||
rules: render(__MODULE__, "rules.json"),
|
||||
pleroma: %{
|
||||
metadata: %{
|
||||
account_activation_required: Keyword.get(instance, :account_activation_required),
|
||||
|
@ -59,7 +59,16 @@ def render("show.json", _) do
|
|||
end
|
||||
|
||||
def render("rules.json", _) do
|
||||
rules()
|
||||
Pleroma.Rule.query()
|
||||
|> Pleroma.Repo.all()
|
||||
|> render_many(__MODULE__, "rule.json", as: :rule)
|
||||
end
|
||||
|
||||
def render("rule.json", %{rule: rule}) do
|
||||
%{
|
||||
id: rule.id,
|
||||
text: rule.text
|
||||
}
|
||||
end
|
||||
|
||||
def features do
|
||||
|
@ -142,10 +151,4 @@ def fields_limits do
|
|||
value_length: Config.get([:instance, :account_field_value_length])
|
||||
}
|
||||
end
|
||||
|
||||
def rules do
|
||||
Pleroma.Rule.query()
|
||||
|> Pleroma.Repo.all()
|
||||
|> Enum.map(&%{id: &1.id, text: &1.text})
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue