moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rework to use properties instead of compound typing, per SocialCG

This commit is contained in:
Ariadne Conill 2019-10-19 17:46:24 +00:00
parent 189a288925
commit c9280b9730
5 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/pleroma/web/activity_pub/activity_pub.ex
View File

@ -1106,13 +1106,7 @@ defp object_to_user_data(data) do
locked = data["manuallyApprovesFollowers"] || false locked = data["manuallyApprovesFollowers"] || false
data = Transmogrifier.maybe_fix_user_object(data) data = Transmogrifier.maybe_fix_user_object(data)
discoverable = data["discoverable"] || false discoverable = data["discoverable"] || false
invisible = data["invisible"] || false
invisible =
if is_list(data["type"]) do
Enum.member?(data["type"], "Invisible")
else
false
end
user_data = %{ user_data = %{
ap_id: data["id"], ap_id: data["id"],

3
lib/pleroma/web/activity_pub/transmogrifier.ex
View File

@ -600,8 +600,7 @@ def handle_incoming(
"Person", "Person",
"Application", "Application",
"Service", "Service",
"Organization", "Organization"
["Application", "Invisible"]
] do ] do
with %User{ap_id: ^actor_id} = actor <- User.get_cached_by_ap_id(object["id"]) 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) {:ok, new_user_data} = ActivityPub.user_data_from_user_object(object)

3
lib/pleroma/web/activity_pub/views/user_view.ex
View File

@ -55,7 +55,8 @@ def render("service.json", %{user: user}) do
"owner" => user.ap_id, "owner" => user.ap_id,
"publicKeyPem" => public_key "publicKeyPem" => public_key
}, },
"endpoints" => endpoints "endpoints" => endpoints,
"invisible" => User.invisible?(user)
} }
|> Map.merge(Utils.make_json_ld_header()) |> Map.merge(Utils.make_json_ld_header())
end end

1
priv/static/schemas/litepub-0.1.jsonld
View File

@ -19,6 +19,7 @@
"value": "schema:value", "value": "schema:value",
"sensitive": "as:sensitive", "sensitive": "as:sensitive",
"litepub": "http://litepub.social/ns#", "litepub": "http://litepub.social/ns#",
"invisible": "litepub:invisible",
"directMessage": "litepub:directMessage", "directMessage": "litepub:directMessage",
"listMessage": { "listMessage": {
"@id": "litepub:listMessage", "@id": "litepub:listMessage",

3
test/fixtures/tesla_mock/relay@mastdon.example.org.json vendored
View File

@ -12,7 +12,8 @@
"Emoji": "toot:Emoji" "Emoji": "toot:Emoji"
}], }],
"id": "http://mastodon.example.org/users/admin", "id": "http://mastodon.example.org/users/admin",
"type": ["Application", "Invisible"], "type": "Application",
"invisible": true,
"following": "http://mastodon.example.org/users/admin/following", "following": "http://mastodon.example.org/users/admin/following",
"followers": "http://mastodon.example.org/users/admin/followers", "followers": "http://mastodon.example.org/users/admin/followers",
"inbox": "http://mastodon.example.org/users/admin/inbox", "inbox": "http://mastodon.example.org/users/admin/inbox",