Merge branch 'stable' into develop

app/presenters/node_info_presenter.rb

@@ -18,7 +18,7 @@ class NodeInfoPresenter
 
   def add_configuration(doc)
     doc.software.version     = version
-    doc.services             = available_services
+    doc.services.outbound    = available_services
     doc.open_registrations   = open_registrations?
     doc.metadata["nodeName"] = name
     doc.metadata["xmppChat"] = chat_enabled?

lib/node_info.rb

@@ -33,6 +33,19 @@ module NodeInfo
       end
     end
 
+    Services = Struct.new(:inbound, :outbound) do
+      def initialize(inbound=[], outbound=[])
+        super(inbound, outbound)
+      end
+
+      def version_10_hash
+        {
+          "inbound"  => inbound,
+          "outbound" => outbound
+        }
+      end
+    end
+
     Usage = Struct.new(:users, :local_posts, :local_comments) do
       Users = Struct.new(:total, :active_halfyear, :active_month) do
         def initialize(total=nil, active_halfyear=nil, active_month=nil)
@@ -68,8 +81,8 @@ module NodeInfo
       end
     end
 
-    def initialize(version=nil, services=[], open_registrations=nil, metadata={})
+    def initialize(version=nil, open_registrations=nil, metadata={})
-      super(version, Software.new, Protocols.new, services, open_registrations, Usage.new, metadata)
+      super(version, Software.new, Protocols.new, Services.new, open_registrations, Usage.new, metadata)
     end
 
     def as_json(_options={})
@@ -103,7 +116,7 @@ module NodeInfo
         "version"           => "1.0",
         "software"          => software.version_10_hash,
         "protocols"         => protocols.version_10_hash,
-        "services"          => services.empty? ? nil : services,
+        "services"          => services.version_10_hash,
         "openRegistrations" => open_registrations,
         "usage"             => usage.version_10_hash,
         "metadata"          => metadata

spec/presenters/node_info_presenter_spec.rb

@@ -29,7 +29,10 @@ describe NodeInfoPresenter do
           "inbound"  => ["diaspora"],
           "outbound" => ["diaspora"]
         },
-        "services"          => ["facebook"],
+        "services"          => {
+          "inbound"  => [],
+          "outbound" => ["facebook"]
+        },
         "openRegistrations" => AppConfig.settings.enable_registrations?,
         "usage"             => {
           "users" => {}
@@ -58,7 +61,7 @@ describe NodeInfoPresenter do
       end
 
       it "provides services" do
-        expect(hash).to include "services" => %w(twitter facebook)
+        expect(hash).to include "services" => include("outbound" => %w(twitter facebook))
       end
     end
 
@@ -82,7 +85,7 @@ describe NodeInfoPresenter do
       end
 
       it "it doesn't list those" do
-        expect(hash).to include "services" => ["twitter"]
+        expect(hash).to include "services" => include("outbound" => ["twitter"])
       end
     end
 

vendor/nodeinfo/schemas/1.0.json

@@ -8,6 +8,7 @@
     "version",
     "software",
     "protocols",
+    "services",
     "openRegistrations",
     "usage",
     "metadata"
@@ -92,38 +93,61 @@
       }
     },
     "services": {
-      "description": "The third party sites this servers allows to publish messages to.",
+      "description": "The third party sites this server can connect to via their application API.",
-      "type": "array",
+      "type": "object",
-      "minItems": 0,
+      "additionalProperties": false,
-      "items": {
+      "required": [
-        "enum": [
+        "inbound",
-          "appnet",
+        "outbound"
-          "blogger",
+      ],
-          "buddycloud",
+      "properties": {
-          "diaspora",
+        "inbound": {
-          "dreamwidth",
+          "description": "The third party sites this server can retrieve messages from for combined display with regular traffic.",
-          "drupal",
+          "type": "array",
-          "facebook",
+          "minItems": 0,
-          "friendica",
+          "items": {
-          "gnusocial",
+            "enum": [
-          "google",
+              "appnet",
-          "insanejournal",
+              "gnusocial",
-          "libertree",
+              "pumpio"
-          "linkedin",
+            ]
-          "livejournal",
+          }
-          "mediagoblin",
+        },
-          "myspace",
+        "outbound": {
-          "pinterest",
+          "description": "The third party sites this server can publish messages to on the behalf of a user.",
-          "posterous",
+          "type": "array",
-          "pumpio",
+          "minItems": 0,
-          "redmatrix",
+          "items": {
-          "smtp",
+            "enum": [
-          "tent",
+              "appnet",
-          "tumblr",
+              "blogger",
-          "twitter",
+              "buddycloud",
-          "wordpress",
+              "diaspora",
-          "xmpp"
+              "dreamwidth",
-        ]
+              "drupal",
+              "facebook",
+              "friendica",
+              "gnusocial",
+              "google",
+              "insanejournal",
+              "libertree",
+              "linkedin",
+              "livejournal",
+              "mediagoblin",
+              "myspace",
+              "pinterest",
+              "posterous",
+              "pumpio",
+              "redmatrix",
+              "smtp",
+              "tent",
+              "tumblr",
+              "twitter",
+              "wordpress",
+              "xmpp"
+            ]
+          }
+        }
       }
     },
     "openRegistrations": {