Merge branch 'fix-remote-actor-visibility' into 'master'

Fix remote group visibility and use Mastodon's discoverable attribute

Closes #370

See merge request framasoft/mobilizon!537

lib/federation/activity_pub/utils.ex

@@ -39,6 +39,9 @@ defmodule Mobilizon.Federation.ActivityPub.Utils do
           "sc" => "http://schema.org#",
           "ical" => "http://www.w3.org/2002/12/cal/ical#",
           "pt" => "https://joinpeertube.org/ns#",
+          "toot" => "http://joinmastodon.org/ns#",
+          "discoverable" => "toot:discoverable",
+          "manuallyApprovesFollowers" => "as:manuallyApprovesFollowers",
           "Hashtag" => "as:Hashtag",
           "category" => "sc:category",
           "uuid" => "sc:identifier",

lib/federation/activity_stream/converter/actor.ex

@@ -64,7 +64,8 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Actor do
       shared_inbox_url: data["endpoints"]["sharedInbox"],
       domain: URI.parse(data["id"]).host,
       manually_approves_followers: data["manuallyApprovesFollowers"],
-      type: data["type"]
+      type: data["type"],
+      visibility: if(Map.get(data, "discoverable", false) == true, do: :public, else: :unlisted)
     }
   end
 
@@ -96,6 +97,7 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Actor do
       "endpoints" => %{
         "sharedInbox" => actor.shared_inbox_url
       },
+      "discoverable" => actor.visibility == :public,
       "manuallyApprovesFollowers" => actor.manually_approves_followers,
       "publicKey" => %{
         "id" => "#{actor.url}#main-key",

test/federation/activity_pub/activity_pub_test.exs

@@ -43,8 +43,15 @@ defmodule Mobilizon.Federation.ActivityPubTest do
   describe "fetching actor from its url" do
     test "returns an actor from nickname" do
       use_cassette "activity_pub/fetch_tcit@framapiaf.org" do
-        assert {:ok, %Actor{preferred_username: "tcit", domain: "framapiaf.org"} = actor} =
-                 ActivityPub.make_actor_from_nickname("tcit@framapiaf.org")
+        assert {:ok,
+                %Actor{preferred_username: "tcit", domain: "framapiaf.org", visibility: :public} =
+                  actor} = ActivityPub.make_actor_from_nickname("tcit@framapiaf.org")
+      end
+
+      use_cassette "activity_pub/fetch_tcit@framapiaf.org_not_discoverable" do
+        assert {:ok,
+                %Actor{preferred_username: "tcit", domain: "framapiaf.org", visibility: :unlisted} =
+                  actor} = ActivityPub.make_actor_from_nickname("tcit@framapiaf.org")
       end
     end
 
@@ -52,7 +59,9 @@ defmodule Mobilizon.Federation.ActivityPubTest do
     test "returns an actor from url" do
       # Initial fetch
       use_cassette "activity_pub/fetch_framapiaf.org_users_tcit" do
-        assert {:ok, %Actor{preferred_username: "tcit", domain: "framapiaf.org"}} =
+        # Unlisted because discoverable is not present in the JSON payload
+        assert {:ok,
+                %Actor{preferred_username: "tcit", domain: "framapiaf.org", visibility: :unlisted}} =
                  ActivityPub.get_or_fetch_actor_by_url(@actor_url)
       end