From: Dessalines <tyhou13@gmx.com>
Date: Wed, 24 Mar 2021 15:48:02 +0000 (-0400)
Subject: Merge remote-tracking branch 'yerba/federated-moderation'
X-Git-Url: http://these/git/%7B%60https:/%7Bthis.state.user.avatar%7D?a=commitdiff_plain;h=8a10a9079f15e338d07bb83cf2e6cfad06a1a580;p=lemmy.git

Merge remote-tracking branch 'yerba/federated-moderation'
---

8a10a9079f15e338d07bb83cf2e6cfad06a1a580
diff --cc crates/apub/src/extensions/context.rs
index bfae2935,2dc5685a..a36b8489
--- a/crates/apub/src/extensions/context.rs
+++ b/crates/apub/src/extensions/context.rs
@@@ -9,15 -8,11 +9,16 @@@ pub(crate) fn lemmy_context() -> Result
      "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"
-     }
+     },
+     "moderators": "as:moderators"
    }))?;
 -  Ok(vec![AnyBase::from(context()), context_ext])
 +  Ok(vec![
 +    AnyBase::from(context()),
 +    context_ext,
 +    AnyBase::from(Url::parse("https://w3id.org/security/v1")?),
 +  ])
  }