X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fnodeinfo%2Fnodeinfo_controller.ex;h=8c7df5b90bf839cf9431d34363c1a68e81050a5e;hb=2174f6eb4f2b9b970e9823fe0846643fb274f009;hp=b1db58d0bc666d55b268eab46f0514604d31e272;hpb=23b1c64a19ab13b152ba46e1a744cbf2efafce57;p=akkoma

diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
index b1db58d0b..8c7df5b90 100644
--- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
+++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@@ -44,6 +44,33 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
       Application.get_env(:pleroma, :mrf_simple)
       |> Enum.into(%{})
 
+    # This horror is needed to convert regex sigils to strings
+    mrf_keyword =
+      Application.get_env(:pleroma, :mrf_keyword, [])
+      |> Enum.map(fn {key, value} ->
+        {key,
+         Enum.map(value, fn
+           {pattern, replacement} ->
+             %{
+               "pattern" =>
+                 if not is_binary(pattern) do
+                   inspect(pattern)
+                 else
+                   pattern
+                 end,
+               "replacement" => replacement
+             }
+
+           pattern ->
+             if not is_binary(pattern) do
+               inspect(pattern)
+             else
+               pattern
+             end
+         end)}
+      end)
+      |> Enum.into(%{})
+
     mrf_policies =
       MRF.get_policies()
       |> Enum.map(fn policy -> to_string(policy) |> String.split(".") |> List.last() end)
@@ -73,6 +100,7 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
         %{
           mrf_policies: mrf_policies,
           mrf_simple: mrf_simple,
+          mrf_keyword: mrf_keyword,
           mrf_user_allowlist: mrf_user_allowlist,
           quarantined_instances: quarantined
         }
@@ -106,8 +134,8 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
     %{
       version: "2.0",
       software: %{
-        name: Pleroma.Application.name() |> String.downcase,
-        version: Pleroma.Application.version(),
+        name: Pleroma.Application.name() |> String.downcase(),
+        version: Pleroma.Application.version()
       },
       protocols: ["ostatus", "activitypub"],
       services: %{
@@ -168,7 +196,10 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
       |> Map.get(:software)
       |> Map.put(:repository, Pleroma.Application.repository())
 
-    response = raw_response |> Map.put(:software, updated_software)
+    response =
+      raw_response
+      |> Map.put(:software, updated_software)
+      |> Map.put(:version, "2.1")
 
     conn
     |> put_resp_header(