From c9280b97306b894a38377acf43c62d7808df01d8 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Sat, 19 Oct 2019 17:46:24 +0000
Subject: [PATCH] rework to use properties instead of compound typing, per
 SocialCG

---
 lib/pleroma/web/activity_pub/activity_pub.ex            | 8 +-------
 lib/pleroma/web/activity_pub/transmogrifier.ex          | 3 +--
 lib/pleroma/web/activity_pub/views/user_view.ex         | 3 ++-
 priv/static/schemas/litepub-0.1.jsonld                  | 1 +
 test/fixtures/tesla_mock/relay@mastdon.example.org.json | 3 ++-
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 1cfe826fa..9a0a3522a 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -1106,13 +1106,7 @@ defp object_to_user_data(data) do
     locked = data["manuallyApprovesFollowers"] || false
     data = Transmogrifier.maybe_fix_user_object(data)
     discoverable = data["discoverable"] || false
-
-    invisible =
-      if is_list(data["type"]) do
-        Enum.member?(data["type"], "Invisible")
-      else
-        false
-      end
+    invisible = data["invisible"] || false
 
     user_data = %{
       ap_id: data["id"],
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 49bbeb857..4a250d131 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -600,8 +600,7 @@ def handle_incoming(
              "Person",
              "Application",
              "Service",
-             "Organization",
-             ["Application", "Invisible"]
+             "Organization"
            ] do
     with %User{ap_id: ^actor_id} = actor <- User.get_cached_by_ap_id(object["id"]) do
       {:ok, new_user_data} = ActivityPub.user_data_from_user_object(object)
diff --git a/lib/pleroma/web/activity_pub/views/user_view.ex b/lib/pleroma/web/activity_pub/views/user_view.ex
index 9b39d1629..8c5b4460b 100644
--- a/lib/pleroma/web/activity_pub/views/user_view.ex
+++ b/lib/pleroma/web/activity_pub/views/user_view.ex
@@ -55,7 +55,8 @@ def render("service.json", %{user: user}) do
         "owner" => user.ap_id,
         "publicKeyPem" => public_key
       },
-      "endpoints" => endpoints
+      "endpoints" => endpoints,
+      "invisible" => User.invisible?(user)
     }
     |> Map.merge(Utils.make_json_ld_header())
   end
diff --git a/priv/static/schemas/litepub-0.1.jsonld b/priv/static/schemas/litepub-0.1.jsonld
index 1cfcb7ec7..c8e69cab5 100644
--- a/priv/static/schemas/litepub-0.1.jsonld
+++ b/priv/static/schemas/litepub-0.1.jsonld
@@ -19,6 +19,7 @@
             "value": "schema:value",
             "sensitive": "as:sensitive",
             "litepub": "http://litepub.social/ns#",
+            "invisible": "litepub:invisible",
             "directMessage": "litepub:directMessage",
             "listMessage": {
                 "@id": "litepub:listMessage",
diff --git a/test/fixtures/tesla_mock/relay@mastdon.example.org.json b/test/fixtures/tesla_mock/relay@mastdon.example.org.json
index b70be2bf4..c1fab7d3b 100644
--- a/test/fixtures/tesla_mock/relay@mastdon.example.org.json
+++ b/test/fixtures/tesla_mock/relay@mastdon.example.org.json
@@ -12,7 +12,8 @@
     "Emoji": "toot:Emoji"
   }],
   "id": "http://mastodon.example.org/users/admin",
-  "type": ["Application", "Invisible"],
+  "type": "Application",
+  "invisible": true,
   "following": "http://mastodon.example.org/users/admin/following",
   "followers": "http://mastodon.example.org/users/admin/followers",
   "inbox": "http://mastodon.example.org/users/admin/inbox",