From c14a50545616460e28b701aa33912df9f515726e Mon Sep 17 00:00:00 2001 From: Grishka Date: Sun, 21 Mar 2021 04:00:32 +0300 Subject: [PATCH 1/3] Fix JSON-LD contexts --- crates/apub/src/extensions/context.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/crates/apub/src/extensions/context.rs b/crates/apub/src/extensions/context.rs index b670e60d..b89fdb8f 100644 --- a/crates/apub/src/extensions/context.rs +++ b/crates/apub/src/extensions/context.rs @@ -8,10 +8,11 @@ pub(crate) fn lemmy_context() -> Result, LemmyError> { "sc": "http://schema.org#", "sensitive": "as:sensitive", "stickied": "as:stickied", + "pt": "https://join.lemmy.ml#" "comments_enabled": { - "kind": "sc:Boolean", + "type": "sc:Boolean", "id": "pt:commentsEnabled" } }))?; - Ok(vec![AnyBase::from(context()), context_ext]) + Ok(vec![AnyBase::from(context()), context_ext, "https://w3id.org/security/v1"]) } From 115b986edccfbe5694ccb1a42779734d0cb8fdb2 Mon Sep 17 00:00:00 2001 From: Grishka Date: Sun, 21 Mar 2021 04:03:53 +0300 Subject: [PATCH 2/3] uh --- crates/apub/src/extensions/context.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/apub/src/extensions/context.rs b/crates/apub/src/extensions/context.rs index b89fdb8f..e20141ed 100644 --- a/crates/apub/src/extensions/context.rs +++ b/crates/apub/src/extensions/context.rs @@ -8,7 +8,7 @@ pub(crate) fn lemmy_context() -> Result, LemmyError> { "sc": "http://schema.org#", "sensitive": "as:sensitive", "stickied": "as:stickied", - "pt": "https://join.lemmy.ml#" + "pt": "https://join.lemmy.ml#", "comments_enabled": { "type": "sc:Boolean", "id": "pt:commentsEnabled" From 459b95bc7ee58282275f341e14c19f562ada42ac Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Mon, 22 Mar 2021 13:11:32 +0100 Subject: [PATCH 3/3] Make previous commit compile --- crates/apub/src/extensions/context.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/crates/apub/src/extensions/context.rs b/crates/apub/src/extensions/context.rs index e20141ed..bfae2935 100644 --- a/crates/apub/src/extensions/context.rs +++ b/crates/apub/src/extensions/context.rs @@ -1,6 +1,7 @@ use activitystreams::{base::AnyBase, context}; use lemmy_utils::LemmyError; use serde_json::json; +use url::Url; pub(crate) fn lemmy_context() -> Result, LemmyError> { let context_ext = AnyBase::from_arbitrary_json(json!( @@ -14,5 +15,9 @@ pub(crate) fn lemmy_context() -> Result, LemmyError> { "id": "pt:commentsEnabled" } }))?; - Ok(vec![AnyBase::from(context()), context_ext, "https://w3id.org/security/v1"]) + Ok(vec![ + AnyBase::from(context()), + context_ext, + AnyBase::from(Url::parse("https://w3id.org/security/v1")?), + ]) }