Commit a44d87f0 authored by kaniini's avatar kaniini
Browse files

Merge branch 'feature/jsonld-context-cleanup' into 'develop'

jsonld context cleanup

Closes #369

See merge request !434
parents 59cf7cf2 da16ada4
Pipeline #4329 passed with stages
in 6 minutes and 32 seconds
...@@ -70,18 +70,7 @@ def make_json_ld_header do ...@@ -70,18 +70,7 @@ def make_json_ld_header do
%{ %{
"@context" => [ "@context" => [
"https://www.w3.org/ns/activitystreams", "https://www.w3.org/ns/activitystreams",
"https://w3id.org/security/v1", "https://litepub.github.io/litepub/context.jsonld"
%{
"manuallyApprovesFollowers" => "as:manuallyApprovesFollowers",
"sensitive" => "as:sensitive",
"Hashtag" => "as:Hashtag",
"ostatus" => "http://ostatus.org#",
"atomUri" => "ostatus:atomUri",
"inReplyToAtomUri" => "ostatus:inReplyToAtomUri",
"conversation" => "ostatus:conversation",
"toot" => "http://joinmastodon.org/ns#",
"Emoji" => "toot:Emoji"
}
] ]
} }
end end
......
...@@ -17,7 +17,6 @@ def render("user.json", %{user: %{nickname: nil} = user}) do ...@@ -17,7 +17,6 @@ def render("user.json", %{user: %{nickname: nil} = user}) do
public_key = :public_key.pem_encode([public_key]) public_key = :public_key.pem_encode([public_key])
%{ %{
"@context" => "https://www.w3.org/ns/activitystreams",
"id" => user.ap_id, "id" => user.ap_id,
"type" => "Application", "type" => "Application",
"following" => "#{user.ap_id}/following", "following" => "#{user.ap_id}/following",
...@@ -36,6 +35,7 @@ def render("user.json", %{user: %{nickname: nil} = user}) do ...@@ -36,6 +35,7 @@ def render("user.json", %{user: %{nickname: nil} = user}) do
"sharedInbox" => "#{Pleroma.Web.Endpoint.url()}/inbox" "sharedInbox" => "#{Pleroma.Web.Endpoint.url()}/inbox"
} }
} }
|> Map.merge(Utils.make_json_ld_header())
end end
def render("user.json", %{user: user}) do def render("user.json", %{user: user}) do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment