activitypub transmogrifier: clean up accept/reject handling a bit

[akkoma] / lib / pleroma / web / nodeinfo / nodeinfo_controller.ex

diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
index 2c06875f2afdc9632528271be5660b1c705f6653..aec77168a5c466ef5f91cf9351cf735c94d5963d 100644 (file)
--- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
+++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@@ -1,7 +1,6 @@
 defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
   use Pleroma.Web, :controller
 
-  alias Pleroma.Web.Nodeinfo
   alias Pleroma.Stats
   alias Pleroma.Web
 
@@ -12,7 +11,7 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
       links: [
         %{
           rel: "http://nodeinfo.diaspora.software/ns/schema/2.0",
-          href: Web.base_url() <> "/nodeinfo/2.0"
+          href: Web.base_url() <> "/nodeinfo/2.0.json"
         }
       ]
     }
@@ -22,11 +21,13 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
 
   # Schema definition: https://github.com/jhass/nodeinfo/blob/master/schemas/2.0/schema.json
   def nodeinfo(conn, %{"version" => "2.0"}) do
+    stats = Stats.get_stats()
+
     response = %{
       version: "2.0",
       software: %{
         name: "pleroma",
-        version: "#{Keyword.get(@instance, :version)})"
+        version: Keyword.get(@instance, :version)
       },
       protocols: ["ostatus", "activitypub"],
       services: %{
@@ -36,18 +37,26 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
       openRegistrations: Keyword.get(@instance, :registrations_open),
       usage: %{
         users: %{
-          total: Stats.get_stats().user_count,
-        }
+          total: stats.user_count || 0
+        },
+        localPosts: stats.status_count || 0
       },
-      metadata: %{}
+      metadata: %{
+        nodeName: Keyword.get(@instance, :name)
+      }
     }
 
-    json(conn, response)
+    conn
+    |> put_resp_header(
+      "content-type",
+      "application/json; profile=http://nodeinfo.diaspora.software/ns/schema/2.0#; charset=utf-8"
+    )
+    |> json(response)
   end
 
   def nodeinfo(conn, _) do
     conn
     |> put_status(404)
-    |> json(%{error: "Nodeinfo schema not handled"})
+    |> json(%{error: "Nodeinfo schema version not handled"})
   end
 end