Merge branch 'develop' into 'develop'

WebFinger: add subscribe_address in return data of JSON responses

See merge request pleroma/pleroma!3206

lib/pleroma/web/web_finger.ex

@@ -116,6 +116,9 @@ defp webfinger_from_json(doc) do
           {"application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\"", "self"} ->
             Map.put(data, "ap_id", link["href"])
 
+          {nil, "http://ostatus.org/schema/1.0/subscribe"} ->
+            Map.put(data, "subscribe_address", link["template"])
+
           _ ->
             Logger.debug("Unhandled type: #{inspect(link["type"])}")
             data

test/pleroma/web/web_finger_test.exs

@@ -56,12 +56,13 @@ test "returns the ActivityPub actor URI for an ActivityPub user" do
       {:ok, _data} = WebFinger.finger(user)
     end
 
-    test "returns the ActivityPub actor URI for an ActivityPub user with the ld+json mimetype" do
+    test "returns the ActivityPub actor URI and subscribe address for an ActivityPub user with the ld+json mimetype" do
       user = "kaniini@gerzilla.de"
 
       {:ok, data} = WebFinger.finger(user)
 
       assert data["ap_id"] == "https://gerzilla.de/channel/kaniini"
+      assert data["subscribe_address"] == "https://gerzilla.de/follow?f=&url={uri}"
     end
 
     test "it work for AP-only user" do