pleroma

commit: f6fee39e42e633ff4298291dca0db656c92dad81
parent 6051715a990b7eb4379daec46d5ea0d63dce2c09
Author: marcin mikołajczak <git@mkljczk.pl>
Date:   Sat, 23 Dec 2023 15:51:20 +0100

Add changelog

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>

Diffstat:
A
changelog.d/instance-rules.add
2
++
M
lib/pleroma/web/api_spec.ex
1
+
M
lib/pleroma/web/api_spec/operations/instance_operation.ex
2
+-
M
lib/pleroma/web/mastodon_api/views/instance_view.ex
18
+++++++++---------

4 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/changelog.d/instance-rules.add b/changelog.d/instance-rules.add
@@ -0,0 +1 @@
+Add instance rules
+\ No newline at end of file
diff --git a/lib/pleroma/web/api_spec.ex b/lib/pleroma/web/api_spec.ex
@@ -97,6 +97,7 @@ defmodule Pleroma.Web.ApiSpec do
               "Frontend managment",
               "Instance configuration",
               "Instance documents",
+              "Instance rule managment",
               "Invites",
               "MediaProxy cache",
               "OAuth application managment",
diff --git a/lib/pleroma/web/api_spec/operations/instance_operation.ex b/lib/pleroma/web/api_spec/operations/instance_operation.ex
@@ -48,7 +48,7 @@ defmodule Pleroma.Web.ApiSpec.InstanceOperation do
 
   def rules_operation do
     %Operation{
-      tags: ["Instance"],
+      tags: ["Instance misc"],
       summary: "Retrieve list of instance rules",
       operationId: "InstanceController.rules",
       responses: %{
diff --git a/lib/pleroma/web/mastodon_api/views/instance_view.ex b/lib/pleroma/web/mastodon_api/views/instance_view.ex
@@ -73,15 +73,6 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do
     })
   end
 
-  defp common_information(instance) do
-    %{
-      languages: Keyword.get(instance, :languages, ["en"]),
-      rules: render(__MODULE__, "rules.json"),
-      title: Keyword.get(instance, :name),
-      version: "#{@mastodon_api_level} (compatible; #{Pleroma.Application.named_version()})"
-    }
-  end
-
   def render("rules.json", _) do
     Pleroma.Rule.query()
     |> Pleroma.Repo.all()
@@ -95,6 +86,15 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do
     }
   end
 
+  defp common_information(instance) do
+    %{
+      languages: Keyword.get(instance, :languages, ["en"]),
+      rules: render(__MODULE__, "rules.json"),
+      title: Keyword.get(instance, :name),
+      version: "#{@mastodon_api_level} (compatible; #{Pleroma.Application.named_version()})"
+    }
+  end
+
   def features do
     [
       "pleroma_api",